anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 06:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

same fix as for 1.2

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4327 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-06-03 12:31:07 +00:00
parent 656a4db7b3
commit 9db92943bd
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-03 John Levon <moz@compsoc.man.ac.uk>
* xforms.m4: don't insist on building with flimage linked
2002-06-03 John Levon <moz@compsoc.man.ac.uk>
* xforms.m4: don't warn about missing flimage.h

25
config/xforms.m4
View File

@ -76,7 +76,32 @@ AC_CHECK_FUNCS(flimage_dup,[
AC_CHECK_FUNCS(flimage_enable_ps)])])
LIBS=$save_LIBS
test $lyx_use_xforms_image_loader = yes && lyx_flags="$lyx_flags xforms-image-loader" && XFORMS_IMAGE_LIB=-lflimage
# try without flimage
if test $lyx_use_xforms_image_loader = no ; then
LIBS="$XFORMS_LIB -ljpeg $LIBS"
lyx_use_xforms_image_loader=no
AC_CHECK_FUNCS(flimage_dup,[
AC_CHECK_FUNCS(flimage_to_pixmap,[
lyx_use_xforms_image_loader=yes
AC_CHECK_FUNCS(flimage_enable_ps)])])
LIBS=$save_LIBS
# try without -ljpeg
if test $lyx_use_xforms_image_loader = no ; then
LIBS="$XFORMS_LIB $LIBS"
lyx_use_xforms_image_loader=no
AC_CHECK_FUNCS(flimage_dup,[
AC_CHECK_FUNCS(flimage_to_pixmap,[
lyx_use_xforms_image_loader=yes
AC_CHECK_FUNCS(flimage_enable_ps)])])
LIBS=$save_LIBS
fi
fi
AC_SUBST(XFORMS_IMAGE_LIB)
### If the gui cannot load images itself, then we default to the
### very simple one in graphics/GraphicsImageXPM.[Ch]
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,