From 6343a017f75e65fee9fb2afd2812d016877961d8 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 5 May 2016 12:41:24 +0200 Subject: [PATCH] Do not search for X in mingw builds 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/qt4.m4 b/config/qt4.m4 index 33029b933d..2bcd4f3bfc 100644 --- a/config/qt4.m4 +++ b/config/qt4.m4 @@ -253,8 +253,13 @@ AC_DEFUN([QT_DO_PKG_CONFIG], 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";;