diff options
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/unix/configure.in b/unix/configure.in index aa90f07..905278b 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.83.2.32 2006/05/04 13:09:47 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.83.2.33 2006/07/20 06:27:35 das Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -175,14 +175,14 @@ fi # special flag. #-------------------------------------------------------------------- -AC_CACHE_CHECK([for fd_set in sys/types], tcl_cv_type_fd_set, +AC_CACHE_CHECK([for fd_set in sys/types], tcl_cv_type_fd_set, [ AC_TRY_COMPILE([#include <sys/types.h>],[fd_set readMask, writeMask;], - tcl_cv_type_fd_set=yes, tcl_cv_type_fd_set=no)) + tcl_cv_type_fd_set=yes, tcl_cv_type_fd_set=no)]) tk_ok=$tcl_cv_type_fd_set if test $tk_ok = no; then - AC_CACHE_CHECK([for fd_mask in sys/select], tcl_cv_grep_fd_mask, + AC_CACHE_CHECK([for fd_mask in sys/select], tcl_cv_grep_fd_mask, [ AC_EGREP_HEADER(fd_mask, sys/select.h, - tcl_cv_grep_fd_mask=present, tcl_cv_grep_fd_mask=missing)) + tcl_cv_grep_fd_mask=present, tcl_cv_grep_fd_mask=missing)]) if test $tcl_cv_grep_fd_mask = present; then AC_DEFINE(HAVE_SYS_SELECT_H) tk_ok=yes @@ -222,10 +222,10 @@ AC_TYPE_UID_T # In OS/390 struct pwd has no pw_gecos field #------------------------------------------- -AC_CACHE_CHECK([pw_gecos in struct pwd], tcl_cv_pwd_pw_gecos, +AC_CACHE_CHECK([pw_gecos in struct pwd], tcl_cv_pwd_pw_gecos, [ AC_TRY_COMPILE([#include <pwd.h>], [struct passwd pwd; pwd.pw_gecos;], - tcl_cv_pwd_pw_gecos=yes, tcl_cv_pwd_pw_gecos=no)) + tcl_cv_pwd_pw_gecos=yes, tcl_cv_pwd_pw_gecos=no)]) if test $tcl_cv_pwd_pw_gecos = yes; then AC_DEFINE(HAVE_PW_GECOS) fi @@ -235,17 +235,24 @@ fi #-------------------------------------------------------------------- if test "`uname -s`" = "Darwin" ; then + AC_MSG_CHECKING([whether to use Aqua]) AC_ARG_ENABLE(aqua, [ --enable-aqua enable Aqua windowingsystem on Mac OS X [--disable-aqua]], - [tk_aqua=$enableval], [tk_aqua=no]) + [tk_aqua=$enableval], [tk_aqua=no]) if test $tk_aqua = yes; then - if test $tcl_corefoundation = no; then - AC_MSG_WARN([Aqua can only be used when CoreFoundation is available]) - tk_aqua=no - elif test ! -d /System/Library/Frameworks/Carbon.framework; then - AC_MSG_WARN([Aqua can only be used when Carbon is available]) - tk_aqua=no - fi + if test $tcl_corefoundation = no; then + AC_MSG_WARN([Aqua can only be used when CoreFoundation is available]) + tk_aqua=no + fi + if test ! -d /System/Library/Frameworks/Carbon.framework; then + AC_MSG_WARN([Aqua can only be used when Carbon is available]) + tk_aqua=no + fi + if test "`uname -r | awk -F. '{print [$]1}'`" -lt 6; then + AC_MSG_WARN([Aqua requires Mac OS X 10.2 or later]) + tk_aqua=no + fi fi + AC_MSG_RESULT([$tk_aqua]) if test $do64bit_ok = no ; then # remove -arch ppc64 from CFLAGS for fat builds as neither Aqua nor X11 # can be built for 64bit at present (no 64bit GUI libraries). |