Quick workaround for detection of Qt/Mac using pkg-config

diff --git a/config/qt4.m4 b/config/qt4.m4
index c31d2c152b17706cc30cb57f96fafc66cdb132fd..ec8d0c78208b932665aab4c069324d2b6fc3981c 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -189,9 +189,17 @@ 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`"
+               dnl LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
        fi
        PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
+       dnl Actually, the values of QT4_LIB and QT4_CORE_LIB can be completely wrong on OS X,
+       dnl where everything goes to --libs-only-other.
+       dnl As a quick workaround, let us assign better values. A better patch exists
+       dnl for next cycle.
+       QT4_CORE_LIB=$QT4_CORE_LIBS
+       QT4_CORE_LDFLAGS=
+       QT4_LIB=$QT4_FRONTEND_LIBS
+       QT4_LDFLAGS=
 ])
 
 AC_DEFUN([QT4_DO_MANUAL_CONFIG],

diff --git a/status.20x b/status.20x
index 4bb42109419c570a2c016662fb0133137ceb424f..fc5bfceafb441751e26375ca5b5931c1b5bf579e 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -77,3 +77,5 @@ What's new
 
 * BUILD/INSTALLATION
 
+- improve detection of Qt via pkg-config, especially on Mac OS.
+