anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not check for X libraries if pkg-config succeeded

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26829 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2008-10-09 14:10:09 +00:00
parent 391ba1e592
commit ca67cfffe0
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/qt4.m4
View File

@ -182,6 +182,16 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
AC_DEFUN([QT4_DO_MANUAL_CONFIG],
[
dnl Check for X libraries
AC_PATH_X
AC_PATH_XTRA
case $have_x in
yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
no) LYX_ERROR([Cannot find X window libraries and/or headers.]);;
disable) ;;
esac
dnl flags for compilation
QT4_INCLUDES=
QT4_LDFLAGS=

12
configure.ac
View File

@ -164,18 +164,6 @@ AC_CHECK_HEADERS(zlib.h,
[LYX_LIB_ERROR(zlib.h,zlib)])
### Check for X libraries
AC_PATH_XTRA
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
dnl The code below is not in a macro, because this would cause big