small noweb fix from Kayvan

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

diff --git a/config/ChangeLog b/config/ChangeLog
index 368e213cc2a2965a67e8926252423e1517237fcf..0524429ac74236ce0fc81e4adee3ad4514ac3396 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * lyxinclude.m4 (LYX_PATH_XFORMS): set XFORMS_NAME to the name of
+       the library.
+
 2002-03-06  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * lyxinclude.m4 (LYX_USE_XFORMS_IMAGE_LOADER): test whether the

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index d1cf1c1dcab6f760749d4d4d1501ac86797a22a6..eee59ac6006daf413b03d59243fa2795178a2587 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -153,7 +153,7 @@ rm -f conftest.C conftest.o conftest.obj || true
 
 AC_DEFUN(LYX_PROG_CXX,
 [AC_MSG_CHECKING([for a good enough C++ compiler])
-LYX_SEARCH_PROG(CXX, $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS])
+LYX_SEARCH_PROG(CXX, $CXX $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS])
 
 if test -z "$CXX" ; then
   AC_ERROR([Unable to find a good enough C++ compiler])
@@ -560,11 +560,14 @@ 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.
 AC_DEFUN(LYX_PATH_XFORMS,[
 ### Check for xforms library
-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)], $XFORMS_LIB)], $XFORMS_LIB) 
+AC_CHECK_LIB(forms, fl_initialize, XFORMS_NAME="forms", 
+  [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_NAME="xforms", 
+    [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>"
@@ -605,11 +608,30 @@ probably use version 0.89.6 (or 0.88) instead) ;;
     0.89*) ;;
        *) LYX_WARNING(dnl
 Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,] 
- since it is newer than 0.88. You might have slight problems with it.);;
+ since it is newer than 0.89. You might have slight problems with it.);;
 esac
 fi])
 
 
+dnl Check whether the xforms library has a viable image loader
+AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
+[
+save_LIBS=$LIBS
+LIBS="$XFORMS_LIB $LIBS"
+lyx_use_xforms_image_loader=no
+AC_CHECK_FUNCS(flimage_dup,[
+  AC_CHECK_FUNCS(flimage_to_pixmap,[
+    lyx_use_xforms_image_loader=yes
+    AC_CHECK_FUNCS(flimage_enable_ps)])])
+LIBS=$save_LIBS
+
+### 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)
+])
+
+
 dnl Usage: LYX_HPUX  Checks for HP-UX and update CXXFLAGS accordingly
 AC_DEFUN(LYX_HPUX,
 [#It seems that HPUX requires using -fpcc-struct-return with gcc.
@@ -980,19 +1002,3 @@ AM_PROG_LIBTOOL dnl for libraries
 CC=$ac_save_cc
 CFLAGS="$ac_save_cflags"
 ])
-
-
-### Check whether the xforms library has a viable image loader
-AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
-[
-TEMP_LDFLAGS=$LDFLAGS
-LDFLAGS=$XFORMS_LIB $LDFLAGS
-
-lyx_use_xforms_image_loader=no
-AC_CHECK_FUNCS(flimage_dup,[
-  AC_CHECK_FUNCS(flimage_to_pixmap,[
-    lyx_use_xforms_image_loader=yes
-    AC_CHECK_FUNCS(flimage_enable_ps)])])
-
-LDFLAGS=$TEMP_LDFLAGS
-])

diff --git a/configure.in b/configure.in
index e71df0564c40225627500968d67b29cfeeecd322..a2228f24cff39563576fd7235badb9dd71f524ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -161,8 +161,6 @@ LYX_WITH_SIGC
 CHECK_WITH_PSPELL
 
 ### Check for X libraries
-dnl # Check for the pt library (for SCO, needed for X)
-dnl AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
 # The real thing.
 AC_PATH_XTRA
 LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
@@ -258,11 +256,6 @@ fi
 ### frontend
 LYX_USE_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,
-               test x$lyx_use_xforms_image_loader = xno)
-
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_C

diff --git a/lib/ChangeLog b/lib/ChangeLog
index adef0c46f9c9c566c50f6f23949200769da8a771..3dd889bf12a38134a0247900b04b163f4b690121 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-14  Kayvan A. Sylvan  <kayvan@sylvan.com>
+       * examples/Literate.lyx: Small fix to make sure build-listerrors
+       still works.
+
 2002-03-14  Allan Rae  <rae@lyx.org>
 
        * bind/sv_menus.bind: 

diff --git a/lib/examples/Literate.lyx b/lib/examples/Literate.lyx
index fd466381fafe462a66eb4d4c8813c28ab98a5975..56723f8b9b92ffae8e19f3804ad57e0976729647 100644 (file)
--- a/lib/examples/Literate.lyx
+++ b/lib/examples/Literate.lyx
@@ -952,6 +952,8 @@ listerrors.c
 \newline 
 #!/bin/sh
 \newline 
+if [ -z "$NOWEB_SOURCE" ]; then NOWEB_SOURCE=Literate.nw; fi
+\newline 
 notangle -L -Rlisterrors.c ${NOWEB_SOURCE} > listerrors.c
 \newline 
 gcc -g -o listerrors listerrors.c