X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=43864ca504e4c7f6f1aa2c2508be8e2da5c936a1;hb=61fc3710932a0ef5f93a0fbefa6c1cfd43654702;hp=538eab94683915a5426cb5ed23b6bb89183094fd;hpb=3b1a9a5fc258f5d9b4faaa7a4bd5b6fe99530583;p=lyx.git

diff --git a/configure.in b/configure.in
index 538eab9468..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])
@@ -179,9 +169,16 @@ case "$lyx_use_frontend" in
   xforms)
   # for now don't set it for xforms as this is always entered
 	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
@@ -254,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
@@ -311,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\