Mercurial > octave-dspies
changeset 18378:97984c1c41f0 stable
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.
| author | Michael C. Grant <mcg@cvxr.com> |
|---|---|
| date | Fri, 24 Jan 2014 14:40:23 -0800 |
| parents | 765520694992 |
| children | abc78c10acb6 |
| files | configure.ac |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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