From 61dfb6428dab0f14421d3c4ccb33f11fbeebc303 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 22 Jul 2003 10:00:59 +0000 Subject: [PATCH] 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 | 7 +++++++ config/xforms.m4 | 18 +++++++++++------- status.13x | 2 ++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 326d87235c..4dbea57b35 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,10 @@ +2003-05-30 Angus Leeming + + * 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 * lyxinclude.m4: Do not pass the -Winline option to gcc. diff --git a/config/xforms.m4 b/config/xforms.m4 index d7d6f93782..2b6a5c00ca 100644 --- a/config/xforms.m4 +++ b/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 diff --git a/status.13x b/status.13x index c461f775e4..39fc6459c3 100644 --- a/status.13x +++ b/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