X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=e9d576470f412a2fc7b9f0728b96874639a36f0b;hb=3796da5d05ccff08f4c3bdedb54258e9cec01485;hp=126986da57f0b350d44fb4a2c6b001d209fca055;hpb=a60753afd8113aa2321f2d682994650893868a03;p=lyx.git

diff --git a/configure.in b/configure.in
index 126986da57..e9d576470f 100644
--- a/configure.in
+++ b/configure.in
@@ -74,28 +74,35 @@ esac
 AC_LANG_CPLUSPLUS
 LYX_PROG_CXX
 AC_PROG_CXXCPP
-AC_DISABLE_SHARED
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-
 ### Some checks on what the C++ compiler can(not) do
-LYX_CXX_MUTABLE
-LYX_CXX_PARTIAL
+dnl we do not need that currently (and probably all our supported
+dnl compiler allow that)  
+dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-dnl we do not use stl stack, or at least not on gcc 2.7, which was the 
-dnl cause for this test. 
-dnl LYX_CXX_STL_STACK
 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 locale)
+AC_CHECK_HEADERS(ostream istream sstream locale limits)
 LYX_CXX_STL_MODERN_STREAMS
 
+### and now some special lyx flags.
+AC_ARG_ENABLE(assertions,
+  [  --enable-assertions     add runtime sanity checks in the program],,
+  [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+	enable_assertions=yes;
+    else
+	enable_assertions=no;
+    fi;])
+if test "x$enable_assertions" = xyes ; then
+   lyx_flags="$lyx_flags assertions"
+   AC_DEFINE(ENABLE_ASSERTIONS,1,
+    [Define if you want assertions to be enabled in the code])
+fi
+
 ### We need a regex implementation, so we provide our own if none is found.
 LYX_REGEX
 
@@ -104,6 +111,16 @@ dnl by testing these we check if it is ok to have
 dnl -lc and -lm as args to the compiler
 AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(c, fopen)
+AC_ARG_WITH(aiksaurus,
+  [  --without-aiksaurus     do not use the AikSaurus library],
+  [lyx_use_aiksaurus=$withval])
+if test x$lyx_use_aiksaurus != xno; then
+AC_CHECK_LIB(AikSaurus, main, 
+	[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
+	 AIKSAURUS_LIBS="-lAikSaurus -lbz2"
+	],,"-lbz2")
+fi 
+AC_SUBST(AIKSAURUS_LIBS)
 
 ### Add extra directories to check for libraries.
 LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
@@ -131,6 +148,12 @@ if test x$lyx_use_liberty = xyes; then
   AC_CHECK_LIB(iberty,main)
 fi
 
+### Setup libtool
+AC_DISABLE_SHARED
+AC_LIBTOOL_WIN32_DLL
+#AM_PROG_LIBTOOL
+LYX_PROG_LIBTOOL
+
 ### Check which libsigc++ we're using
 LYX_WITH_SIGC
 
@@ -161,17 +184,10 @@ AC_CHECK_FUNCS(XOpenIM)
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.  
 case "$lyx_use_frontend" in 
-  kde) 
-    KDE_DO_IT_ALL
-    FRONTEND="kde"
-    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)";;
   xforms) 
   # for now don't set it for xforms as this is always entered
     FRONTEND=""
-    FRONTEND_GUILIB="\${top_builddir}/src/frontends/xforms/libxforms.la";;
+    FRONTEND_GUILIB="xforms/libxforms.la";;
   gnome)    
     AM_PATH_GTKMM(1.2.1,,
         AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
@@ -190,14 +206,14 @@ dnl Ensure gnome-config is available...
 	fi
 		
     FRONTEND="gnome"
-    FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la"
+    FRONTEND_GUILIB="gnome/libgnome.la"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
     FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
     FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";;
   qt2)
     QT2_DO_IT_ALL
     FRONTEND="qt2"
-    FRONTEND_GUILIB="\${top_builddir}/src/frontends/qt2/libqt2.la"
+    FRONTEND_GUILIB="qt2/libqt2.la"
     FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
     FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
     FRONTEND_LIBS="\$(QT2_LIBS)";;
@@ -288,23 +304,10 @@ 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],,
-  [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
-	enable_assertions=yes;
-    else
-	enable_assertions=no;
-    fi;])
-if test "x$enable_assertions" = xyes ; then
-   lyx_flags="$lyx_flags assertions"
-   AC_DEFINE(ENABLE_ASSERTIONS,1,
-    [Define if you want assertions to be enabled in the code])
-fi
-
 ### Finish the work.
-AC_CONFIG_SUBDIRS(boost sigc++ lib lib/reLyX)
+AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
+       boost/Makefile \
        development/lyx.spec \
        lib/Makefile \
        intl/Makefile \
@@ -320,12 +323,11 @@ AC_OUTPUT([Makefile \
        src/frontends/controllers/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/qt2/moc/Makefile \
+       src/frontends/qt2/ui/Makefile \
+       src/frontends/qt2/ui/moc/Makefile \
        src/frontends/gnome/Makefile \
-],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+])
 
 
 cat <<EOF