redraw fix 1.

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 598f556f9761de8506f29531f810bfe31fdb5199..43864ca504e4c7f6f1aa2c2508be8e2da5c936a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -98,24 +98,11 @@ 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
 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)
@@ -133,15 +120,16 @@ 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)
+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
@@ -149,9 +137,6 @@ 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
 
@@ -173,27 +158,33 @@ 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_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
-       FRONTEND_LIBS="@XFORMS_LIB@ @XPM_LIB@"
+       case "$host" in
+         *cygwin)
+           FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@"
+           ;;
+         *)
+           FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
+           ;;
+       esac
        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)
@@ -204,8 +195,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"
@@ -239,7 +228,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
@@ -263,10 +251,6 @@ AC_HEADER_DIRENT
 AC_HEADER_MAJOR
 AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
 
-# some annoying header files
-#LYX_PATH_HEADER(stl_string_fwd.h)
-LYX_STL_STRING_FWD
-
 # some standard structures
 AC_HEADER_STAT
 AC_HEADER_TIME
@@ -320,7 +304,7 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
 VERSION_INFO=`cat <<EOF
 Configuration\n\
-  Host type:                      ${host_alias}\n\
+  Host type:                      ${host}\n\
   Special build flags:           ${lyx_flags}\n\
   C   Compiler:                   ${CC}\n\
   C   Compiler flags:             ${CFLAGS}\n\
@@ -336,12 +320,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 \