do not check for X libraries if pkg-config succeeded

[features.git] / config / qt4.m4

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=