From: Lars Gullik Bjønnes Date: Tue, 15 Oct 2002 14:08:52 +0000 (+0000) Subject: rebostify a bit X-Git-Tag: 1.6.10~18176 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e2b02e86e43cfff6a107487085cf71ed8797cfa7;p=features.git rebostify a bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5411 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/config/ChangeLog b/config/ChangeLog index ddb48af614..186ca8d397 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2002-10-15 Lars Gullik Bjønnes + + * configure.in,configure.ac: make the AM_CONDITIONAL check a bit + more robust. + 2002-10-15 Lars Gullik Bjønnes * xforms.m4 (lyx_use_xforms_image_loader): move the AM_CONDITIONAL diff --git a/config/configure.ac b/config/configure.ac index e198cd9edd..4870814859 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -201,8 +201,9 @@ case "$lyx_use_frontend" in LYX_ERROR(Unknown frontend $lyx_use_frontend);; esac +# Do this here instead of in the LYX_USE_XFORMS_IMAGE_LOADER macro AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, - test $lyx_use_xforms_image_loader = no) + test x$lyx_use_xforms_image_loader = xno) ### Check for xforms and xpm (only if X has been found). if test "$have_x" = no ; then diff --git a/config/configure.in b/config/configure.in index b8b614afa8..5805874483 100644 --- a/config/configure.in +++ b/config/configure.in @@ -204,7 +204,7 @@ case "$lyx_use_frontend" in esac AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, - test $lyx_use_xforms_image_loader = no) + test x$lyx_use_xforms_image_loader = xno) ### Check for xforms and xpm (only if X has been found). diff --git a/config/xforms.m4 b/config/xforms.m4 index 6b9b71c921..2f6d146484 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -93,7 +93,7 @@ fi ### 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, -# test $lyx_use_xforms_image_loader = no) +# test x$lyx_use_xforms_image_loader = xno) AC_LANG_RESTORE LIBS=$save_LIBS])