Fix configure script with autoconf 2.71

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 0e357a44de7f449349be8bf1e53c2c041d2fd36c..0d77b8c7ea5fbd81444987d23731ddd557b1957f 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -3,18 +3,15 @@ AC_DEFUN([QT_TRY_LINK],
 [
        SAVE_LIBS="$LIBS"
        LIBS="$LIBS $1"
-       AC_TRY_LINK([
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([[
        #include <qglobal.h>
        #include <qstring.h>
-               ],
-       [
+               ]], [[
        QString s("mangle_failure");
        #if (QT_VERSION < 400)
        break_me_(\\\);
        #endif
-       ],
-       qt_cv_libname=$1,
-       )
+       ]])],[qt_cv_libname=$1],[])
        LIBS="$SAVE_LIBS"
 ])
 
@@ -25,7 +22,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
 
        AC_CACHE_VAL(qt_cv_libname,
        [
-               AC_LANG_CPLUSPLUS
+               AC_LANG([C++])
                SAVE_CXXFLAGS=$CXXFLAGS
                CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
                qt_corelibs="-lQtCore -lQtCore4"
@@ -75,7 +72,13 @@ AC_DEFUN([QT_FIND_TOOL],
        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_CHECK_PROG($1, $2, [$2 -qt=$qt_ext],, [$PATH])
+               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_CHECK_PROGS($1, [$2-$qt_ext $2],[],$PATH)
@@ -91,7 +94,7 @@ AC_DEFUN([QT_GET_VERSION],
 [
        AC_CACHE_CHECK([Qt version],lyx_cv_qtversion,
        [
-               AC_LANG_CPLUSPLUS
+               AC_LANG([C++])
                SAVE_CPPFLAGS=$CPPFLAGS
                CPPFLAGS="$CPPFLAGS $QT_INCLUDES"
 
@@ -118,13 +121,13 @@ AC_DEFUN([QT_DO_IT_ALL],
        dnl this variable is precious
        AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])
 
-       AC_ARG_WITH(qt-dir, [AC_HELP_STRING([--with-qt-dir], [where the root of Qt is installed])],
+       AC_ARG_WITH(qt-dir, [AS_HELP_STRING([--with-qt-dir],[where the root of Qt is installed])],
                [ qt_cv_dir=`eval echo "$withval"/` ])
 
-       AC_ARG_WITH(qt-includes, [AC_HELP_STRING([--with-qt-includes], [where the Qt includes are])],
+       AC_ARG_WITH(qt-includes, [AS_HELP_STRING([--with-qt-includes],[where the Qt includes are])],
                [ qt_cv_includes=`eval echo "$withval"` ])
 
-       AC_ARG_WITH(qt-libraries, [AC_HELP_STRING([--with-qt-libraries], [where the Qt library is installed])],
+       AC_ARG_WITH(qt-libraries, [AS_HELP_STRING([--with-qt-libraries],[where the Qt library is installed])],
                [  qt_cv_libraries=`eval echo "$withval"` ])
 
        dnl pay attention to $QTDIR unless overridden
@@ -172,25 +175,40 @@ 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])
        QT_FIND_TOOL([QT_RCC], [rcc])
 
        dnl Safety check
-       mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]\.[[0-9]]\).*/\1/'`
+       mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'`
        if test "x$mocqtver" != "x$QTLIB_VERSION"; then
                LYX_WARNING([The found moc compiler is for Qt $mocqtver but the Qt library version is $QTLIB_VERSION.])
        fi
@@ -209,6 +227,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