summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure19
-rw-r--r--unix/tcl.m47
2 files changed, 20 insertions, 6 deletions
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-*)