do not check for X libraries if pkg-config succeeded

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26829 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/qt4.m4 b/config/qt4.m4
index c5b95eda24c98ba7266819aad827c93908a5949b..18fae10e05268bc14bce7c4c8915e05466e94418 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -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=

diff --git a/configure.ac b/configure.ac
index d062534a5c427630d1379373ef441ce166a0ed63..fb7cca757364223456c5cff18848ea0b4d553172 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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