From c90ae47255227544295264d79c51617d72766c5d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 15 Mar 2002 11:23:15 +0000 Subject: [PATCH] since I committed my configure changes by mistake, I maight as well finish and document them git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3757 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ config/ChangeLog | 9 +++++++++ config/lyxinclude.m4 | 10 ++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55508bdf7f..20fef2c208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-03-15 Jean-Marc Lasgouttes + + * configure.in: small cleanups + 2002-03-14 Michael A. Koziarski * configure.in: First stage of fixing the gnome compile problems. diff --git a/config/ChangeLog b/config/ChangeLog index 0524429ac7..4448c2244e 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,12 @@ +2002-03-15 Jean-Marc Lasgouttes + + * 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 * lyxinclude.m4 (LYX_PATH_XFORMS): set XFORMS_NAME to the name of diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index eee59ac600..0da9cd4e82 100644 --- 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="" @@ -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, -- 2.39.5