since I committed my configure changes by mistake, I maight as well finish and docume...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3757 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 55508bdf7f40073b5b3ed99e1685d90cb1fffeeb..20fef2c208ac7bb0261a6541a9a120156f6e9468 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-15  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * configure.in: small cleanups
+
 2002-03-14  Michael A. Koziarski  <michael@koziarski.com>
 
        * configure.in: First stage of fixing the gnome compile problems.

diff --git a/config/ChangeLog b/config/ChangeLog
index 0524429ac74236ce0fc81e4adee3ad4514ac3396..4448c2244eea0a474e89871ebfaef3ecb4bacebd 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-15  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * lyxinclude.m4 (LYX_PROG_CXX): also look at $CXX when searching
+       for a good C++ compiler
+       (LYX_PATH_XFORMS): small cleanups
+       (LYX_USE_XFORMS_IMAGE_LOADER): override LIBS instead of LDFLAGS;
+       set the conditional USE_BASIC_IMAGE_LOADER here. Add a flag
+       xforsm-image-loader to version info.
+
 2002-03-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * lyxinclude.m4 (LYX_PATH_XFORMS): set XFORMS_NAME to the name of

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index eee59ac6006daf413b03d59243fa2795178a2587..0da9cd4e826e5684fc94c246185d687f4666116d 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -560,14 +560,12 @@ fi])
 
 
 dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
-dnl   If it is found, the variable XFORMS_NAME is set to its name on disk, 
-dnl   and XFORMS_LIBS is set to the relevant -l flag.
+dnl   If it is found, the variable XFORMS_LIB is set to the relevant -l flag.
 AC_DEFUN(LYX_PATH_XFORMS,[
 ### Check for xforms library
-AC_CHECK_LIB(forms, fl_initialize, XFORMS_NAME="forms", 
-  [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_NAME="xforms", 
+AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms", 
+  [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms", 
     [LYX_LIB_ERROR(libforms or libxforms,xforms)])])
-test -n "$XFORMS_NAME" && XFORMS_LIB=-l$XFORMS_NAME
 AC_SUBST(XFORMS_LIB)
 ### Check for xforms headers
 lyx_cv_forms_h_location="<forms.h>"
@@ -624,7 +622,7 @@ AC_CHECK_FUNCS(flimage_dup,[
     lyx_use_xforms_image_loader=yes
     AC_CHECK_FUNCS(flimage_enable_ps)])])
 LIBS=$save_LIBS
-
+test $lyx_use_xforms_image_loader = yes && lyx_flags="$lyx_flags xforms-image-loader"
 ### 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,