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 ddb48af6140c1b9d1c2b2f92ec686ae6d1a2497e..186ca8d3971c8c35b1917d8ba2dc38edb6a85f1a 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-15  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * configure.in,configure.ac: make the AM_CONDITIONAL check a bit
+       more robust.
+
 2002-10-15  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * xforms.m4 (lyx_use_xforms_image_loader): move the AM_CONDITIONAL

diff --git a/config/configure.ac b/config/configure.ac
index e198cd9edda7236bd4c614b21de0094f845298e1..48708148595c080bd8dd3289533202d8cfc14ce6 100644 (file)
--- 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 b8b614afa8705b101c94c7a5992beef8afa0235d..58058744831d020886fb482db29e71437fb5aff1 100644 (file)
--- 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 6b9b71c92158961a529b9d8a19f31bc0bbaa4e2e..2f6d146484fd8331689dff1a595071013ee25656 100644 (file)
--- 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])