constify

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 598f556f9761de8506f29531f810bfe31fdb5199..e2206cfc070fe50b6d9fc28d36d242cac11853f4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -106,16 +106,6 @@ 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)
@@ -143,15 +133,23 @@ if test x$lyx_use_liberty = xyes; then
   AC_CHECK_LIB(iberty,main)
 fi
 
+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)
+ 
 ### Setup libtool
 AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
 LYX_PROG_LIBTOOL
 
-### Check which libsigc++ we're using
-LYX_WITH_SIGC
-
 ### Check if we want pspell libraries
 CHECK_WITH_PSPELL
 
@@ -184,7 +182,7 @@ case "$lyx_use_frontend" in
        FRONTEND="xforms"
        FRONTEND_GUILIB="xforms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
-       FRONTEND_LIBS="@XFORMS_LIB@ @XPM_LIB@"
+       FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
        FRONTEND_INFO=`cat <<EOF
     libXpm version:               ${XPM_VERSION}\n\
     libforms version:             ${XFORMS_VERSION}\n
@@ -336,12 +334,14 @@ ${FRONTEND_INFO}\
 AC_SUBST(VERSION_INFO)
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
+AC_CONFIG_SUBDIRS(lib lib/reLyX)
 AC_OUTPUT([Makefile \
        boost/Makefile \
        boost/libs/Makefile \
        boost/libs/regex/Makefile \
        boost/libs/regex/src/Makefile \
+       boost/libs/signals/Makefile \
+       boost/libs/signals/src/Makefile \
        config/Makefile \
        development/lyx.spec \
        lib/Makefile \