fix detection of newer xforms

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@7341 a592a061-630c-0410-9148-cb99ea01b6c8

config/ChangeLog

@@ -1,3 +1,10 @@
+2003-05-30  Angus Leeming  <leeming@lyx.org>
+
+	* 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-07-15  Angus Leeming  <leeming@lyx.org>
 
 	* lyxinclude.m4: Do not pass the -Winline option to gcc.

config/xforms.m4

@@ -68,17 +68,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])
-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 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
-   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

status.13x

@@ -88,3 +88,5 @@ What's new
 - fix compilation on HP-UX 11.x
 
 - do not report failed inlining when compiling with gcc
+
+- fix compilation with new development versions of xforms