diff options
| author | hobbs <hobbs> | 2004-07-16 23:31:17 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2004-07-16 23:31:17 (GMT) |
| commit | 2235097de407afaaaeeb873f8c73758e17466b08 (patch) | |
| tree | 132c67d8f1fb73e3f160af8eb6222779efa1a4ac /unix/tcl.m4 | |
| parent | 34e4fc1cfe224f575700195bda606022f868655e (diff) | |
| download | tcl-2235097de407afaaaeeb873f8c73758e17466b08.zip tcl-2235097de407afaaaeeb873f8c73758e17466b08.tar.gz tcl-2235097de407afaaaeeb873f8c73758e17466b08.tar.bz2 | |
* unix/Makefile.in, unix/tcl.m4: move (C|LD)FLAGS after their
* unix/configure.in, unix/configure: _DEFAULT to allow for env
setting to override m4 switches. Move SC_MISSING_POSIX_HEADERS up
and consolidate calls to limit redundancy in configure.
(CFLAGS_WARNING): Remove -Wconversion
(SC_ENABLE_THREADS): Set m4 to force threaded build when built
against a threaded Tcl core.
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index a81ad6a..c285b42 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -421,8 +421,12 @@ AC_DEFUN(SC_ENABLE_THREADS, [ AC_ARG_ENABLE(threads, [ --enable-threads build with threads], [tcl_ok=$enableval], [tcl_ok=no]) - if test "$tcl_ok" = "yes"; then - AC_MSG_RESULT(yes) + if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then + if test "${TCL_THREADS}" = 1; then + AC_MSG_RESULT([yes (threaded core)]) + else + AC_MSG_RESULT([yes]) + fi TCL_THREADS=1 AC_DEFINE(TCL_THREADS) # USE_THREAD_ALLOC tells us to try the special thread-based @@ -822,7 +826,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE=-O if test "$GCC" = "yes" ; then - CFLAGS_WARNING="-Wall -Wconversion -Wno-implicit-int" + CFLAGS_WARNING="-Wall -Wno-implicit-int" else CFLAGS_WARNING="" fi @@ -1960,12 +1964,11 @@ int main() { # NO_DIRENT_H # NO_ERRNO_H # NO_VALUES_H -# NO_LIMITS_H +# HAVE_LIMITS_H or NO_LIMITS_H # NO_STDLIB_H # NO_STRING_H # NO_SYS_WAIT_H # NO_DLFCN_H -# HAVE_UNISTD_H # HAVE_SYS_PARAM_H # # HAVE_STRING_H ? @@ -2003,7 +2006,8 @@ closedir(d); AC_CHECK_HEADER(errno.h, , [AC_DEFINE(NO_ERRNO_H)]) AC_CHECK_HEADER(float.h, , [AC_DEFINE(NO_FLOAT_H)]) AC_CHECK_HEADER(values.h, , [AC_DEFINE(NO_VALUES_H)]) - AC_CHECK_HEADER(limits.h, , [AC_DEFINE(NO_LIMITS_H)]) + AC_CHECK_HEADER(limits.h, + [AC_DEFINE(HAVE_LIMITS_H)], [AC_DEFINE(NO_LIMITS_H)]) AC_CHECK_HEADER(stdlib.h, tcl_ok=1, tcl_ok=0) AC_EGREP_HEADER(strtol, stdlib.h, , tcl_ok=0) AC_EGREP_HEADER(strtoul, stdlib.h, , tcl_ok=0) @@ -2026,9 +2030,7 @@ closedir(d); AC_CHECK_HEADER(dlfcn.h, , [AC_DEFINE(NO_DLFCN_H)]) # OS/390 lacks sys/param.h (and doesn't need it, by chance). - - AC_HAVE_HEADERS(unistd.h sys/param.h) - + AC_HAVE_HEADERS(sys/param.h) ]) #-------------------------------------------------------------------- |