Mercurial > octave-libgccjit
changeset 18353:b5a83c383008 gui-release
maint: Merge stable -> gui-release.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 23 Jan 2014 14:40:02 -0800 |
parents | 26eac61ebab2 (current diff) c460566106f0 (diff) |
children | c9b284dd28c6 87d96a7d50e0 |
files | configure.ac |
diffstat | 2 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Jan 23 16:15:46 2014 -0500 +++ b/configure.ac Thu Jan 23 14:40:02 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'], @@ -2304,7 +2304,7 @@ msdosmsvc | mingw*) AC_CHECK_FUNCS([setvbuf], [], [AC_MSG_ERROR([Missing function required to build Octave])]) - ;; + ;; esac ## Cygwin kluge for getrusage. @@ -2723,6 +2723,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" @@ -2810,7 +2819,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], @@ -2818,7 +2827,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