Prepare LyX code to compile and link with Qt5:

[features.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 7166e88f789e7d41cd3a12386460b3818fd13182..3114341051d374fdd5e64092370f3532e1dbc7c2 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
@@ -141,6 +143,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
        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],
@@ -195,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)