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

honor --disable-x

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7338 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-07-22 09:16:48 +00:00
parent c3e778fedb
commit 6a2c7cb4eb
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.in:
* configure.ac: only add X libraries to LIBS if --disable-x has
not been passed to configure (useful for Qt/Mac)
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyxinclude.m4: add gcc 3.4

20
config/configure.ac
View File

@ -141,10 +141,16 @@ fi
CHECK_WITH_CYGWIN
### Check for X libraries
# The real thing.
AC_PATH_XTRA
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
case $have_x in
yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
no) LYX_ERROR(dnl
[Cannot find X window libraries and/or headers. Check your installation.
If you use a Linux system, check that you have installed
the development tools.]);;
disable) ;;
esac
### check which frontend we want to use
@ -194,14 +200,6 @@ dnl ;;
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
### Check for xforms and xpm (only if X has been found).
if test "$have_x" = no ; then
LYX_ERROR(dnl
[Cannot find X window libraries and/or headers. Check your installation.
If you use a Linux system, check that you have installed
the development tools.])
fi
### Setup GNU gettext
dnl GNU gettext is written in C
AC_LANG_PUSH(C)

20
config/configure.in
View File

@ -142,10 +142,16 @@ fi
CHECK_WITH_CYGWIN
### Check for X libraries
# The real thing.
AC_PATH_XTRA
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
case $have_x in
yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
no) LYX_ERROR(dnl
[Cannot find X window libraries and/or headers. Check your installation.
If you use a Linux system, check that you have installed
the development tools.]);;
disable) ;;
esac
### check which frontend we want to use
@ -197,14 +203,6 @@ dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
### Check for xforms and xpm (only if X has been found).
if test "$have_x" = no ; then
LYX_ERROR(dnl
[Cannot find X window libraries and/or headers. Check your installation.
If you use a Linux system, check that you have installed
the development tools.])
fi
### Setup GNU gettext
dnl GNU gettext is written in C
AC_LANG_C