Add missing header file, ButtonControllerBase.h.

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 7b62e832a50be913ef77b17c66ab551b7dd0c717..71ef9e5ba8fd1468e9b7c00885c16b72ccb42fc9 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
@@ -123,16 +120,6 @@ LYX_LOOP_DIR($lyx_cv_extra_prefix,[
 LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
 
-### Check for the -liberty library
-test "x$GXX" = xyes && lyx_use_liberty=yes
-AC_ARG_WITH(liberty,
-  [  --without-liberty       do not try to link against libiberty.a],
-  [lyx_use_liberty=$withval])
-if test x$lyx_use_liberty = xyes; then
-  # AC_CHECK_LIB(iberty,main,LIBS="-liberty $LIBS")
-  AC_CHECK_LIB(iberty,main)
-fi
-
 AC_ARG_WITH(aiksaurus,
   [  --without-aiksaurus     do not use the Aiksaurus library],
   [lyx_use_aiksaurus=$withval])
@@ -143,16 +130,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
 
@@ -174,27 +158,26 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 AC_CHECK_FUNCS(XOpenIM)
 
 ### check which frontend we want to use
+# We have to check for xforms anyway
+LYX_PATH_XPM
+LYX_PATH_XFORMS
+
 #LYX_USE_FRONTEND
 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
   xforms)
   # for now don't set it for xforms as this is always entered
-       LYX_PATH_XPM
-       LYX_PATH_XFORMS
        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
 `
        ;;
   gnome)
-    LYX_PATH_XPM
-    LYX_PATH_XFORMS
-
     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
     AC_SUBST(GNOME_FRONTEND_CFLAGS)
     AC_SUBST(GNOME_FRONTEND_LIBS)
@@ -205,8 +188,6 @@ case "$lyx_use_frontend" in
     FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
   qt2)
-       LYX_PATH_XPM
-       LYX_PATH_XFORMS
     QT2_DO_IT_ALL
     FRONTEND="qt2"
     FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo qt2/xforms/*.lo"
@@ -240,7 +221,6 @@ fi
 ### For now, run this test always so config.h is unchanged by a change in
 ### frontend
 LYX_USE_XFORMS_IMAGE_LOADER
-LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
 
 ### Setup GNU gettext
 dnl GNU gettext is written in C
@@ -337,7 +317,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 \