diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | unix/configure | 19 | ||||
| -rw-r--r-- | unix/tcl.m4 | 7 |
3 files changed, 25 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2004-06-19 Daniel Steffen <das@users.sourceforge.net> + + * unix/tcl.m4: autoconf 2.5 fixes in Darwin section. + * unix/configure: autoconf-2.57 + 2004-06-18 Donal K. Fellows <donal.k.fellows@man.ac.uk> * unix/tclUnixInit.c (localeTable): Added some more locale to diff --git a/unix/configure b/unix/configure index ae3262f..dccca68 100755 --- a/unix/configure +++ b/unix/configure @@ -5749,9 +5749,22 @@ rm -f conftest* LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" - # for compatibility with autoconf vers 2.13 : - HACK="" - CFLAGS="$CFLAGS -DMA${HACK}C_OSX_TCL -DHAVE_CFBUNDLE -DUSE_VFORK -DTCL_DEFAULT_ENCODING=\\\"utf-8\\\"" + cat >>confdefs.h <<\_ACEOF +#define MAC_OSX_TCL 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_CFBUNDLE 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define USE_VFORK 1 +_ACEOF + + cat >>confdefs.h <<_ACEOF +#define TCL_DEFAULT_ENCODING "utf-8" +_ACEOF + LIBS="$LIBS -framework CoreFoundation" ;; NEXTSTEP-*) diff --git a/unix/tcl.m4 b/unix/tcl.m4 index adbef12..08f33e7 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1318,9 +1318,10 @@ dnl AC_CHECK_TOOL(AR, ar) LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" - # for compatibility with autoconf vers 2.13 : - HACK="" - CFLAGS="$CFLAGS -DMA${HACK}C_OSX_TCL -DHAVE_CFBUNDLE -DUSE_VFORK -DTCL_DEFAULT_ENCODING=\\\"utf-8\\\"" + AC_DEFINE(MAC_OSX_TCL) + AC_DEFINE(HAVE_CFBUNDLE) + AC_DEFINE(USE_VFORK) + AC_DEFINE_UNQUOTED(TCL_DEFAULT_ENCODING,"utf-8") LIBS="$LIBS -framework CoreFoundation" ;; NEXTSTEP-*) |