anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

since I committed my configure changes by mistake, I maight as well finish and document them

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3757 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-03-15 11:23:15 +00:00
parent 2aafd9bf94
commit c90ae47255
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2002-03-14 Michael A. Koziarski <michael@koziarski.com>
* configure.in: First stage of fixing the gnome compile problems. * configure.in: First stage of fixing the gnome compile problems.

9
config/ChangeLog
View File

@ -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> 2002-03-14 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* lyxinclude.m4 (LYX_PATH_XFORMS): set XFORMS_NAME to the name of * lyxinclude.m4 (LYX_PATH_XFORMS): set XFORMS_NAME to the name of

10
config/lyxinclude.m4
View File

@ -560,14 +560,12 @@ fi])
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags 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 If it is found, the variable XFORMS_LIB is set to the relevant -l flag.
dnl and XFORMS_LIBS is set to the relevant -l flag.
AC_DEFUN(LYX_PATH_XFORMS,[ AC_DEFUN(LYX_PATH_XFORMS,[
### Check for xforms library ### Check for xforms library
AC_CHECK_LIB(forms, fl_initialize, XFORMS_NAME="forms", AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_NAME="xforms", [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
[LYX_LIB_ERROR(libforms or libxforms,xforms)])]) [LYX_LIB_ERROR(libforms or libxforms,xforms)])])
test -n "$XFORMS_NAME" && XFORMS_LIB=-l$XFORMS_NAME
AC_SUBST(XFORMS_LIB) AC_SUBST(XFORMS_LIB)
### Check for xforms headers ### Check for xforms headers
lyx_cv_forms_h_location="<forms.h>" lyx_cv_forms_h_location="<forms.h>"
@ -624,7 +622,7 @@ AC_CHECK_FUNCS(flimage_dup,[
lyx_use_xforms_image_loader=yes lyx_use_xforms_image_loader=yes
AC_CHECK_FUNCS(flimage_enable_ps)])]) AC_CHECK_FUNCS(flimage_enable_ps)])])
LIBS=$save_LIBS 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 ### If the gui cannot load images itself, then we default to the
### very simple one in graphics/GraphicsImageXPM.[Ch] ### very simple one in graphics/GraphicsImageXPM.[Ch]
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,