# HG changeset patch
# User Michael C. Grant <mcg@cvxr.com>
# Date 1390603223 28800
# Node ID 97984c1c41f0a13d0be798cf0f5569845c26d58b
# Parent  7655206949925ad5a98f01be6e85088097da1325
Part 2: Find Qt libs in framework option for Macs (bug #41236)

* configure.ac: Only look through -F framework option if regular detection has
failed.

diff -r 765520694992 -r 97984c1c41f0 configure.ac
--- a/configure.ac	Fri Jan 24 11:58:04 2014 -0800
+++ b/configure.ac	Fri Jan 24 14:40:23 2014 -0800
@@ -2726,9 +2726,14 @@
     case $host_os in
       *darwin*)
         ## Qt might be installed in framework
-        QT_LDFLAGS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
-        QT_LIBS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
-        AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes || test -n $QT_LDFLAGS])
+        if test -z "$QT_LIBS"; then
+          QT_LDFLAGS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
+          QT_LIBS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
+          ## Enabling link_all_deps works around libtool's imperfect handling
+          ## of the -F flag
+          AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS],
+                         [test $link_all_deps = yes || test -n "$QT_LDFLAGS"])
+        fi
       ;;
     esac