This patch seems to have been forgotten. It allows linking against all
supported versions of the xforms library, both before and after the xforms
migration to GNU autotools.
It has been in the 14x tree for sometime. I tested it very thoroughly before
I dissappeared at the end of June. It works beautifully.
Ok, JMarc?
--
Angus
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.86.2.17
diff -u -p -r1.86.2.17 ChangeLog
--- config/ChangeLog 21 Jul 2003 22:32:55 -0000 1.86.2.17
+++ config/ChangeLog 21 Jul 2003 22:38:45 -0000
@@ -1,3 +1,10 @@
+2003-05-30 Angus Leeming <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* lyxinclude.m4: Do not pass the -Winline option to gcc.
Index: config/xforms.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/xforms.m4,v
retrieving revision 1.15
diff -u -p -r1.15 xforms.m4
--- config/xforms.m4 12 Jan 2003 22:24:46 -0000 1.15
+++ config/xforms.m4 21 Jul 2003 22:38:46 -0000
@@ -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
