various fixes

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 5e4437f46d2fb572056336aee195a0bac76495ea..e9d576470f412a2fc7b9f0728b96874639a36f0b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -111,12 +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_CHECK_LIB(bz2, main)
+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"
-        AC_SUBST(AIKSAURUS_LIBS)
-       ])
+        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)
@@ -319,6 +323,9 @@ AC_OUTPUT([Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/qt2/Makefile \
+       src/frontends/qt2/moc/Makefile \
+       src/frontends/qt2/ui/Makefile \
+       src/frontends/qt2/ui/moc/Makefile \
        src/frontends/gnome/Makefile \
 ])