X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fqt4.m4;h=1cf557d637239bd9ce3fb0df98904c9e283fde6b;hb=acb34ac53f009eb42efeb1f7768047a7b5a43513;hp=2bcd4f3bfc51bca53c990f572b5a9a702c842601;hpb=6343a017f75e65fee9fb2afd2812d016877961d8;p=lyx.git

diff --git a/config/qt4.m4 b/config/qt4.m4
index 2bcd4f3bfc..1cf557d637 100644
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -71,11 +71,20 @@ AC_DEFUN([QT_FIND_TOOL],
 	if test "x$USE_QT5" != "xno" ; then
 		qt_ext=qt5
 	fi
+
 	if test -n "$qt_cv_bin" ; then
 		AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
+	elif qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then
+		AC_PATH_PROG(qtc_path, qtchooser, [], [$PATH])
+		AC_PATH_PROG($2_path, $2, [], [$PATH])
+		qtc_path=`dirname "$qtc_path"`
+		$2_path=`dirname "$$2_path"`
+		if test "$qtc_path" = "$$2_path" ; then
+			AC_CHECK_PROG($1, $2, [$2 -qt=$qt_ext],, [$PATH])
+		fi
 	fi
 	if test -z "$$1"; then
-		AC_PATH_PROGS($1, [$2-$qt_ext $2],[],$PATH)
+		AC_CHECK_PROGS($1, [$2-$qt_ext $2],[],$PATH)
 	fi
 	if test -z "$$1"; then
 		AC_MSG_ERROR([cannot find $2 binary.])
@@ -169,18 +178,33 @@ AC_DEFUN([QT_DO_IT_ALL],
 	[AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
 	])
 
+	save_CPPFLAGS=$CPPFLAGS
+	CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
+	AC_CHECK_HEADER(QtGui/qtgui-config.h,
+	  [lyx_qt5_config=QtGui/qtgui-config.h],
+	  [lyx_qt5_config=qconfig.h],[-])
+	AC_MSG_CHECKING([whether Qt uses the X Window system])
 	if test x$USE_QT5 = xyes ; then
-	  save_CPPFLAGS=$CPPFLAGS
-	  AC_MSG_CHECKING([whether Qt uses the X Window system])
-	  CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
 	  AC_EGREP_CPP(xcb,
-	    [#include <qconfig.h>
+	    [#include <$lyx_qt5_config>
 	    QT_QPA_DEFAULT_PLATFORM_NAME],
 	    [AC_MSG_RESULT(yes)
 	     AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
 	    [AC_MSG_RESULT(no)])
-	  CPPFLAGS=$save_CPPFLAGS
+	else
+	  AC_PREPROC_IFELSE([AC_LANG_SOURCE([
+	    [#include <qglobal.h>],
+	    [#ifndef Q_WS_X11],
+	    [#error Fail],
+	    [#endif]])],
+	    qt_use_x11=yes,
+	    qt_use_x11=no)
+	  AC_MSG_RESULT($qt_use_x11)
+	  if test "x$qt_use_x11" = "xyes"; then
+	    QT_LIB="$QT_LIB -lX11"
+	  fi
 	fi
+	CPPFLAGS=$save_CPPFLAGS
 
 	QT_FIND_TOOL([QT_MOC], [moc])
 	QT_FIND_TOOL([QT_UIC], [uic])
@@ -206,6 +230,13 @@ AC_DEFUN([QT_DO_PKG_CONFIG],
 	if test "x$USE_QT5" != "xno" ; then
 		qt_corelibs="Qt5Core"
 		qt_guilibs="Qt5Core Qt5Concurrent Qt5Gui Qt5Svg Qt5Widgets"
+		lyx_use_x11extras=false
+		PKG_CHECK_EXISTS(Qt5X11Extras, [lyx_use_x11extras=true], [])
+		if $lyx_use_x11extras; then
+			qt_guilibs="$qt_guilibs Qt5X11Extras xcb"
+			AC_DEFINE(HAVE_QT5_X11_EXTRAS, 1,
+				[Define if you have the Qt5X11Extras module])
+		fi
 		lyx_use_winextras=false
 		PKG_CHECK_EXISTS(Qt5WinExtras, [lyx_use_winextras=true], [])
 		if $lyx_use_winextras; then