# HG changeset patch
# User Rik <rik@octave.org>
# Date 1390516835 28800
# Node ID c9b284dd28c62383b99a7ab0bd331a6c5ee9c15a
# Parent  cd897532aaeca2a7e45548b8d61143ab6389a9a0# Parent  b5a83c38300838ac5a1d20fd791942d9d7155b88
maint: Merge gui-release -> stable.

diff -r cd897532aaec -r c9b284dd28c6 configure.ac
--- a/configure.ac	Thu Jan 23 16:16:07 2014 -0500
+++ b/configure.ac	Thu Jan 23 14:40:35 2014 -0800
@@ -183,13 +183,13 @@
       mingw* | msdosmsvc)
         sepchar=';' ;;
     esac
-    ;;
+  ;;
   no)
     AC_MSG_ERROR([You are required to define a path separation character])
     ;;
   *)
     sepchar=$with_sepchar
-    ;;
+  ;;
 esac
 AC_SUBST(sepchar)
 AC_DEFINE_UNQUOTED(SEPCHAR, ['$sepchar'],
@@ -2297,7 +2297,7 @@
   msdosmsvc | mingw*)
     AC_CHECK_FUNCS([setvbuf], [],
                    [AC_MSG_ERROR([Missing function required to build Octave])])
-    ;;
+  ;;
 esac
 
 ## Cygwin kluge for getrusage.
@@ -2716,6 +2716,15 @@
     QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork`"
     QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork`"
 
+    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])
+      ;;
+    esac
+
     ## Check for Qt4
     if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then
       warn_gui="Qt >= 4.0.0 not found -- disabling GUI"
@@ -2803,7 +2812,7 @@
           AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes],
             [warn_gui="setvbuf not found -- disabling GUI"
              build_gui=no])
-          ;;
+        ;;
         *)
           AC_CHECK_HEADERS([pty.h libutil.h util.h])
           AC_SEARCH_LIBS([openpty], [util],
@@ -2811,7 +2820,7 @@
           AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [],
             [AC_MSG_ERROR([At least one of chmod, chown, ftruncate, mmap, and munmap not found -- disabling GUI])
              build_gui=no])
-          ;;
+        ;;
       esac
     fi
   fi
diff -r cd897532aaec -r c9b284dd28c6 src/Makefile.am
--- a/src/Makefile.am	Thu Jan 23 16:16:07 2014 -0500
+++ b/src/Makefile.am	Thu Jan 23 14:40:35 2014 -0800
@@ -87,7 +87,7 @@
 octave_cli_SOURCES = main-cli.cc
 
 octave_cli_LDADD = \
-  $(OCTAVE_CORE_LIBS)
+  $(OCTAVE_CORE_LIBS) \
   $(OCTAVE_LINK_DEPS)
 
 octave_cli_LDFLAGS = \