Enable LyX to link against xforms 1.0.2 or greater.

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

diff --git a/config/ChangeLog b/config/ChangeLog
index 32ea87166add684fd61c94179be6e99c1a2d2839..250ca4a4a6024c9bf93ad832525511f1109100d7 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-20  Angus Leeming  <angus@localhost.localdomain>
+
+       * xforms.m4 (LYX_CHECK_XFORMS_IMAGE_LOADER): clean-up instigated by
+       Rob Lahaye to ensure that the configure test succeeds with
+       xforms 1.0.2 and, moreover, that this will not break the final
+       linking step under cygwin.
+
+2003-05-15  Rob Lahaye  <lahaye@snu.ac.kr>
+
+       * xforms.m4: reverse two tests; do first -ljpeg, then -lflimage
+

 2003-05-14  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * qt.m4: errors are not fatal
 2003-05-14  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * qt.m4: errors are not fatal

diff --git a/config/xforms.m4 b/config/xforms.m4
index ff837184b5502f2bf163f87b4abd08ab52865bc8..820b1f4359300d616396e23e9e2afad5bd5ebd70 100644 (file)
--- a/config/xforms.m4
+++ b/config/xforms.m4
@@ -119,17 +119,21 @@ AC_LANG_C
 
 dnl The image headers were split out of forms.h in xforms version 1.0.
 AC_CHECK_HEADERS(flimage.h X11/flimage.h, break,,[#include $lyx_cv_forms_h_location])
 
 dnl The image headers were split out of forms.h in xforms version 1.0.
 AC_CHECK_HEADERS(flimage.h X11/flimage.h, break,,[#include $lyx_cv_forms_h_location])

-AC_SEARCH_LIBS(flimage_dup, flimage,
-  [if test "$ac_cv_search_flimage_dup" != "none required" ; then
-     XFORMS_IMAGE_LIB="-lflimage"
-     LIBS="$XFORMS_IMAGE_LIB $LIBS"
-  fi])

 
 dnl Only enable native loading of jpeg images if the jpeg library is installed.
 
 dnl Only enable native loading of jpeg images if the jpeg library is installed.

+dnl This test comes before that of flimage itself to ensure that the necessary
+dnl libraries are linked into the "flimage_dup" test program below.
+XFORMS_IMAGE_LIB=""

 AC_CHECK_LIB(jpeg, jpeg_read_header,
   [lyx_use_jpeg_image_loader=yes
 AC_CHECK_LIB(jpeg, jpeg_read_header,
   [lyx_use_jpeg_image_loader=yes

-   XFORMS_IMAGE_LIB="$XFORMS_IMAGE_LIB -ljpeg"
-   LIBS="$LIBS -ljpeg"])
+   XFORMS_IMAGE_LIB="-ljpeg"
+   LIBS="-ljpeg $LIBS"])
+
+AC_SEARCH_LIBS(flimage_dup, flimage,
+  [if test "$ac_cv_search_flimage_dup" != "none required" ; then
+     XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
+  fi])
+

 AC_SUBST(XFORMS_IMAGE_LIB)
 
 if test $lyx_use_jpeg_image_loader = yes ; then
 AC_SUBST(XFORMS_IMAGE_LIB)
 
 if test $lyx_use_jpeg_image_loader = yes ; then