git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4931 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-08-10 17:36:18 +00:00
parent 116dbc66eb
commit e684405311
2 changed files with 6 additions and 3 deletions

View File

@ -1,6 +1,8 @@
2002-08-10 Lars Gullik Bjønnes <larsbj@gullik.net> 2002-08-10 Lars Gullik Bjønnes <larsbj@gullik.net>
* some more updates and removal of obsolete macros. * xforms.m4: switch back to save,restore
* some more updates and removal of obsolete macros.
2002-08-08 Lars Gullik Bjønnes <larsbj@birdstep.com> 2002-08-08 Lars Gullik Bjønnes <larsbj@birdstep.com>

View File

@ -69,7 +69,8 @@ AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
save_LIBS=$LIBS save_LIBS=$LIBS
LIBS="$XFORMS_LIB $LIBS" LIBS="$XFORMS_LIB $LIBS"
lyx_use_xforms_image_loader=no lyx_use_xforms_image_loader=no
AC_LANG_PUSH(C) AC_LANG_SAVE
AC_LANG(C)
AC_CHECK_LIB(jpeg, jpeg_read_header, AC_CHECK_LIB(jpeg, jpeg_read_header,
[XFORMS_IMAGE_LIB=-ljpeg [XFORMS_IMAGE_LIB=-ljpeg
@ -94,5 +95,5 @@ fi
### very simple one in graphics/GraphicsImageXPM.[Ch] ### very simple one in graphics/GraphicsImageXPM.[Ch]
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
test $lyx_use_xforms_image_loader = no) test $lyx_use_xforms_image_loader = no)
AC_LANG_POP(C) AC_LANG_RESTORE
LIBS=$save_LIBS]) LIBS=$save_LIBS])