anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable LyX to link against xforms 1.0.2 or greater.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6988 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-05-20 18:36:30 +00:00
parent 01478feb03
commit 7645b17430
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/ChangeLog
View File

@ -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

18
config/xforms.m4
View File

@ -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])
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