diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/configure.in | 4 |
3 files changed, 9 insertions, 3 deletions
@@ -1,4 +1,10 @@ +2006-01-23 Daniel Steffen <das@users.sourceforge.net> + + * unix/configure: minor fix to Darwin specific code removing + * unix/configure.in: 64bit flags from CFLAGS for Tk build. + 2006-01-20 Joe English <jenglish@users.sourceforge.net> + * generic/tkEvent.c, unix/tkUnixEvent.c: XIM fixes [See #905830, patch tk84-xim-fixes.patch]. + Revert 2005-12-05 patch disabling XIM when SCIM in use; diff --git a/unix/configure b/unix/configure index 21a48d6..f3185f2 100755 --- a/unix/configure +++ b/unix/configure @@ -8729,7 +8729,7 @@ echo "$as_me: WARNING: Aqua can only be used when Carbon is available" >&2;} 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/'`" + CFLAGS="`echo "$CFLAGS" | sed -e 's/-arch ppc64/-arch ppc/g'`" fi else tk_aqua=no diff --git a/unix/configure.in b/unix/configure.in index a64b273..6781860 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.114 2006/01/10 05:37:53 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.115 2006/01/23 00:53:03 das Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -253,7 +253,7 @@ if test "`uname -s`" = "Darwin" ; then 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/'`" + CFLAGS="`echo "$CFLAGS" | sed -e 's/-arch ppc64/-arch ppc/g'`" fi else tk_aqua=no |