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

diff --git a/configure.in b/configure.in
index f6f03e514f..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)
 
@@ -91,10 +93,11 @@ LYX_CXX_STL_STRING
 LYX_CXX_GOOD_STD_STRING
 LYX_CXX_NAMESPACES
 LYX_CXX_CHEADERS
+LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream)
+AC_CHECK_HEADERS(ostream istream sstream locale)
 LYX_CXX_STL_MODERN_STREAMS
 
 ### We need a regex implementation, so we provide our own if none is found.
@@ -135,6 +138,9 @@ fi
 ### Check which libsigc++ we're using
 LYX_WITH_SIGC
 
+### Check if we want pspell libraries
+CHECK_WITH_PSPELL
+
 ### Check for X libraries
 # Check for the pt library (for SCO, needed for X)
 AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
@@ -165,8 +171,7 @@ case "$lyx_use_frontend" in
     FRONTEND_GUILIB="\${top_builddir}/src/frontends/kde/libkde.la"
     FRONTEND_LDFLAGS="\$(QT_LDFLAGS) \$(KDE_LDFLAGS)"
     FRONTEND_INCLUDES="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)"
-    FRONTEND_LIBS="\$(KDE_LIBS)"
-    AC_DEFINE(KDEGUI);;
+    FRONTEND_LIBS="\$(KDE_LIBS)";;
   xforms) 
   # for now don't set it for xforms as this is always entered
     FRONTEND=""
@@ -180,8 +185,14 @@ case "$lyx_use_frontend" in
     FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
     FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
-    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)"
-    AC_DEFINE(GTKGUI);;
+    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
@@ -250,7 +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)
+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
@@ -261,6 +277,8 @@ LYX_FUNC_PUTENV_ARGTYPE
 # SunOS 4.1.3 does not have strerror and atexit
 AC_REPLACE_FUNCS(strerror atexit)
 
+LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
+
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   [  --enable-assertions     add runtime sanity checks in the program],,
@@ -276,21 +294,26 @@ 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 \
+       sourcedoc/Doxyfile \
        src/Makefile \
        src/mathed/Makefile \
        src/graphics/Makefile \
        src/insets/Makefile \
        src/support/Makefile \
-       src/xtl/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 \
+       src/frontends/kde/dlg/moc/Makefile \
        src/frontends/gnome/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])