X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=43864ca504e4c7f6f1aa2c2508be8e2da5c936a1;hb=6ae1cb1d6c6dcb4ef93a7dafd047a6af16e4c338;hp=290ef284b12f30ef4283a0561482111cebc0294c;hpb=7eb5643f4fa7e2a911dc2f03e9d946f2308d097e;p=lyx.git

diff --git a/configure.in b/configure.in
index 290ef284b1..43864ca504 100644
--- a/configure.in
+++ b/configure.in
@@ -120,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])
@@ -168,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_IMAGE_LIB@ @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)
@@ -199,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"
@@ -234,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
@@ -258,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
@@ -315,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\