diff options
| author | das <das> | 2005-11-27 04:23:10 (GMT) |
|---|---|---|
| committer | das <das> | 2005-11-27 04:23:10 (GMT) |
| commit | fe7ec113d4d7be4b2543e1e0cf6d21a74aef667d (patch) | |
| tree | ebe77e2e1f36875492cca3cd7094d81c2fde42ef | |
| parent | 3dadea6fa58518be89d8e48e340285cd5d916887 (diff) | |
| download | tk-fe7ec113d4d7be4b2543e1e0cf6d21a74aef667d.zip tk-fe7ec113d4d7be4b2543e1e0cf6d21a74aef667d.tar.gz tk-fe7ec113d4d7be4b2543e1e0cf6d21a74aef667d.tar.bz2 | |
Darwin: disable ppc64 for fat builds since neither Aqua nor X11 is
available for 64 bit at present.
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/configure.in | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/unix/configure b/unix/configure index ead6e5c..15114cb 100755 --- a/unix/configure +++ b/unix/configure @@ -8668,6 +8668,11 @@ echo "$as_me: WARNING: \"Aqua can only be used when Carbon is available\"" >&2;} tk_aqua=no fi fi + 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). + CFLAGS="`echo "$CFLAGS" | sed -e 's/-arch ppc64/-arch ppc/'`" + fi else tk_aqua=no fi diff --git a/unix/configure.in b/unix/configure.in index 55bbadf..6a57f1d 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.112 2005/11/27 02:36:16 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.113 2005/11/27 04:23:10 das Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -255,6 +255,11 @@ if test "`uname -s`" = "Darwin" ; then tk_aqua=no fi fi + 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). + CFLAGS="`echo "$CFLAGS" | sed -e 's/-arch ppc64/-arch ppc/'`" + fi else tk_aqua=no fi |