anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some tweaks to xforms-related configure thingies

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5015 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-08-16 14:56:34 +00:00
parent 737fca6bf3
commit 6c363430d6
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/ChangeLog
View File

@ -1,3 +1,13 @@
2002-08-16 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* lyxinclude.m4 (LYX_PATH_XPM): do not pass XPM_LIB as 5th
argument of AC_CHECK_LIB
* xforms.m4 (LYX_PATH_XFORMS): use 5th argument of AC_CHECK_LIB to
make sure that -lXpm is used when linking. Require LYX_PATH_XPM.
(LYX_USE_XFORMS_IMAGE_LOADER): use XPM_LIB here
2002-08-14 John Levon <levon@movementarian.org>
* configure.in:

4
config/lyxinclude.m4
View File

@ -502,8 +502,8 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
dnl Usage LYX_PATH_XPM: Checks for xpm library and header
AC_DEFUN(LYX_PATH_XPM,[
### Check for Xpm library
AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage,XPM_LIB="-lXpm",
[LYX_LIB_ERROR(libXpm,Xpm)], $XPM_LIB)
AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage, XPM_LIB="-lXpm",
[LYX_LIB_ERROR(libXpm,Xpm)])
AC_SUBST(XPM_LIB)
### Check for Xpm headers
lyx_cv_xpm_h_location="<xpm.h>"

11
config/xforms.m4
View File

@ -4,12 +4,11 @@ dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
AC_DEFUN(LYX_PATH_XFORMS,[
LIBS="$XPM_LIB $LIBS"
AC_REQUIRE([LYX_PATH_XPM])
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)])])
[LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
AC_SUBST(XFORMS_LIB)
### Check for xforms headers
@ -65,9 +64,9 @@ fi
dnl Check whether the xforms library has a viable image loader
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
[
[AC_REQUIRE([LYX_PATH_XFORMS])
save_LIBS=$LIBS
LIBS="$XFORMS_LIB $LIBS"
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
lyx_use_xforms_image_loader=no
AC_LANG_SAVE
AC_LANG_C
@ -79,7 +78,7 @@ AC_SEARCH_LIBS(flimage_dup, flimage,
[lyx_use_xforms_image_loader=yes
if test "$ac_cv_search_flimage_dup" != "none required" ; then
XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
LIBS="$XFORMS_IMAGE_LIB $XFORMS_LIB $LIBS"
LIBS="$XFORMS_IMAGE_LIB $LIBS"
fi])
AC_SUBST(XFORMS_IMAGE_LIB)