From e4cf514e4a4ef9a017d07a5802f96572897c9de7 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sun, 14 Jul 2013 20:27:52 +0200
Subject: [PATCH] Quick workaround for detection of Qt/Mac using pkg-config

---
 config/qt4.m4 | 10 +++++++++-
 status.20x    |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/qt4.m4 b/config/qt4.m4
index c31d2c152b..ec8d0c7820 100644
--- 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 4bb4210941..fc5bfceafb 100644
--- 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.
+