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

rebostify a bit

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5411 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-10-15 14:08:52 +00:00
parent cc1f4a2dc4
commit e2b02e86e4
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/ChangeLog
View File

@ -1,3 +1,8 @@
2002-10-15 Lars Gullik Bjønnes <larsbj@birdstep.com>
* configure.in,configure.ac: make the AM_CONDITIONAL check a bit
more robust.
2002-10-15 Lars Gullik Bjønnes <larsbj@gullik.net> 2002-10-15 Lars Gullik Bjønnes <larsbj@gullik.net>
* xforms.m4 (lyx_use_xforms_image_loader): move the AM_CONDITIONAL * xforms.m4 (lyx_use_xforms_image_loader): move the AM_CONDITIONAL

3
config/configure.ac
View File

@ -201,8 +201,9 @@ case "$lyx_use_frontend" in
LYX_ERROR(Unknown frontend $lyx_use_frontend);; LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac esac
# Do this here instead of in the LYX_USE_XFORMS_IMAGE_LOADER macro
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
test $lyx_use_xforms_image_loader = no) test x$lyx_use_xforms_image_loader = xno)
### Check for xforms and xpm (only if X has been found). ### Check for xforms and xpm (only if X has been found).
if test "$have_x" = no ; then if test "$have_x" = no ; then

2
config/configure.in
View File

@ -204,7 +204,7 @@ case "$lyx_use_frontend" in
esac esac
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
test $lyx_use_xforms_image_loader = no) test x$lyx_use_xforms_image_loader = xno)
### Check for xforms and xpm (only if X has been found). ### Check for xforms and xpm (only if X has been found).

2
config/xforms.m4
View File

@ -93,7 +93,7 @@ fi
### 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,
# test $lyx_use_xforms_image_loader = no) # test x$lyx_use_xforms_image_loader = xno)
AC_LANG_RESTORE AC_LANG_RESTORE
LIBS=$save_LIBS]) LIBS=$save_LIBS])