summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2004-06-18 15:30:16 (GMT)
committerdas <das>2004-06-18 15:30:16 (GMT)
commit18766fc495a367e9ec79933e99363eb2fa98663f (patch)
tree2c3800e5aed5ed7c1eaf08b3ecafaf2a9662e836
parentf392e85e5387f7a06149463c29397359e4ba483f (diff)
downloadtk-18766fc495a367e9ec79933e99363eb2fa98663f.zip
tk-18766fc495a367e9ec79933e99363eb2fa98663f.tar.gz
tk-18766fc495a367e9ec79933e99363eb2fa98663f.tar.bz2
* unix/tcl.m4: autoconf 2.5 fixes in Darwin section.
* unix/configure: autoconf-2.57
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure19
-rw-r--r--unix/tcl.m47
3 files changed, 25 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b7046ce..ad3db42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-17 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* tests/constraints.tcl, tests/*.test: Systematization of test
diff --git a/unix/configure b/unix/configure
index f873e72..547b527 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5047,9 +5047,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=""
- EXTRA_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 50c52b8..cd675f1 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1337,9 +1337,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=""
- EXTRA_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-*)