Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 6414bbaabb4e697ba58159887899f1427f8011d8..059c776a41ee02e9e3acf828e94eae3d4951ed34 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
                do
                        QT4_TRY_LINK($libname)
                        if test -n "$qt4_cv_libname"; then
@@ -36,6 +36,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
                                break;
                        fi
                done
+               qt4_cv_libname=
                for libname in '-lQtCore -lQtGui' \
                               '-lQtCore4 -lQtGui4'
                do
@@ -134,7 +135,10 @@ AC_DEFUN([QT4_DO_IT_ALL],
        AC_SUBST(QT4_CPPFLAGS)
 
        dnl Check if it possible to do a pkg-config
-       QT4_DO_PKG_CONFIG
+       PKG_PROG_PKG_CONFIG
+       if test -n "$PKG_CONFIG" ; then
+               QT4_DO_PKG_CONFIG
+       fi
        if test "$pkg_failed" != "no" ; then
                QT4_DO_MANUAL_CONFIG
        fi
@@ -144,14 +148,14 @@ AC_DEFUN([QT4_DO_IT_ALL],
 
 AC_DEFUN([QT4_DO_PKG_CONFIG],
 [
-       PKG_PROG_PKG_CONFIG
+       dnl tell pkg-config to look also in $qt4_cv_dir/lib.
        save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
        if test -n "$qt4_cv_dir" ; then
-         PKG_CONFIG_PATH=$qt4_cv_dir/lib:$PKG_CONFIG_PATH
+         PKG_CONFIG_PATH=$qt4_cv_dir/lib:$qt4_cv_dir/lib/pkgconfig:$PKG_CONFIG_PATH
          export PKG_CONFIG_PATH
        fi
-       PKG_CHECK_MODULES(QT4_CORE, QtCore)
-       if test "$pkg_failed" == "no" ; then
+       PKG_CHECK_MODULES(QT4_CORE, QtCore,,[:])
+       if test "$pkg_failed" = "no" ; then
                QT4_CORE_INCLUDES=$QT4_CORE_CFLAGS
                AC_SUBST(QT4_CORE_INCLUDES)
                QT4_CORE_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore`
@@ -159,8 +163,8 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
                QT4_CORE_LIB=`$PKG_CONFIG --libs-only-l QtCore`
                AC_SUBST(QT4_CORE_LIB)
        fi
-       PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui)
-       if test "$pkg_failed" == "no" ; then
+       PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui,,[:])
+       if test "$pkg_failed" = "no" ; then
                QT4_INCLUDES=$QT4_FRONTEND_CFLAGS
                dnl QT4_LDFLAGS=$QT4_FRONTEND_LIBS
                QT4_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore QtGui`
@@ -170,6 +174,7 @@ 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
 ])