X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=677b924a9a03bab82e53739774335358df00d9a4;hb=86dc4696afe661e8a99abe7b95691d6ba9ca2ad7;hp=fbe9452a005c4a9086feaa18e2fe860ce7b962f1;hpb=577fca3be718d4a798c31a36ba5a7ba8f5229504;p=lyx.git

diff --git a/configure.in b/configure.in
index fbe9452a00..677b924a9a 100644
--- a/configure.in
+++ b/configure.in
@@ -11,9 +11,11 @@ LYX_GET_VERSION(${srcdir}/src/version.h)
 AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
 
-AC_ARG_WITH(lyxname,
-  [  --with-lyxname          the name under which lyx will be installed],
-  [lyxname=$withval],[lyxname=lyx])
+AC_ARG_WITH(lyx-suffix,
+  [  --with-lyx-suffix       install lyx files as lyx-<suffix>],
+  [lyxname="lyx-$withval"
+   program_suffix=-$withval],
+  [lyxname=lyx])
 
 AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
@@ -184,6 +186,13 @@ case "$lyx_use_frontend" in
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
     FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
     FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)";;
+  qt2)
+    QT2_DO_IT_ALL
+    FRONTEND="qt2"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/qt2/libqt2.la"
+    FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
+    FRONTEND_LIBS="\$(QT2_LIBS)";;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
@@ -252,8 +261,12 @@ if test "x$lyx_broken_headers" = "xyes"; then
   AC_DEFINE(BROKEN_HEADERS, 1,
     [Define on SunOS 4 and SCO, were some functions are missing from the headers])
 fi
-AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo snprintf vsnprintf)
-AC_CHECK_FUNCS(mkstemp mktemp)
+AC_CHECK_FUNCS(snprintf vsnprintf)
+LYX_CHECK_DECL(snprintf, stdio.h)
+LYX_CHECK_DECL(vsnprintf, stdio.h)
+
+AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo \
+  mkstemp mktemp)
 
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES
@@ -281,13 +294,13 @@ if test "x$enable_assertions" = xyes ; then
 fi
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
+AC_CONFIG_SUBDIRS(boost sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
        development/lyx.spec \
        lib/Makefile \
        intl/Makefile \
        po/Makefile.in \
-       boost/Makefile \
+       sourcedoc/Doxyfile \
        src/Makefile \
        src/mathed/Makefile \
        src/graphics/Makefile \
@@ -296,6 +309,7 @@ AC_OUTPUT([Makefile \
        src/frontends/Makefile \
        src/frontends/support/Makefile \
        src/frontends/xforms/Makefile \
+       src/frontends/qt2/Makefile \
        src/frontends/kde/Makefile \
        src/frontends/kde/moc/Makefile \
        src/frontends/kde/dlg/Makefile \