Mercurial > octave-nkf

comparison configure.ac @ 18352:c460566106f0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Find Qt libs in framework option for Macs (bug #41236) * configure.ac: On Darwin OS only, look for Qt libraries in Framework directory. * src/Makefile.am: Add missing line continuation to octave_cli_LDADD definition list.
author Michael C. Grant <mcg@cvxr.com>
date Thu, 23 Jan 2014 14:37:43 -0800
parents ee7f66925267
children b5a83c383008 97984c1c41f0
comparison
equal deleted inserted replaced
18349:50505bf88b82 18352:c460566106f0
181 yes | "") 181 yes | "")
182 case $host_os in 182 case $host_os in
183 mingw* | msdosmsvc) 183 mingw* | msdosmsvc)
184 sepchar=';' ;; 184 sepchar=';' ;;
185 esac 185 esac
186 ;; 186 ;;
187 no) 187 no)
188 AC_MSG_ERROR([You are required to define a path separation character]) 188 AC_MSG_ERROR([You are required to define a path separation character])
189 ;; 189 ;;
190 *) 190 *)
191 sepchar=$with_sepchar 191 sepchar=$with_sepchar
192 ;; 192 ;;
193 esac 193 esac
194 AC_SUBST(sepchar) 194 AC_SUBST(sepchar)
195 AC_DEFINE_UNQUOTED(SEPCHAR, ['$sepchar'], 195 AC_DEFINE_UNQUOTED(SEPCHAR, ['$sepchar'],
196 [Define this to be the path separator for your system, as a character constant.]) 196 [Define this to be the path separator for your system, as a character constant.])
197 AC_DEFINE_UNQUOTED(SEPCHAR_STR, ["$sepchar"], 197 AC_DEFINE_UNQUOTED(SEPCHAR_STR, ["$sepchar"],
2302 ## Windows-specific use of functions 2302 ## Windows-specific use of functions
2303 case $host_os in 2303 case $host_os in
2304 msdosmsvc | mingw*) 2304 msdosmsvc | mingw*)
2305 AC_CHECK_FUNCS([setvbuf], [], 2305 AC_CHECK_FUNCS([setvbuf], [],
2306 [AC_MSG_ERROR([Missing function required to build Octave])]) 2306 [AC_MSG_ERROR([Missing function required to build Octave])])
2307 ;; 2307 ;;
2308 esac 2308 esac
2309 2309
2310 ## Cygwin kluge for getrusage. 2310 ## Cygwin kluge for getrusage.
2311 AC_CHECK_FUNCS([getrusage]) 2311 AC_CHECK_FUNCS([getrusage])
2312 case $host_os in 2312 case $host_os in
2720 if test $build_gui = yes; then 2720 if test $build_gui = yes; then
2721 ## Retrieve Qt compilation and linker flags 2721 ## Retrieve Qt compilation and linker flags
2722 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork`" 2722 QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork`"
2723 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork`" 2723 QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork`"
2724 QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork`" 2724 QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork`"
2725
2726 case $host_os in
2727 *darwin*)
2728 ## Qt might be installed in framework
2729 QT_LDFLAGS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
2730 QT_LIBS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
2731 AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes || test -n $QT_LDFLAGS])
2732 ;;
2733 esac
2725 2734
2726 ## Check for Qt4 2735 ## Check for Qt4
2727 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then 2736 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then
2728 warn_gui="Qt >= 4.0.0 not found -- disabling GUI" 2737 warn_gui="Qt >= 4.0.0 not found -- disabling GUI"
2729 build_gui=no 2738 build_gui=no
2807 case $host_os in 2816 case $host_os in
2808 mingw* | msdosmsvc*) 2817 mingw* | msdosmsvc*)
2809 AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes], 2818 AC_CHECK_FUNCS([setvbuf], [win32_terminal=yes],
2810 [warn_gui="setvbuf not found -- disabling GUI" 2819 [warn_gui="setvbuf not found -- disabling GUI"
2811 build_gui=no]) 2820 build_gui=no])
2812 ;; 2821 ;;
2813 *) 2822 *)
2814 AC_CHECK_HEADERS([pty.h libutil.h util.h]) 2823 AC_CHECK_HEADERS([pty.h libutil.h util.h])
2815 AC_SEARCH_LIBS([openpty], [util], 2824 AC_SEARCH_LIBS([openpty], [util],
2816 [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])]) 2825 [AC_DEFINE(HAVE_OPENPTY, [], [Define whether openpty exists])])
2817 AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [], 2826 AC_CHECK_FUNCS([chmod chown ftruncate mmap munmap], [],
2818 [AC_MSG_ERROR([At least one of chmod, chown, ftruncate, mmap, and munmap not found -- disabling GUI]) 2827 [AC_MSG_ERROR([At least one of chmod, chown, ftruncate, mmap, and munmap not found -- disabling GUI])
2819 build_gui=no]) 2828 build_gui=no])
2820 ;; 2829 ;;
2821 esac 2830 esac
2822 fi 2831 fi
2823 fi 2832 fi
2824 2833
2825 if test -n "$warn_gui"; then 2834 if test -n "$warn_gui"; then