From e684405311dc529a336579f929dbf308df092f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sat, 10 Aug 2002 17:36:18 +0000 Subject: [PATCH] revert git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4931 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 4 +++- config/xforms.m4 | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 6fb9e4d0ad..a94feb6712 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,6 +1,8 @@ 2002-08-10 Lars Gullik Bjønnes - * 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 diff --git a/config/xforms.m4 b/config/xforms.m4 index 7b07a3eac4..50cc37ad40 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -69,7 +69,8 @@ AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER, save_LIBS=$LIBS LIBS="$XFORMS_LIB $LIBS" lyx_use_xforms_image_loader=no -AC_LANG_PUSH(C) +AC_LANG_SAVE +AC_LANG(C) AC_CHECK_LIB(jpeg, jpeg_read_header, [XFORMS_IMAGE_LIB=-ljpeg @@ -94,5 +95,5 @@ fi ### very simple one in graphics/GraphicsImageXPM.[Ch] AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, test $lyx_use_xforms_image_loader = no) -AC_LANG_POP(C) +AC_LANG_RESTORE LIBS=$save_LIBS])