]> git.lyx.org Git - features.git/commitdiff
Do not search for X in mingw builds
authorGeorg Baum <baum@lyx.org>
Thu, 5 May 2016 10:41:24 +0000 (12:41 +0200)
committerRichard Heck <rgheck@lyx.org>
Sun, 29 May 2016 21:55:43 +0000 (17:55 -0400)
The manual qt configuration did not work previously for mingw builds, since it
serached for X libraries, which are not used by LyX on mingw.

config/qt4.m4

index 33029b933d0010ffa6d4e1c3f924a4fa3ca8e2b3..2bcd4f3bfc51bca53c990f572b5a9a702c842601 100644 (file)
@@ -253,8 +253,13 @@ AC_DEFUN([QT_DO_PKG_CONFIG],
 AC_DEFUN([QT_DO_MANUAL_CONFIG],
 [
        dnl Check for X libraries
 AC_DEFUN([QT_DO_MANUAL_CONFIG],
 [
        dnl Check for X libraries
-       AC_PATH_X
-       AC_PATH_XTRA
+       case ${host} in
+       *mingw*) ;;
+       *) \
+         AC_PATH_X \
+         AC_PATH_XTRA \
+       ;;
+       esac
        case $have_x in
            yes) 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";;