fix cygwin linking problems

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6423 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/ChangeLog b/config/ChangeLog
index 1711928ced16dfb9dd13e93db4edc1fc39ba7605..c39e15a8cc1df86911fc47b6b1ce144020ded9bd 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-10  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * configure.ac: 
+       * configure.in: remove special handling of linking order for
+       cygwin
+
 2003-03-05  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * lyxinclude213.m4: add a AC_HELP_STRING

diff --git a/config/configure.ac b/config/configure.ac
index 135323198c7b3ea3c91f6b0955f7718d61fa9541..f9d868e30ec4f6f3354be3986c22663e2dcc0951 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -152,14 +152,7 @@ case "$lyx_use_frontend" in
         RPM_FRONTEND_DEPS='libforms >= 1.0'
        FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
-       case "$host" in
-         *cygwin)
-           FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@"
-           ;;
-         *)
-           FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
-           ;;
-       esac
+       FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
        FRONTEND_INFO="    libXpm version:               ${XPM_VERSION}\n\
     libforms version:             ${XFORMS_VERSION}\n"
        ;;

diff --git a/config/configure.in b/config/configure.in
index 1c9649d1fd823b651c0b0790c662334598c29137..4adcfe1130659ada10f61363f4aa6b3ec5cd3d6c 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -155,14 +155,7 @@ case "$lyx_use_frontend" in
         RPM_FRONTEND_DEPS='libforms >= 1.0'
        FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
-       case "$host" in
-         *cygwin)
-           FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@"
-           ;;
-         *)
-           FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
-           ;;
-       esac
+       FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
        FRONTEND_INFO="    libXpm version:               ${XPM_VERSION}\n\
     libforms version:             ${XFORMS_VERSION}\n"
        ;;