Mercurial > octave-nkf

comparison configure.ac @ 18515:bc31d9359cf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 21 Feb 2014 18:20:35 -0500
parents c579bd4e12c9 1075f2543574
children c936beeda029
comparison
equal deleted inserted replaced
18506:146ce31e5d28 18515:bc31d9359cf9
2703 2703
2704 if test $build_gui = yes; then 2704 if test $build_gui = yes; then
2705 2705
2706 warn_gui="" 2706 warn_gui=""
2707 ## Check for Qt libraries 2707 ## Check for Qt libraries
2708 PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork, QtOpenGL], 2708 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL"
2709 PKG_CHECK_MODULES(QT, [$QT_MODULES],
2709 [], 2710 [],
2710 [warn_gui="Qt libraries not found -- disabling GUI" 2711 [warn_gui="Qt libraries not found -- disabling GUI"
2711 build_gui=no]) 2712 build_gui=no])
2712 2713
2713 if test $build_gui = yes; then 2714 if test $build_gui = yes; then
2714 ## Retrieve Qt compilation and linker flags 2715 ## Retrieve Qt compilation and linker flags
2715 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork QtOpenGL`" 2716 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I $QT_MODULES`"
2716 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork QtOpenGL`" 2717 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L $QT_MODULES`"
2717 QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork QtOpenGL`" 2718 QT_LIBS="`$PKG_CONFIG --libs-only-l $QT_MODULES`"
2718 2719
2719 case $host_os in 2720 case $host_os in
2720 *darwin*) 2721 *darwin*)
2721 ## Qt might be installed in framework 2722 ## Qt might be installed in framework
2722 if test -z "$QT_LIBS"; then 2723 if test -z "$QT_LIBS"; then
2723 QT_LDFLAGS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" 2724 QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
2724 QT_LIBS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" 2725 QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
2725 ## Enabling link_all_deps works around libtool's imperfect handling 2726 ## Enabling link_all_deps works around libtool's imperfect handling
2726 ## of the -F flag 2727 ## of the -F flag
2727 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], 2728 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS],
2728 [test $link_all_deps = yes || test -n "$QT_LDFLAGS"]) 2729 [test $link_all_deps = yes || test -n "$QT_LDFLAGS"])
2729 fi 2730 fi