summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-03-28 21:25:38 (GMT)
committerhobbs <hobbs>2006-03-28 21:25:38 (GMT)
commit742f32b397dc55448960c32072236d9f93b022cd (patch)
treee442e676394afa98d0a29a15ad3ddb45a7cc4b58
parent33a8b76b5b3843e63e62ed11c06b89ea6ef42ede (diff)
downloadtk-742f32b397dc55448960c32072236d9f93b022cd.zip
tk-742f32b397dc55448960c32072236d9f93b022cd.tar.gz
tk-742f32b397dc55448960c32072236d9f93b022cd.tar.bz2
* unix/tcl.m4, win/tcl.m4: []-quote AC_DEFUN functions.
-rw-r--r--ChangeLog4
-rw-r--r--unix/tcl.m452
-rw-r--r--win/tcl.m424
3 files changed, 42 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ae353b..11b2e4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-28 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * unix/tcl.m4, win/tcl.m4: []-quote AC_DEFUN functions.
+
2006-03-26 Vince Darley <vincentdarley@users.sourceforge.net>
* generic/tkText.c:
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 2a2af3b..884dc4e 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -17,7 +17,7 @@
# the tclConfig.sh file
#------------------------------------------------------------------------
-AC_DEFUN(SC_PATH_TCLCONFIG, [
+AC_DEFUN([SC_PATH_TCLCONFIG], [
#
# Ok, lets find the tcl configuration
# First, look for one uninstalled.
@@ -147,7 +147,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
# the tkConfig.sh file
#------------------------------------------------------------------------
-AC_DEFUN(SC_PATH_TKCONFIG, [
+AC_DEFUN([SC_PATH_TKCONFIG], [
#
# Ok, lets find the tk configuration
# First, look for one uninstalled.
@@ -277,7 +277,7 @@ AC_DEFUN(SC_PATH_TKCONFIG, [
#
#------------------------------------------------------------------------
-AC_DEFUN(SC_LOAD_TCLCONFIG, [
+AC_DEFUN([SC_LOAD_TCLCONFIG], [
AC_MSG_CHECKING([for existence of ${TCL_BIN_DIR}/tclConfig.sh])
if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
@@ -359,7 +359,7 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
# TK_BIN_DIR
#------------------------------------------------------------------------
-AC_DEFUN(SC_LOAD_TKCONFIG, [
+AC_DEFUN([SC_LOAD_TKCONFIG], [
AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh])
if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
@@ -445,7 +445,7 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [
# TCLSH_PROG
#------------------------------------------------------------------------
-AC_DEFUN(SC_PROG_TCLSH, [
+AC_DEFUN([SC_PROG_TCLSH], [
AC_MSG_CHECKING([for tclsh])
AC_CACHE_VAL(ac_cv_path_tclsh, [
search_path=`echo ${PATH} | sed -e 's/:/ /g'`
@@ -490,7 +490,7 @@ AC_DEFUN(SC_PROG_TCLSH, [
# BUILD_TCLSH
#------------------------------------------------------------------------
-AC_DEFUN(SC_BUILD_TCLSH, [
+AC_DEFUN([SC_BUILD_TCLSH], [
AC_MSG_CHECKING([for tclsh in Tcl build directory])
BUILD_TCLSH=${TCL_BIN_DIR}/tclsh
AC_MSG_RESULT([$BUILD_TCLSH])
@@ -518,7 +518,7 @@ AC_DEFUN(SC_BUILD_TCLSH, [
# SHARED_BUILD Value of 1 or 0
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_SHARED, [
+AC_DEFUN([SC_ENABLE_SHARED], [
AC_MSG_CHECKING([how to build libraries])
AC_ARG_ENABLE(shared,
AC_HELP_STRING([--enable-shared],
@@ -559,7 +559,7 @@ AC_DEFUN(SC_ENABLE_SHARED, [
# FRAMEWORK_BUILD Value of 1 or 0
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_FRAMEWORK, [
+AC_DEFUN([SC_ENABLE_FRAMEWORK], [
AC_MSG_CHECKING([how to package libraries])
AC_ARG_ENABLE(framework,
AC_HELP_STRING([--enable-framework],
@@ -613,7 +613,7 @@ AC_DEFUN(SC_ENABLE_FRAMEWORK, [
#
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_THREADS, [
+AC_DEFUN([SC_ENABLE_THREADS], [
AC_ARG_ENABLE(threads,
AC_HELP_STRING([--enable-threads],
[build with threads (default: off)]),
@@ -758,7 +758,7 @@ AC_DEFUN(SC_ENABLE_THREADS, [
#
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_SYMBOLS, [
+AC_DEFUN([SC_ENABLE_SYMBOLS], [
AC_MSG_CHECKING([for build with symbols])
AC_ARG_ENABLE(symbols,
AC_HELP_STRING([--enable-symbols],
@@ -821,7 +821,7 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
#
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_LANGINFO, [
+AC_DEFUN([SC_ENABLE_LANGINFO], [
AC_ARG_ENABLE(langinfo,
AC_HELP_STRING([--enable-langinfo],
[use nl_langinfo if possible to determine encoding at startup, otherwise use old heuristic (default: on)]),
@@ -872,7 +872,7 @@ AC_DEFUN(SC_ENABLE_LANGINFO, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_CONFIG_MANPAGES, [
+AC_DEFUN([SC_CONFIG_MANPAGES], [
AC_MSG_CHECKING([whether to use symlinks for manpages])
AC_ARG_ENABLE(man-symlinks,
AC_HELP_STRING([--enable-man-symlinks],
@@ -935,7 +935,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_CONFIG_SYSTEM, [
+AC_DEFUN([SC_CONFIG_SYSTEM], [
AC_CACHE_CHECK([system version], tcl_cv_sys_version, [
if test -f /usr/lib/NextStep/software_version; then
tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
@@ -1056,7 +1056,7 @@ AC_DEFUN(SC_CONFIG_SYSTEM, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_CONFIG_CFLAGS, [
+AC_DEFUN([SC_CONFIG_CFLAGS], [
# Step 0.a: Enable 64 bit support?
@@ -2075,7 +2075,7 @@ dnl esac
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_SERIAL_PORT, [
+AC_DEFUN([SC_SERIAL_PORT], [
AC_CHECK_HEADERS(sys/modem.h)
AC_CACHE_CHECK([termios vs. termio vs. sgtty], tcl_cv_api_serial, [
AC_TRY_RUN([
@@ -2200,7 +2200,7 @@ int main() {
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_MISSING_POSIX_HEADERS, [
+AC_DEFUN([SC_MISSING_POSIX_HEADERS], [
AC_CACHE_CHECK([dirent.h], tcl_cv_dirent_h,
AC_TRY_LINK([#include <sys/types.h>
#include <dirent.h>], [
@@ -2278,7 +2278,7 @@ closedir(d);
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_PATH_X, [
+AC_DEFUN([SC_PATH_X], [
AC_PATH_X
not_really_there=""
if test "$no_x" = ""; then
@@ -2364,7 +2364,7 @@ AC_DEFUN(SC_PATH_X, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_BLOCKING_STYLE, [
+AC_DEFUN([SC_BLOCKING_STYLE], [
AC_CHECK_HEADERS(sys/ioctl.h)
AC_CHECK_HEADERS(sys/filio.h)
SC_CONFIG_SYSTEM
@@ -2408,7 +2408,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_TIME_HANDLER, [
+AC_DEFUN([SC_TIME_HANDLER], [
AC_CHECK_HEADERS(sys/time.h)
AC_HEADER_TIME
AC_STRUCT_TIMEZONE
@@ -2477,7 +2477,7 @@ AC_DEFUN(SC_TIME_HANDLER, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_BUGGY_STRTOD, [
+AC_DEFUN([SC_BUGGY_STRTOD], [
AC_CHECK_FUNC(strtod, tcl_strtod=1, tcl_strtod=0)
if test "$tcl_strtod" = 1; then
AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
@@ -2531,7 +2531,7 @@ AC_DEFUN(SC_BUGGY_STRTOD, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_TCL_LINK_LIBS, [
+AC_DEFUN([SC_TCL_LINK_LIBS], [
#--------------------------------------------------------------------
# On a few very rare systems, all of the libm.a stuff is
# already in libc.a. Set compiler flags accordingly.
@@ -2602,7 +2602,7 @@ AC_DEFUN(SC_TCL_LINK_LIBS, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_TCL_EARLY_FLAG,[
+AC_DEFUN([SC_TCL_EARLY_FLAG],[
AC_CACHE_VAL([tcl_cv_flag_]translit($1,[A-Z],[a-z]),
AC_TRY_COMPILE([$2], $3, [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no,
AC_TRY_COMPILE([[#define ]$1[ 1
@@ -2615,7 +2615,7 @@ AC_DEFUN(SC_TCL_EARLY_FLAG,[
fi
])
-AC_DEFUN(SC_TCL_EARLY_FLAGS,[
+AC_DEFUN([SC_TCL_EARLY_FLAGS],[
AC_MSG_CHECKING([for required early compiler flags])
tcl_flags=""
SC_TCL_EARLY_FLAG(_ISOC99_SOURCE,[#include <stdlib.h>],
@@ -2650,7 +2650,7 @@ AC_DEFUN(SC_TCL_EARLY_FLAGS,[
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_TCL_64BIT_FLAGS, [
+AC_DEFUN([SC_TCL_64BIT_FLAGS], [
AC_MSG_CHECKING([for 64-bit integer type])
AC_CACHE_VAL(tcl_cv_type_64bit,[
tcl_cv_type_64bit=none
@@ -2724,7 +2724,7 @@ AC_DEFUN(SC_TCL_64BIT_FLAGS, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_TCL_CFG_ENCODING, [
+AC_DEFUN([SC_TCL_CFG_ENCODING], [
AC_ARG_WITH(encoding,
AC_HELP_STRING([--with-encoding],
[encoding for configuration values (default: iso8859-1)]),
@@ -2755,7 +2755,7 @@ AC_DEFUN(SC_TCL_CFG_ENCODING, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_TCL_CHECK_BROKEN_FUNC,[
+AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[
AC_CHECK_FUNC($1, tcl_ok=1, tcl_ok=0)
if test ["$tcl_ok"] = 1; then
AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken],
diff --git a/win/tcl.m4 b/win/tcl.m4
index b37c626..3f91859 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -17,7 +17,7 @@
# TCL_BIN_DIR Full path to the tclConfig.sh file
#------------------------------------------------------------------------
-AC_DEFUN(SC_PATH_TCLCONFIG, [
+AC_DEFUN([SC_PATH_TCLCONFIG], [
AC_MSG_CHECKING([the location of tclConfig.sh])
if test -d ../../tcl8.5$1/win; then
@@ -57,7 +57,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
# TK_BIN_DIR Full path to the tkConfig.sh file
#------------------------------------------------------------------------
-AC_DEFUN(SC_PATH_TKCONFIG, [
+AC_DEFUN([SC_PATH_TKCONFIG], [
AC_MSG_CHECKING([the location of tkConfig.sh])
if test -d ../../tk8.5$1/win; then
@@ -99,7 +99,7 @@ AC_DEFUN(SC_PATH_TKCONFIG, [
#
#------------------------------------------------------------------------
-AC_DEFUN(SC_LOAD_TCLCONFIG, [
+AC_DEFUN([SC_LOAD_TCLCONFIG], [
AC_MSG_CHECKING([for existence of $TCL_BIN_DIR/tclConfig.sh])
if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
@@ -168,7 +168,7 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
# TK_BIN_DIR
#------------------------------------------------------------------------
-AC_DEFUN(SC_LOAD_TKCONFIG, [
+AC_DEFUN([SC_LOAD_TKCONFIG], [
AC_MSG_CHECKING([for existence of $TK_BIN_DIR/tkConfig.sh])
if test -f "$TK_BIN_DIR/tkConfig.sh" ; then
@@ -205,7 +205,7 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [
# SHARED_BUILD Value of 1 or 0
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_SHARED, [
+AC_DEFUN([SC_ENABLE_SHARED], [
AC_MSG_CHECKING([how to build libraries])
AC_ARG_ENABLE(shared,
[ --enable-shared build and link with shared libraries [--enable-shared]],
@@ -245,7 +245,7 @@ AC_DEFUN(SC_ENABLE_SHARED, [
# TCL_THREADS
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_THREADS, [
+AC_DEFUN([SC_ENABLE_THREADS], [
AC_MSG_CHECKING(for building with threads)
AC_ARG_ENABLE(threads, [ --enable-threads build with threads],
[tcl_ok=$enableval], [tcl_ok=no])
@@ -292,7 +292,7 @@ AC_DEFUN(SC_ENABLE_THREADS, [
#
#------------------------------------------------------------------------
-AC_DEFUN(SC_ENABLE_SYMBOLS, [
+AC_DEFUN([SC_ENABLE_SYMBOLS], [
AC_MSG_CHECKING([for build with symbols])
AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols [--disable-symbols]], [tcl_ok=$enableval], [tcl_ok=no])
# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
@@ -380,7 +380,7 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_CONFIG_CFLAGS, [
+AC_DEFUN([SC_CONFIG_CFLAGS], [
# Step 0: Enable 64 bit support?
@@ -794,7 +794,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# TCL_BIN_DIR Full path to the tcl build dir.
#------------------------------------------------------------------------
-AC_DEFUN(SC_WITH_TCL, [
+AC_DEFUN([SC_WITH_TCL], [
if test -d ../../tcl8.5$1/win; then
TCL_BIN_DEFAULT=../../tcl8.5$1/win
else
@@ -834,7 +834,7 @@ AC_DEFUN(SC_WITH_TCL, [
# TCLSH_PROG
#------------------------------------------------------------------------
-AC_DEFUN(SC_PROG_TCLSH, [
+AC_DEFUN([SC_PROG_TCLSH], [
AC_MSG_CHECKING([for tclsh])
AC_CACHE_VAL(ac_cv_path_tclsh, [
@@ -880,7 +880,7 @@ AC_DEFUN(SC_PROG_TCLSH, [
# BUILD_TCLSH
#------------------------------------------------------------------------
-AC_DEFUN(SC_BUILD_TCLSH, [
+AC_DEFUN([SC_BUILD_TCLSH], [
AC_MSG_CHECKING([for tclsh in Tcl build directory])
BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
AC_MSG_RESULT($BUILD_TCLSH)
@@ -904,7 +904,7 @@ AC_DEFUN(SC_BUILD_TCLSH, [
#
#--------------------------------------------------------------------
-AC_DEFUN(SC_TCL_CFG_ENCODING, [
+AC_DEFUN([SC_TCL_CFG_ENCODING], [
AC_ARG_WITH(encoding, [ --with-encoding encoding for configuration values], with_tcencoding=${withval})
if test x"${with_tcencoding}" != x ; then