More header file include dependency work

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index a7e1bdf6ae946612daa9d32577db97bfddab39ad..5e4437f46d2fb572056336aee195a0bac76495ea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -74,21 +74,13 @@ esac
 AC_LANG_CPLUSPLUS
 LYX_PROG_CXX
 AC_PROG_CXXCPP
-AC_DISABLE_SHARED
-AC_LIBTOOL_WIN32_DLL
-#AM_PROG_LIBTOOL
-LYX_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
@@ -97,6 +89,20 @@ dnl LYX_CXX_RTTI
 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
 
@@ -105,6 +111,12 @@ 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_CHECK_LIB(bz2, main)
+AC_CHECK_LIB(AikSaurus, main, 
+       [AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
+        AIKSAURUS_LIBS="-lAikSaurus"
+        AC_SUBST(AIKSAURUS_LIBS)
+       ])
 
 ### Add extra directories to check for libraries.
 LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
@@ -132,6 +144,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
 
@@ -282,20 +300,6 @@ 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(sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
@@ -316,7 +320,7 @@ AC_OUTPUT([Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/qt2/Makefile \
        src/frontends/gnome/Makefile \
-],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+])
 
 
 cat <<EOF