2002-06-03 Lars Gullik Bj�nnes <larsbj@birdstep.com>

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 7b62e832a50be913ef77b17c66ab551b7dd0c717..290ef284b12f30ef4283a0561482111cebc0294c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -98,9 +98,6 @@ if test "x$enable_assertions" = xyes ; then
     [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
-
 ### Library Files
 dnl by testing these we check if it is ok to have
 dnl -lc and -lm as args to the compiler
@@ -143,16 +140,13 @@ AC_CHECK_LIB(Aiksaurus, main,
        ],,"-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
 
@@ -185,7 +179,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
@@ -337,7 +331,7 @@ ${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 \