Get rid of LYX_ERROR in our configure file.

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 728697c14ee3e100a9297331bdc09a98a2303a6e..d91d9ef0efb12de82376b1e09b9be60018ef852f 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -28,7 +28,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
                AC_LANG_CPLUSPLUS
                SAVE_CXXFLAGS=$CXXFLAGS
                CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
-               for libname in -lQtCore -lQtCore4
+               for libname in -lQtCore -lQtCore4 '-framework QtCore'
                do
                        QT4_TRY_LINK($libname)
                        if test -n "$qt4_cv_libname"; then
@@ -38,7 +38,9 @@ AC_DEFUN([QT4_CHECK_COMPILE],
                done
                qt4_cv_libname=
                for libname in '-lQtCore -lQtGui' \
-                              '-lQtCore4 -lQtGui4'
+                              '-lQtCore4 -lQtGui4' \
+                              '-framework QtCore -framework QtConcurrent -framework QtWidgets -framework QtGui'\
+                              '-framework QtCore -framework QtGui'
                do
                        QT4_TRY_LINK($libname)
                        if test -n "$qt4_cv_libname"; then
@@ -50,9 +52,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 
        if test -z "$qt4_cv_libname"; then
                AC_MSG_RESULT([failed])
-               if test "$FATAL" = 1 ; then
-                       AC_MSG_ERROR([Cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR !])
-               fi
+               AC_MSG_ERROR([cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR.])
        else
                AC_MSG_RESULT([$qt4_cv_libname])
        fi
@@ -90,17 +90,13 @@ AC_DEFUN([QT4_DO_IT_ALL],
        dnl this variable is precious
        AC_ARG_VAR(QT4DIR, [the place where the Qt 4 files are, e.g. /usr/lib/qt4])
 
-       dnl Please leave this alone. I use this file in
-       dnl oprofile.
-       FATAL=0
-
-       AC_ARG_WITH(qt4-dir, [  --with-qt4-dir           where the root of Qt 4 is installed ],
+       AC_ARG_WITH(qt4-dir, [AC_HELP_STRING([--with-qt4-dir], [where the root of Qt 4 is installed])],
                [ qt4_cv_dir=`eval echo "$withval"/` ])
 
-       AC_ARG_WITH(qt4-includes, [  --with-qt4-includes      where the Qt 4 includes are. ],
+       AC_ARG_WITH(qt4-includes, [AC_HELP_STRING([--with-qt4-includes], [where the Qt 4 includes are])],
                [ qt4_cv_includes=`eval echo "$withval"` ])
 
-       AC_ARG_WITH(qt4-libraries, [  --with-qt4-libraries     where the Qt 4 library is installed.],
+       AC_ARG_WITH(qt4-libraries, [AC_HELP_STRING([--with-qt4-libraries], [where the Qt 4 library is installed])],
                [  qt4_cv_libraries=`eval echo "$withval"` ])
 
        dnl pay attention to $QT4DIR unless overridden
@@ -124,13 +120,9 @@ AC_DEFUN([QT4_DO_IT_ALL],
        fi
 
        dnl Preprocessor flags
-       QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS"
+       QT4_CPPFLAGS="-DQT_NO_STL -DQT_NO_KEYWORDS"
        case ${host} in
        *mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
-       *cygwin*)
-       if test "x$with_x" = xno ; then
-               QT4_CPPFLAGS="$QT4_CPPFLAGS -DQ_CYGWIN_WIN"
-       fi;;
        esac
        AC_SUBST(QT4_CPPFLAGS)
 
@@ -142,8 +134,16 @@ AC_DEFUN([QT4_DO_IT_ALL],
        if test "$pkg_failed" != "no" ; then
                QT4_DO_MANUAL_CONFIG
        fi
+
+       dnl Check qt version
+       AS_VERSION_COMPARE($QT4_VERSION, $1, 
+       [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QT4_VERSION has been found.])
+       ])
+
        AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
        AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
+       AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
+       AC_CHECK_PROG(bc_found,[bc],[yes],[no],$PATH)
 ])
 
 AC_DEFUN([QT4_DO_PKG_CONFIG],
@@ -174,12 +174,23 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
                AC_SUBST(QT4_VERSION)
                QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui`
                AC_SUBST(QT4_LIB)
+               LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
        fi
        PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
 ])
 
 AC_DEFUN([QT4_DO_MANUAL_CONFIG],
 [
+       dnl Check for X libraries
+       AC_PATH_X
+       AC_PATH_XTRA
+       case $have_x in
+           yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+                CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
+            no) AC_MSG_ERROR([cannot find X window libraries and/or headers.]);;
+       disable) ;;
+       esac
+
        dnl flags for compilation
        QT4_INCLUDES=
        QT4_LDFLAGS=
@@ -187,15 +198,23 @@ AC_DEFUN([QT4_DO_MANUAL_CONFIG],
        QT4_CORE_LDFLAGS=
        if test -n "$qt4_cv_includes"; then
                QT4_INCLUDES="-I$qt4_cv_includes"
-               for i in Qt QtCore QtGui; do
+               for i in Qt QtCore QtGui QtWidgets QtConcurrent; do
                        QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
                done
                QT4_CORE_INCLUDES="-I$qt4_cv_includes -I$qt4_cv_includes/QtCore"
        fi
-       if test -n "$qt4_cv_libraries"; then
+       case "$qt4_cv_libraries" in
+       *framework*)
+               QT4_LDFLAGS="-F$qt4_cv_libraries"
+               QT4_CORE_LDFLAGS="-F$qt4_cv_libraries"
+               ;;
+       "")
+               ;;
+       *)
                QT4_LDFLAGS="-L$qt4_cv_libraries"
                QT4_CORE_LDFLAGS="-L$qt4_cv_libraries"
-       fi
+               ;;
+       esac
        AC_SUBST(QT4_INCLUDES)
        AC_SUBST(QT4_CORE_INCLUDES)
        AC_SUBST(QT4_LDFLAGS)