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.
This commit is contained in:
Georg Baum 2016-05-05 12:41:24 +02:00 committed by Richard Heck
parent 78e17b1579
commit 6343a017f7

View File

@ -253,8 +253,13 @@ AC_DEFUN([QT_DO_PKG_CONFIG],
AC_DEFUN([QT_DO_MANUAL_CONFIG], AC_DEFUN([QT_DO_MANUAL_CONFIG],
[ [
dnl Check for X libraries dnl Check for X libraries
AC_PATH_X case ${host} in
AC_PATH_XTRA *mingw*) ;;
*) \
AC_PATH_X \
AC_PATH_XTRA \
;;
esac
case $have_x in case $have_x in
yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS";; CPPFLAGS="$CPPFLAGS $X_CFLAGS";;