Package: tcl8.4 Version: 8.4.9 Author: Guillem Jover Status: not-sent Description: Fix autoconf warnings. diff -Naur tcl8.4-8.4.9.orig/unix/tcl.m4 tcl8.4-8.4.9/unix/tcl.m4 --- tcl8.4-8.4.9.orig/unix/tcl.m4 2005-05-20 10:36:03.879719960 +0300 +++ tcl8.4-8.4.9/unix/tcl.m4 2005-05-20 10:35:50.729719064 +0300 @@ -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. @@ -27,9 +27,11 @@ if test x"${no_tcl}" = x ; then # we reset no_tcl in case something fails here no_tcl=true - AC_ARG_WITH(tcl, [ --with-tcl directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval}) + AC_ARG_WITH([tcl], + [ --with-tcl directory containing tcl configuration (tclConfig.sh)], + [with_tclconfig=${withval}]) AC_MSG_CHECKING([for Tcl configuration]) - AC_CACHE_VAL(ac_cv_c_tclconfig,[ + AC_CACHE_VAL([ac_cv_c_tclconfig], [ # First check to see if --with-tcl was specified. if test x"${with_tclconfig}" != x ; then @@ -93,12 +95,12 @@ if test x"${ac_cv_c_tclconfig}" = x ; then TCL_BIN_DIR="# no Tcl configs found" - AC_MSG_WARN(Can't find Tcl configuration definitions) + AC_MSG_WARN([Can't find Tcl configuration definitions]) exit 0 else no_tcl= TCL_BIN_DIR=${ac_cv_c_tclconfig} - AC_MSG_RESULT(found $TCL_BIN_DIR/tclConfig.sh) + AC_MSG_RESULT([found $TCL_BIN_DIR/tclConfig.sh]) fi fi ]) @@ -121,7 +123,7 @@ # 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. @@ -131,9 +133,11 @@ if test x"${no_tk}" = x ; then # we reset no_tk in case something fails here no_tk=true - AC_ARG_WITH(tk, [ --with-tk directory containing tk configuration (tkConfig.sh)], with_tkconfig=${withval}) + AC_ARG_WITH([tk], + [ --with-tk directory containing tk configuration (tkConfig.sh)], + [with_tkconfig=${withval}]) AC_MSG_CHECKING([for Tk configuration]) - AC_CACHE_VAL(ac_cv_c_tkconfig,[ + AC_CACHE_VAL([ac_cv_c_tkconfig], [ # First check to see if --with-tkconfig was specified. if test x"${with_tkconfig}" != x ; then @@ -194,12 +198,12 @@ ]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" - AC_MSG_WARN(Can't find Tk configuration definitions) + AC_MSG_WARN([Can't find Tk configuration definitions]) exit 0 else no_tk= TK_BIN_DIR=${ac_cv_c_tkconfig} - AC_MSG_RESULT(found $TK_BIN_DIR/tkConfig.sh) + AC_MSG_RESULT([found $TK_BIN_DIR/tkConfig.sh]) fi fi @@ -225,7 +229,7 @@ # #------------------------------------------------------------------------ -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 @@ -262,18 +266,18 @@ eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" - AC_SUBST(TCL_VERSION) - AC_SUBST(TCL_BIN_DIR) - AC_SUBST(TCL_INC_DIR) - AC_SUBST(TCL_SRC_DIR) - - AC_SUBST(TCL_LIB_FILE) - AC_SUBST(TCL_LIB_FLAG) - AC_SUBST(TCL_LIB_SPEC) - - AC_SUBST(TCL_STUB_LIB_FILE) - AC_SUBST(TCL_STUB_LIB_FLAG) - AC_SUBST(TCL_STUB_LIB_SPEC) + AC_SUBST([TCL_VERSION]) + AC_SUBST([TCL_BIN_DIR]) + AC_SUBST([TCL_INC_DIR]) + AC_SUBST([TCL_SRC_DIR]) + + AC_SUBST([TCL_LIB_FILE]) + AC_SUBST([TCL_LIB_FLAG]) + AC_SUBST([TCL_LIB_SPEC]) + + AC_SUBST([TCL_STUB_LIB_FILE]) + AC_SUBST([TCL_STUB_LIB_FLAG]) + AC_SUBST([TCL_STUB_LIB_SPEC]) ]) #------------------------------------------------------------------------ @@ -292,7 +296,7 @@ # 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 @@ -302,11 +306,11 @@ AC_MSG_RESULT([could not find $TK_BIN_DIR/tkConfig.sh]) fi - AC_SUBST(TK_VERSION) - AC_SUBST(TK_BIN_DIR) - AC_SUBST(TK_SRC_DIR) - AC_SUBST(TK_LIB_DIR) - AC_SUBST(TK_LIB_FILE) + AC_SUBST([TK_VERSION]) + AC_SUBST([TK_BIN_DIR]) + AC_SUBST([TK_SRC_DIR]) + AC_SUBST([TK_LIB_DIR]) + AC_SUBST([TK_LIB_FILE]) ]) #------------------------------------------------------------------------ @@ -330,9 +334,9 @@ # 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_ARG_ENABLE([shared], [ --enable-shared build and link with shared libraries [--enable-shared]], [tcl_ok=$enableval], [tcl_ok=yes]) @@ -349,7 +353,7 @@ else AC_MSG_RESULT([static]) SHARED_BUILD=0 - AC_DEFINE(STATIC_BUILD) + AC_DEFINE([STATIC_BUILD]) fi ]) @@ -370,9 +374,9 @@ # 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_ARG_ENABLE([framework], [ --enable-framework package shared libraries in MacOSX frameworks [--disable-framework]], [tcl_ok=$enableval], [tcl_ok=no]) @@ -387,7 +391,7 @@ AC_MSG_RESULT([framework]) FRAMEWORK_BUILD=1 if test "${SHARED_BUILD}" = "0" ; then - AC_MSG_WARN("Frameworks can only be built if --enable-shared is yes") + AC_MSG_WARN([Frameworks can only be built if --enable-shared is yes]) FRAMEWORK_BUILD=0 fi else @@ -421,9 +425,9 @@ # #------------------------------------------------------------------------ -AC_DEFUN(SC_ENABLE_THREADS, [ - AC_MSG_CHECKING(for building with threads) - AC_ARG_ENABLE(threads, [ --enable-threads build with 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]) if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then @@ -433,43 +437,47 @@ AC_MSG_RESULT([yes]) fi TCL_THREADS=1 - AC_DEFINE(TCL_THREADS) + AC_DEFINE([TCL_THREADS]) # USE_THREAD_ALLOC tells us to try the special thread-based # allocator that significantly reduces lock contention - AC_DEFINE(USE_THREAD_ALLOC) - AC_DEFINE(_REENTRANT) + AC_DEFINE([USE_THREAD_ALLOC]) + AC_DEFINE([_REENTRANT]) if test "`uname -s`" = "SunOS" ; then - AC_DEFINE(_POSIX_PTHREAD_SEMANTICS) + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) fi - AC_DEFINE(_THREAD_SAFE) - AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) + AC_DEFINE([_THREAD_SAFE]) + AC_CHECK_LIB([pthread], [pthread_mutex_init], [tcl_ok=yes], [tcl_ok=no]) if test "$tcl_ok" = "no"; then # Check a little harder for __pthread_mutex_init in the same # library, as some systems hide it there until pthread.h is # defined. We could alternatively do an AC_TRY_COMPILE with # pthread.h, but that will work with libpthread really doesn't # exist, like AIX 4.2. [Bug: 4359] - AC_CHECK_LIB(pthread,__pthread_mutex_init,tcl_ok=yes,tcl_ok=no) + AC_CHECK_LIB([pthread], [__pthread_mutex_init], [tcl_ok=yes], + [tcl_ok=no]) fi if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -lpthread" else - AC_CHECK_LIB(pthreads,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) + AC_CHECK_LIB([pthreads], [pthread_mutex_init], [tcl_ok=yes], + [tcl_ok=no]) if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -lpthreads" else - AC_CHECK_LIB(c,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) + AC_CHECK_LIB([c], [pthread_mutex_init], [tcl_ok=yes], + [tcl_ok=no]) if test "$tcl_ok" = "no"; then - AC_CHECK_LIB(c_r,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) + AC_CHECK_LIB([c_r], [pthread_mutex_init], [tcl_ok=yes], + [tcl_ok=no]) if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -pthread" else TCL_THREADS=0 - AC_MSG_WARN("Don t know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...") + AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...]) fi fi fi @@ -480,15 +488,15 @@ ac_saved_libs=$LIBS LIBS="$LIBS $THREADS_LIBS" - AC_CHECK_FUNCS(pthread_attr_setstacksize) - AC_CHECK_FUNCS(pthread_atfork) + AC_CHECK_FUNCS([pthread_attr_setstacksize]) + AC_CHECK_FUNCS([pthread_atfork]) LIBS=$ac_saved_libs - AC_CHECK_FUNCS(readdir_r) + AC_CHECK_FUNCS([readdir_r]) if test "x$ac_cv_func_readdir_r" = "xyes"; then AC_MSG_CHECKING([how many args readdir_r takes]) # IRIX 5.3 has a 2 arg version of readdir_r # while other systems have a 3 arg version. - AC_CACHE_VAL(tcl_cv_two_arg_readdir_r, + AC_CACHE_VAL([tcl_cv_two_arg_readdir_r], [ AC_TRY_COMPILE([#include #include #ifdef NO_DIRENT_H @@ -498,8 +506,8 @@ # include #endif ], [readdir_r(NULL, NULL);], - tcl_cv_two_arg_readdir_r=yes, tcl_cv_two_arg_readdir_r=no)) - AC_CACHE_VAL(tcl_cv_three_arg_readdir_r, + [tcl_cv_two_arg_readdir_r=yes], [tcl_cv_two_arg_readdir_r=no])) + AC_CACHE_VAL([tcl_cv_three_arg_readdir_r], [ AC_TRY_COMPILE([#include #include #ifdef NO_DIRENT_H @@ -509,13 +517,13 @@ # include #endif ], [readdir_r(NULL, NULL, NULL);], - tcl_cv_three_arg_readdir_r=yes, tcl_cv_three_arg_readdir_r=no)) + [tcl_cv_three_arg_readdir_r=yes], [tcl_cv_three_arg_readdir_r=no])) if test "x$tcl_cv_two_arg_readdir_r" = "xyes" ; then AC_MSG_RESULT([2]) - AC_DEFINE(HAVE_TWO_ARG_READDIR_R) + AC_DEFINE([HAVE_TWO_ARG_READDIR_R]) elif test "x$tcl_cv_three_arg_readdir_r" = "xyes" ; then AC_MSG_RESULT([3]) - AC_DEFINE(HAVE_THREE_ARG_READDIR_R) + AC_DEFINE([HAVE_THREE_ARG_READDIR_R]) else AC_MSG_ERROR([unknown number of args for readdir_r]) fi @@ -524,7 +532,7 @@ TCL_THREADS=0 AC_MSG_RESULT([no (default)]) fi - AC_SUBST(TCL_THREADS) + AC_SUBST([TCL_THREADS]) ]) #------------------------------------------------------------------------ @@ -557,9 +565,11 @@ # #------------------------------------------------------------------------ -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]) + 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. if test "$tcl_ok" = "no"; then CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' @@ -574,16 +584,16 @@ AC_MSG_RESULT([yes (standard debugging)]) fi fi - AC_SUBST(CFLAGS_DEFAULT) - AC_SUBST(LDFLAGS_DEFAULT) + AC_SUBST([CFLAGS_DEFAULT]) + AC_SUBST([LDFLAGS_DEFAULT]) if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_MEM_DEBUG) + AC_DEFINE([TCL_MEM_DEBUG]) fi if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_COMPILE_DEBUG) - AC_DEFINE(TCL_COMPILE_STATS) + AC_DEFINE([TCL_COMPILE_DEBUG]) + AC_DEFINE([TCL_COMPILE_STATS]) fi if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then @@ -614,8 +624,8 @@ # #------------------------------------------------------------------------ -AC_DEFUN(SC_ENABLE_LANGINFO, [ - AC_ARG_ENABLE(langinfo, +AC_DEFUN([SC_ENABLE_LANGINFO], [ + AC_ARG_ENABLE([langinfo], [ --enable-langinfo use nl_langinfo if possible to determine encoding at startup, otherwise use old heuristic], [langinfo_ok=$enableval], [langinfo_ok=yes]) @@ -623,7 +633,7 @@ HAVE_LANGINFO=0 if test "$langinfo_ok" = "yes"; then if test "$langinfo_ok" = "yes"; then - AC_CHECK_HEADER(langinfo.h,[langinfo_ok=yes],[langinfo_ok=no]) + AC_CHECK_HEADER([langinfo.h], [langinfo_ok=yes], [langinfo_ok=no]) fi fi AC_MSG_CHECKING([whether to use nl_langinfo]) @@ -634,7 +644,7 @@ langinfo_ok="no (could not compile with nl_langinfo)"; fi if test "$langinfo_ok" = "yes"; then - AC_DEFINE(HAVE_LANGINFO) + AC_DEFINE([HAVE_LANGINFO]) fi fi AC_MSG_RESULT([$langinfo_ok]) @@ -666,22 +676,22 @@ # according to the user's selection. # #-------------------------------------------------------------------- -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_ARG_ENABLE([man-symlinks], [ --enable-man-symlinks use symlinks for the manpages], - test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks", - enableval="no") + [test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks"], + [enableval="no"]) AC_MSG_RESULT([$enableval]) AC_MSG_CHECKING([whether to compress the manpages]) - AC_ARG_ENABLE(man-compression, + AC_ARG_ENABLE([man-compression], [ --enable-man-compression=PROG compress the manpages with PROG], - test "$enableval" = "yes" && AC_MSG_ERROR([missing argument to --enable-man-compression]) - test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --compress $enableval", - enableval="no") + [test "$enableval" = "yes" && AC_MSG_ERROR([missing argument to --enable-man-compression]) + test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --compress $enableval"], + [enableval="no"]) AC_MSG_RESULT([$enableval]) if test "$enableval" != "no"; then AC_MSG_CHECKING([for compressed file suffix]) @@ -694,16 +704,16 @@ fi AC_MSG_CHECKING([whether to add a package name suffix for the manpages]) - AC_ARG_ENABLE(man-suffix, + AC_ARG_ENABLE([man-suffix], [ --enable-man-suffix=STRING use STRING as a suffix to manpage file names (default: $1)], - test "$enableval" = "yes" && enableval="$1" - test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --suffix $enableval", - enableval="no") + [test "$enableval" = "yes" && enableval="$1" + test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --suffix $enableval"], + [enableval="no"]) AC_MSG_RESULT([$enableval]) - AC_SUBST(MAN_FLAGS) + AC_SUBST([MAN_FLAGS]) ]) #-------------------------------------------------------------------- @@ -802,24 +812,28 @@ # #-------------------------------------------------------------------- -AC_DEFUN(SC_CONFIG_CFLAGS, [ +AC_DEFUN([SC_CONFIG_CFLAGS], [ # Step 0.a: Enable 64 bit support? AC_MSG_CHECKING([if 64bit support is requested]) - AC_ARG_ENABLE(64bit,[ --enable-64bit enable 64bit support (where applicable)],,enableval="no") + AC_ARG_ENABLE([64bit], + [ --enable-64bit enable 64bit support (where applicable)], + [], [enableval="no"]) if test "$enableval" = "yes"; then do64bit=yes else do64bit=no fi - AC_MSG_RESULT($do64bit) + AC_MSG_RESULT([$do64bit]) # Step 0.b: Enable Solaris 64 bit VIS support? AC_MSG_CHECKING([if 64bit Sparc VIS support is requested]) - AC_ARG_ENABLE(64bit-vis,[ --enable-64bit-vis enable 64bit Sparc VIS support],,enableval="no") + AC_ARG_ENABLE([64bit-vis], + [ --enable-64bit-vis enable 64bit Sparc VIS support], + [], [enableval="no"]) if test "$enableval" = "yes"; then # Force 64bit on with VIS @@ -828,7 +842,7 @@ else do64bitVIS=no fi - AC_MSG_RESULT($do64bitVIS) + AC_MSG_RESULT([$do64bitVIS]) # Step 1: set the variable "system" to hold the name and version number # for the system. This can usually be done via the "uname" command, but @@ -855,14 +869,14 @@ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then system=NetBSD-Debian fi - AC_MSG_RESULT($system) + AC_MSG_RESULT([$system]) fi fi # Step 2: check for existence of -ldl library. This is needed because # Linux can use either -ldl or -ldld for dynamic loading. - AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no) + AC_CHECK_LIB([dl], [dlopen], [have_dl=yes], [have_dl=no]) # Require ranlib early so we can override it in special cases below. @@ -888,8 +902,8 @@ TCL_BUILD_EXP_FILE="" TCL_EXP_FILE="" dnl FIXME: Replace AC_CHECK_PROG with AC_CHECK_TOOL once cross compiling is fixed. -dnl AC_CHECK_TOOL(AR, ar) - AC_CHECK_PROG(AR, ar, ar) +dnl AC_CHECK_TOOL([AR], [ar]) + AC_CHECK_PROG([AR], [ar], [ar]) if test "${AR}" = "" ; then AC_MSG_ERROR([Required archive tool 'ar' not found on PATH.]) fi @@ -904,7 +918,7 @@ if test "${CC}" != "cc_r" ; then CC=${CC}_r fi - AC_MSG_RESULT(Using $CC for compiling with threads) + AC_MSG_RESULT([Using $CC for compiling with threads]) fi LIBS="$LIBS -lc" # AIX-5 uses ELF style dynamic libraries @@ -921,7 +935,7 @@ # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes" ; then if test "$GCC" = "yes" ; then - AC_MSG_WARN("64bit mode not supported with GCC on $system") + AC_MSG_WARN([64bit mode not supported with GCC on $system]) else do64bit_ok=yes CFLAGS="$CFLAGS -q64" @@ -958,7 +972,7 @@ if test "${CC}" != "cc_r" ; then CC=${CC}_r fi - AC_MSG_RESULT(Using $CC for compiling with threads) + AC_MSG_RESULT([Using $CC for compiling with threads]) fi LIBS="$LIBS -lc" SHLIB_CFLAGS="" @@ -981,7 +995,7 @@ # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes" ; then if test "$GCC" = "yes" ; then - AC_MSG_WARN("64bit mode not supported with GCC on $system") + AC_MSG_WARN([64bit mode not supported with GCC on $system]) else do64bit_ok=yes CFLAGS="$CFLAGS -q64" @@ -1005,10 +1019,10 @@ # deduce the timezone by comparing the localtime result on a # known GMT value. - AC_CHECK_LIB(bsd, gettimeofday, libbsd=yes, libbsd=no) + AC_CHECK_LIB([bsd], [gettimeofday], [libbsd=yes], [libbsd=no]) if test $libbsd = yes; then MATH_LIBS="$MATH_LIBS -lbsd" - AC_DEFINE(USE_DELTA_FOR_TZ) + AC_DEFINE([USE_DELTA_FOR_TZ]) fi ;; BeOS*) @@ -1024,7 +1038,7 @@ # -lsocket, even if the network functions are in -lnet which # is always linked to, for compatibility. #----------------------------------------------------------- - AC_CHECK_LIB(bind, inet_ntoa, [LIBS="$LIBS -lbind -lsocket"]) + AC_CHECK_LIB([bind], [inet_ntoa], [LIBS="$LIBS -lbind -lsocket"]) ;; BSD/OS-2.1*|BSD/OS-3*) SHLIB_CFLAGS="" @@ -1059,12 +1073,12 @@ ;; HP-UX-*.11.*) # Use updated header definitions where possible - AC_DEFINE(_XOPEN_SOURCE) # Use the XOPEN network library - AC_DEFINE(_XOPEN_SOURCE_EXTENDED) # Use the XOPEN network library - LIBS="$LIBS -lxnet" # Use the XOPEN network library + AC_DEFINE([_XOPEN_SOURCE]) # Use the XOPEN network library + AC_DEFINE([_XOPEN_SOURCE_EXTENDED]) # Use the XOPEN network library + LIBS="$LIBS -lxnet" # Use the XOPEN network library SHLIB_SUFFIX=".sl" - AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no) + AC_CHECK_LIB([dld], [shl_load], [tcl_ok=yes], [tcl_ok=no]) if test "$tcl_ok" = yes; then SHLIB_CFLAGS="+z" SHLIB_LD="ld -b" @@ -1100,7 +1114,7 @@ CC_SEARCH_FLAGS='' ;; *) - AC_MSG_WARN("64bit mode not supported with GCC on $system") + AC_MSG_WARN([64bit mode not supported with GCC on $system]) ;; esac else @@ -1112,7 +1126,7 @@ ;; HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" - AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no) + AC_CHECK_LIB([dld], [shl_load], [tcl_ok=yes], [tcl_ok=no]) if test "$tcl_ok" = yes; then SHLIB_CFLAGS="+z" SHLIB_LD="ld -b" @@ -1214,7 +1228,7 @@ CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} else - AC_CHECK_HEADER(dld.h, [ + AC_CHECK_HEADER([dld.h], [ SHLIB_LD="ld -shared" DL_OBJS="tclLoadDld.o" DL_LIBS="-ldld" @@ -1237,7 +1251,7 @@ fi # XIM peeking works under XFree86. - AC_DEFINE(PEEK_XCLOSEIM) + AC_DEFINE([PEEK_XCLOSEIM]) ;; GNU*) @@ -1253,7 +1267,7 @@ CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}" else - AC_CHECK_HEADER(dld.h, [ + AC_CHECK_HEADER([dld.h], [ SHLIB_LD="ld -shared" DL_OBJS="tclLoadDld.o" DL_LIBS="-ldld" @@ -1298,7 +1312,7 @@ ;; NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*) # Not available on all versions: check for include file. - AC_CHECK_HEADER(dlfcn.h, [ + AC_CHECK_HEADER([dlfcn.h], [ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" @@ -1308,16 +1322,16 @@ DL_LIBS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - AC_MSG_CHECKING(for ELF) - AC_EGREP_CPP(yes, [ + AC_MSG_CHECKING([for ELF]) + AC_EGREP_CPP([yes], [ #ifdef __ELF__ yes #endif ], - AC_MSG_RESULT(yes) - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so', - AC_MSG_RESULT(no) - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + [AC_MSG_RESULT([yes]) + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'], + [AC_MSG_RESULT([no]) + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'] ) ], [ SHLIB_CFLAGS="" @@ -1344,15 +1358,15 @@ DL_LIBS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - AC_MSG_CHECKING(for ELF) - AC_EGREP_CPP(yes, [ + AC_MSG_CHECKING([for ELF]) + AC_EGREP_CPP([yes], [ #ifdef __ELF__ yes #endif ], - [AC_MSG_RESULT(yes) + [AC_MSG_RESULT([yes]) SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'], - [AC_MSG_RESULT(no) + [AC_MSG_RESULT([no]) SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'] ) @@ -1401,10 +1415,10 @@ LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" - AC_DEFINE(MAC_OSX_TCL) - AC_DEFINE(HAVE_CFBUNDLE) - AC_DEFINE(USE_VFORK) - AC_DEFINE(TCL_DEFAULT_ENCODING,"utf-8") + AC_DEFINE([MAC_OSX_TCL]) + AC_DEFINE([HAVE_CFBUNDLE]) + AC_DEFINE([USE_VFORK]) + AC_DEFINE([TCL_DEFAULT_ENCODING], [utf-8]) LIBS="$LIBS -framework CoreFoundation" ;; NEXTSTEP-*) @@ -1418,8 +1432,8 @@ LD_SEARCH_FLAGS="" ;; OS/390-*) - CFLAGS_OPTIMIZE="" # Optimizer is buggy - AC_DEFINE(_OE_SOCKETS) # needed in sys/socket.h + CFLAGS_OPTIMIZE="" # Optimizer is buggy + AC_DEFINE([_OE_SOCKETS]) # needed in sys/socket.h ;; OSF1-1.0|OSF1-1.1|OSF1-1.2) # OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1 @@ -1558,8 +1572,8 @@ # Note: If _REENTRANT isn't defined, then Solaris # won't define thread-safe library routines. - AC_DEFINE(_REENTRANT) - AC_DEFINE(_POSIX_PTHREAD_SEMANTICS) + AC_DEFINE([_REENTRANT]) + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) SHLIB_CFLAGS="-KPIC" @@ -1585,8 +1599,8 @@ # Note: If _REENTRANT isn't defined, then Solaris # won't define thread-safe library routines. - AC_DEFINE(_REENTRANT) - AC_DEFINE(_POSIX_PTHREAD_SEMANTICS) + AC_DEFINE([_REENTRANT]) + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) SHLIB_CFLAGS="-KPIC" @@ -1595,7 +1609,7 @@ arch=`isainfo` if test "$arch" = "sparcv9 sparc" ; then if test "$GCC" = "yes" ; then - AC_MSG_WARN("64bit mode not supported with GCC on $system") + AC_MSG_WARN([64bit mode not supported with GCC on $system]) else do64bit_ok=yes if test "$do64bitVIS" = "yes" ; then @@ -1607,7 +1621,7 @@ fi fi else - AC_MSG_WARN("64bit mode only supported sparcv9 system") + AC_MSG_WARN([64bit mode only supported sparcv9 system]) fi fi @@ -1652,18 +1666,18 @@ # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers # that don't grok the -Bexport option. Test that it does. hold_ldflags=$LDFLAGS - AC_MSG_CHECKING(for ld accepts -Bexport flag) + AC_MSG_CHECKING([for ld accepts -Bexport flag]) LDFLAGS="$LDFLAGS -Wl,-Bexport" - AC_TRY_LINK(, [int i;], [found=yes], + AC_TRY_LINK([], [int i;], [found=yes], [LDFLAGS=$hold_ldflags found=no]) - AC_MSG_RESULT($found) + AC_MSG_RESULT([$found]) CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; esac if test "$do64bit" = "yes" -a "$do64bit_ok" = "no" ; then - AC_MSG_WARN("64bit support being disabled -- don\'t know magic for this platform") + AC_MSG_WARN([64bit support being disabled -- don\'t know magic for this platform]) fi # Step 4: If pseudo-static linking is in use (see K. B. Kenny, "Dynamic @@ -1686,7 +1700,7 @@ # duplicates the v7 fields that are needed. if test "x$DL_OBJS" = "xtclLoadAout.o" ; then - AC_MSG_CHECKING(sys/exec.h) + AC_MSG_CHECKING([sys/exec.h]) AC_TRY_COMPILE([#include ],[ struct exec foo; unsigned long seek; @@ -1698,12 +1712,12 @@ #endif flag = (foo.a_magic == OMAGIC); return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry; - ], tcl_ok=usable, tcl_ok=unusable) - AC_MSG_RESULT($tcl_ok) + ], [tcl_ok=usable], [tcl_ok=unusable]) + AC_MSG_RESULT([$tcl_ok]) if test $tcl_ok = usable; then - AC_DEFINE(USE_SYS_EXEC_H) + AC_DEFINE([USE_SYS_EXEC_H]) else - AC_MSG_CHECKING(a.out.h) + AC_MSG_CHECKING([a.out.h]) AC_TRY_COMPILE([#include ],[ struct exec foo; unsigned long seek; @@ -1715,12 +1729,12 @@ #endif flag = (foo.a_magic == OMAGIC); return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry; - ], tcl_ok=usable, tcl_ok=unusable) - AC_MSG_RESULT($tcl_ok) + ], [tcl_ok=usable], [tcl_ok=unusable]) + AC_MSG_RESULT([$tcl_ok]) if test $tcl_ok = usable; then - AC_DEFINE(USE_A_OUT_H) + AC_DEFINE([USE_A_OUT_H]) else - AC_MSG_CHECKING(sys/exec_aout.h) + AC_MSG_CHECKING([sys/exec_aout.h]) AC_TRY_COMPILE([#include ],[ struct exec foo; unsigned long seek; @@ -1732,10 +1746,10 @@ #endif flag = (foo.a_midmag == OMAGIC); return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry; - ], tcl_ok=usable, tcl_ok=unusable) - AC_MSG_RESULT($tcl_ok) + ], [tcl_ok=usable], [tcl_ok=unusable]) + AC_MSG_RESULT([$tcl_ok]) if test $tcl_ok = usable; then - AC_DEFINE(USE_SYS_EXEC_AOUT_H) + AC_DEFINE([USE_SYS_EXEC_AOUT_H]) else DL_OBJS="" fi @@ -1745,7 +1759,8 @@ # Step 5: disable dynamic loading if requested via a command-line switch. - AC_ARG_ENABLE(load, [ --disable-load disallow dynamic loading and "load" command], + AC_ARG_ENABLE([load], + [ --disable-load disallow dynamic loading and "load" command], [tcl_ok=$enableval], [tcl_ok=yes]) if test "$tcl_ok" = "no"; then DL_OBJS="" @@ -1845,35 +1860,35 @@ fi - AC_SUBST(DL_LIBS) + AC_SUBST([DL_LIBS]) - AC_SUBST(DL_OBJS) - AC_SUBST(PLAT_OBJS) - AC_SUBST(CFLAGS) - AC_SUBST(CFLAGS_DEBUG) - AC_SUBST(CFLAGS_OPTIMIZE) - AC_SUBST(CFLAGS_WARNING) - - AC_SUBST(LDFLAGS) - AC_SUBST(LDFLAGS_DEBUG) - AC_SUBST(LDFLAGS_OPTIMIZE) - AC_SUBST(CC_SEARCH_FLAGS) - AC_SUBST(LD_SEARCH_FLAGS) - - AC_SUBST(STLIB_LD) - AC_SUBST(SHLIB_LD) - AC_SUBST(TCL_SHLIB_LD_EXTRAS) - AC_SUBST(TK_SHLIB_LD_EXTRAS) - AC_SUBST(SHLIB_LD_FLAGS) - AC_SUBST(SHLIB_LD_LIBS) - AC_SUBST(SHLIB_CFLAGS) - AC_SUBST(SHLIB_SUFFIX) - - AC_SUBST(MAKE_LIB) - AC_SUBST(MAKE_STUB_LIB) - AC_SUBST(INSTALL_LIB) - AC_SUBST(INSTALL_STUB_LIB) - AC_SUBST(RANLIB) + AC_SUBST([DL_OBJS]) + AC_SUBST([PLAT_OBJS]) + AC_SUBST([CFLAGS]) + AC_SUBST([CFLAGS_DEBUG]) + AC_SUBST([CFLAGS_OPTIMIZE]) + AC_SUBST([CFLAGS_WARNING]) + + AC_SUBST([LDFLAGS]) + AC_SUBST([LDFLAGS_DEBUG]) + AC_SUBST([LDFLAGS_OPTIMIZE]) + AC_SUBST([CC_SEARCH_FLAGS]) + AC_SUBST([LD_SEARCH_FLAGS]) + + AC_SUBST([STLIB_LD]) + AC_SUBST([SHLIB_LD]) + AC_SUBST([TCL_SHLIB_LD_EXTRAS]) + AC_SUBST([TK_SHLIB_LD_EXTRAS]) + AC_SUBST([SHLIB_LD_FLAGS]) + AC_SUBST([SHLIB_LD_LIBS]) + AC_SUBST([SHLIB_CFLAGS]) + AC_SUBST([SHLIB_SUFFIX]) + + AC_SUBST([MAKE_LIB]) + AC_SUBST([MAKE_STUB_LIB]) + AC_SUBST([INSTALL_LIB]) + AC_SUBST([INSTALL_STUB_LIB]) + AC_SUBST([RANLIB]) ]) #-------------------------------------------------------------------- @@ -1898,10 +1913,10 @@ # #-------------------------------------------------------------------- -AC_DEFUN(SC_SERIAL_PORT, [ - AC_CHECK_HEADERS(sys/modem.h) +AC_DEFUN([SC_SERIAL_PORT], [ + AC_CHECK_HEADERS([sys/modem.h]) AC_MSG_CHECKING([termios vs. termio vs. sgtty]) - AC_CACHE_VAL(tcl_cv_api_serial, [ + AC_CACHE_VAL([tcl_cv_api_serial], [ AC_TRY_RUN([ #include @@ -1913,7 +1928,7 @@ return 0; } return 1; -}], tcl_cv_api_serial=termios, tcl_cv_api_serial=no, tcl_cv_api_serial=no) +}], [tcl_cv_api_serial=termios], [tcl_cv_api_serial=no], [tcl_cv_api_serial=no]) if test $tcl_cv_api_serial = no ; then AC_TRY_RUN([ #include @@ -1925,7 +1940,7 @@ return 0; } return 1; -}], tcl_cv_api_serial=termio, tcl_cv_api_serial=no, tcl_cv_api_serial=no) +}], [tcl_cv_api_serial=termio], [tcl_cv_api_serial=no], [tcl_cv_api_serial=no]) fi if test $tcl_cv_api_serial = no ; then AC_TRY_RUN([ @@ -1939,7 +1954,7 @@ return 0; } return 1; -}], tcl_cv_api_serial=sgtty, tcl_cv_api_serial=no, tcl_cv_api_serial=no) +}], [tcl_cv_api_serial=sgtty], [tcl_cv_api_serial=no], [tcl_cv_api_serial=no]) fi if test $tcl_cv_api_serial = no ; then AC_TRY_RUN([ @@ -1955,7 +1970,7 @@ return 0; } return 1; -}], tcl_cv_api_serial=termios, tcl_cv_api_serial=no, tcl_cv_api_serial=no) +}], [tcl_cv_api_serial=termios], [tcl_cv_api_serial=no], [tcl_cv_api_serial=no]) fi if test $tcl_cv_api_serial = no; then AC_TRY_RUN([ @@ -1970,7 +1985,7 @@ return 0; } return 1; - }], tcl_cv_api_serial=termio, tcl_cv_api_serial=no, tcl_cv_api_serial=no) + }], [tcl_cv_api_serial=termio], [tcl_cv_api_serial=no], [tcl_cv_api_serial=no]) fi if test $tcl_cv_api_serial = no; then AC_TRY_RUN([ @@ -1986,14 +2001,14 @@ return 0; } return 1; -}], tcl_cv_api_serial=sgtty, tcl_cv_api_serial=none, tcl_cv_api_serial=none) +}], [tcl_cv_api_serial=sgtty], [tcl_cv_api_serial=none], [tcl_cv_api_serial=none]) fi]) case $tcl_cv_api_serial in - termios) AC_DEFINE(USE_TERMIOS);; - termio) AC_DEFINE(USE_TERMIO);; - sgtty) AC_DEFINE(USE_SGTTY);; + termios) AC_DEFINE([USE_TERMIOS]);; + termio) AC_DEFINE([USE_TERMIO]);; + sgtty) AC_DEFINE([USE_SGTTY]);; esac - AC_MSG_RESULT($tcl_cv_api_serial) + AC_MSG_RESULT([$tcl_cv_api_serial]) ]) #-------------------------------------------------------------------- @@ -2027,8 +2042,8 @@ # #-------------------------------------------------------------------- -AC_DEFUN(SC_MISSING_POSIX_HEADERS, [ - AC_MSG_CHECKING(dirent.h) +AC_DEFUN([SC_MISSING_POSIX_HEADERS], [ + AC_MSG_CHECKING([dirent.h]) AC_TRY_LINK([#include #include ], [ #ifndef _POSIX_SOURCE @@ -2048,42 +2063,42 @@ entryPtr = readdir(d); p = entryPtr->d_name; closedir(d); -], tcl_ok=yes, tcl_ok=no) +], [tcl_ok=yes], [tcl_ok=no]) if test $tcl_ok = no; then - AC_DEFINE(NO_DIRENT_H) + AC_DEFINE([NO_DIRENT_H]) fi - AC_MSG_RESULT($tcl_ok) - 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(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) - AC_EGREP_HEADER(strtod, stdlib.h, , tcl_ok=0) + AC_MSG_RESULT([$tcl_ok]) + 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([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]) + AC_EGREP_HEADER([strtod], [stdlib.h], [], [tcl_ok=0]) if test $tcl_ok = 0; then - AC_DEFINE(NO_STDLIB_H) + AC_DEFINE([NO_STDLIB_H]) fi - AC_CHECK_HEADER(string.h, tcl_ok=1, tcl_ok=0) - AC_EGREP_HEADER(strstr, string.h, , tcl_ok=0) - AC_EGREP_HEADER(strerror, string.h, , tcl_ok=0) + AC_CHECK_HEADER([string.h], [tcl_ok=1], [tcl_ok=0]) + AC_EGREP_HEADER([strstr], [string.h], [], [tcl_ok=0]) + AC_EGREP_HEADER([strerror], [string.h], [], [tcl_ok=0]) # See also memmove check below for a place where NO_STRING_H can be # set and why. if test $tcl_ok = 0; then - AC_DEFINE(NO_STRING_H) + AC_DEFINE([NO_STRING_H]) fi - AC_CHECK_HEADER(sys/wait.h, , [AC_DEFINE(NO_SYS_WAIT_H)]) - AC_CHECK_HEADER(dlfcn.h, , [AC_DEFINE(NO_DLFCN_H)]) + AC_CHECK_HEADER([sys/wait.h], [], [AC_DEFINE([NO_SYS_WAIT_H])]) + 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([unistd.h sys/param.h]) ]) @@ -2108,12 +2123,12 @@ # #-------------------------------------------------------------------- -AC_DEFUN(SC_PATH_X, [ +AC_DEFUN([SC_PATH_X], [ AC_PATH_X not_really_there="" if test "$no_x" = ""; then if test "$x_includes" = ""; then - AC_TRY_CPP([#include ], , not_really_there="yes") + AC_TRY_CPP([#include ], [], [not_really_there="yes"]) else if test ! -r $x_includes/X11/Intrinsic.h; then not_really_there="yes" @@ -2121,14 +2136,15 @@ fi fi if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then - AC_MSG_CHECKING(for X11 header files) + AC_MSG_CHECKING([for X11 header files]) found_xincludes="no" - AC_TRY_CPP([#include ], found_xincludes="yes", found_xincludes="no") + AC_TRY_CPP([#include ], [found_xincludes="yes"], + [found_xincludes="no"]) if test "$found_xincludes" = "no"; then dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include" for i in $dirs ; do if test -r $i/X11/Intrinsic.h; then - AC_MSG_RESULT($i) + AC_MSG_RESULT([$i]) XINCLUDES=" -I$i" found_xincludes="yes" break @@ -2142,16 +2158,16 @@ fi fi if test found_xincludes = "no"; then - AC_MSG_RESULT(couldn't find any!) + AC_MSG_RESULT([couldn't find any!]) fi if test "$no_x" = yes; then - AC_MSG_CHECKING(for X11 libraries) + AC_MSG_CHECKING([for X11 libraries]) XLIBSW=nope dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then - AC_MSG_RESULT($i) + AC_MSG_RESULT([$i]) XLIBSW="-L$i -lX11" x_libraries="$i" break @@ -2165,10 +2181,10 @@ fi fi if test "$XLIBSW" = nope ; then - AC_CHECK_LIB(Xwindow, XCreateWindow, XLIBSW=-lXwindow) + AC_CHECK_LIB([Xwindow], [XCreateWindow], [XLIBSW=-lXwindow]) fi if test "$XLIBSW" = nope ; then - AC_MSG_RESULT(couldn't find any! Using -lX11.) + AC_MSG_RESULT([couldn't find any! Using -lX11.]) XLIBSW=-lX11 fi ]) @@ -2193,9 +2209,9 @@ # #-------------------------------------------------------------------- -AC_DEFUN(SC_BLOCKING_STYLE, [ - AC_CHECK_HEADERS(sys/ioctl.h) - AC_CHECK_HEADERS(sys/filio.h) +AC_DEFUN([SC_BLOCKING_STYLE], [ + AC_CHECK_HEADERS([sys/ioctl.h]) + AC_CHECK_HEADERS([sys/filio.h]) AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O]) if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` @@ -2222,19 +2238,19 @@ # code (JO, 5/31/97). OSF*) - AC_DEFINE(USE_FIONBIO) - AC_MSG_RESULT(FIONBIO) + AC_DEFINE([USE_FIONBIO]) + AC_MSG_RESULT([FIONBIO]) ;; SunOS-4*) - AC_DEFINE(USE_FIONBIO) - AC_MSG_RESULT(FIONBIO) + AC_DEFINE([USE_FIONBIO]) + AC_MSG_RESULT([FIONBIO]) ;; ULTRIX-4.*) - AC_DEFINE(USE_FIONBIO) - AC_MSG_RESULT(FIONBIO) + AC_DEFINE([USE_FIONBIO]) + AC_MSG_RESULT([FIONBIO]) ;; *) - AC_MSG_RESULT(O_NONBLOCK) + AC_MSG_RESULT([O_NONBLOCK]) ;; esac ]) @@ -2258,29 +2274,31 @@ # #-------------------------------------------------------------------- -AC_DEFUN(SC_TIME_HANDLER, [ - AC_CHECK_HEADERS(sys/time.h) +AC_DEFUN([SC_TIME_HANDLER], [ + AC_CHECK_HEADERS([sys/time.h]) AC_HEADER_TIME AC_STRUCT_TIMEZONE - AC_CHECK_FUNCS(gmtime_r localtime_r) + AC_CHECK_FUNCS([gmtime_r localtime_r]) AC_MSG_CHECKING([tm_tzadj in struct tm]) - AC_CACHE_VAL(tcl_cv_member_tm_tzadj, + AC_CACHE_VAL([tcl_cv_member_tm_tzadj], [ AC_TRY_COMPILE([#include ], [struct tm tm; tm.tm_tzadj;], - tcl_cv_member_tm_tzadj=yes, tcl_cv_member_tm_tzadj=no)) - AC_MSG_RESULT($tcl_cv_member_tm_tzadj) + [tcl_cv_member_tm_tzadj=yes], + [tcl_cv_member_tm_tzadj=no])]) + AC_MSG_RESULT([$tcl_cv_member_tm_tzadj]) if test $tcl_cv_member_tm_tzadj = yes ; then - AC_DEFINE(HAVE_TM_TZADJ) + AC_DEFINE([HAVE_TM_TZADJ]) fi AC_MSG_CHECKING([tm_gmtoff in struct tm]) - AC_CACHE_VAL(tcl_cv_member_tm_gmtoff, + AC_CACHE_VAL([tcl_cv_member_tm_gmtoff], [ AC_TRY_COMPILE([#include ], [struct tm tm; tm.tm_gmtoff;], - tcl_cv_member_tm_gmtoff=yes, tcl_cv_member_tm_gmtoff=no)) - AC_MSG_RESULT($tcl_cv_member_tm_gmtoff) + [tcl_cv_member_tm_gmtoff=yes], + [tcl_cv_member_tm_gmtoff=no])]) + AC_MSG_RESULT([$tcl_cv_member_tm_gmtoff]) if test $tcl_cv_member_tm_gmtoff = yes ; then - AC_DEFINE(HAVE_TM_GMTOFF) + AC_DEFINE([HAVE_TM_GMTOFF]) fi # @@ -2288,29 +2306,29 @@ # (like convex) have timezone functions, etc. # AC_MSG_CHECKING([long timezone variable]) - AC_CACHE_VAL(tcl_cv_var_timezone, + AC_CACHE_VAL([tcl_cv_var_timezone], [ AC_TRY_COMPILE([#include ], [extern long timezone; timezone += 1; exit (0);], - tcl_cv_timezone_long=yes, tcl_cv_timezone_long=no)) - AC_MSG_RESULT($tcl_cv_timezone_long) + [tcl_cv_timezone_long=yes], [tcl_cv_timezone_long=no])]) + AC_MSG_RESULT([$tcl_cv_timezone_long]) if test $tcl_cv_timezone_long = yes ; then - AC_DEFINE(HAVE_TIMEZONE_VAR) + AC_DEFINE([HAVE_TIMEZONE_VAR]) else # # On some systems (eg IRIX 6.2), timezone is a time_t and not a long. # AC_MSG_CHECKING([time_t timezone variable]) - AC_CACHE_VAL(tcl_cv_timezone_time, + AC_CACHE_VAL([tcl_cv_timezone_time], [ AC_TRY_COMPILE([#include ], [extern time_t timezone; timezone += 1; exit (0);], - tcl_cv_timezone_time=yes, tcl_cv_timezone_time=no)) - AC_MSG_RESULT($tcl_cv_timezone_time) + [tcl_cv_timezone_time=yes], [tcl_cv_timezone_time=no])]) + AC_MSG_RESULT([$tcl_cv_timezone_time]) if test $tcl_cv_timezone_time = yes ; then - AC_DEFINE(HAVE_TIMEZONE_VAR) + AC_DEFINE([HAVE_TIMEZONE_VAR]) fi fi ]) @@ -2335,11 +2353,11 @@ # #-------------------------------------------------------------------- -AC_DEFUN(SC_BUGGY_STRTOD, [ - AC_CHECK_FUNC(strtod, tcl_strtod=1, tcl_strtod=0) +AC_DEFUN([SC_BUGGY_STRTOD], [ + AC_CHECK_FUNC([strtod], [tcl_strtod=1], [tcl_strtod=0]) if test "$tcl_strtod" = 1; then AC_MSG_CHECKING([for Solaris2.4/Tru64 strtod bugs]) - AC_CACHE_VAL(tcl_cv_strtod_buggy,[ + AC_CACHE_VAL([tcl_cv_strtod_buggy], [ AC_TRY_RUN([ extern double strtod(); int main() { @@ -2359,13 +2377,14 @@ exit(1); } exit(0); - }], tcl_cv_strtod_buggy=1, tcl_cv_strtod_buggy=0, tcl_cv_strtod_buggy=0)]) + }], [tcl_cv_strtod_buggy=1], [tcl_cv_strtod_buggy=0], + [tcl_cv_strtod_buggy=0])]) if test "$tcl_cv_strtod_buggy" = 1; then - AC_MSG_RESULT(ok) + AC_MSG_RESULT([ok]) else - AC_MSG_RESULT(buggy) + AC_MSG_RESULT([buggy]) LIBOBJS="$LIBOBJS fixstrtod.o" - AC_DEFINE(strtod, fixstrtod) + AC_DEFINE([strtod], [fixstrtod]) fi fi ]) @@ -2397,7 +2416,7 @@ # #-------------------------------------------------------------------- -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. @@ -2405,16 +2424,16 @@ # right (and it must appear before "-lm"). #-------------------------------------------------------------------- - AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm") - AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"]) + AC_CHECK_FUNC([sin], [MATH_LIBS=""], [MATH_LIBS="-lm"]) + AC_CHECK_LIB([ieee], [main], [MATH_LIBS="-lieee $MATH_LIBS"]) #-------------------------------------------------------------------- # Interactive UNIX requires -linet instead of -lsocket, plus it # needs net/errno.h to define the socket-related error codes. #-------------------------------------------------------------------- - AC_CHECK_LIB(inet, main, [LIBS="$LIBS -linet"]) - AC_CHECK_HEADER(net/errno.h, [AC_DEFINE(HAVE_NET_ERRNO_H)]) + AC_CHECK_LIB([inet], [main], [LIBS="$LIBS -linet"]) + AC_CHECK_HEADER([net/errno.h], [AC_DEFINE([HAVE_NET_ERRNO_H])]) #-------------------------------------------------------------------- # Check for the existence of the -lsocket and -lnsl libraries. @@ -2435,25 +2454,28 @@ #-------------------------------------------------------------------- tcl_checkBoth=0 - AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1) + AC_CHECK_FUNC([connect], [tcl_checkSocket=0], [tcl_checkSocket=1]) if test "$tcl_checkSocket" = 1; then - AC_CHECK_FUNC(setsockopt, , [AC_CHECK_LIB(socket, setsockopt, - LIBS="$LIBS -lsocket", tcl_checkBoth=1)]) + AC_CHECK_FUNC([setsockopt], [], + [AC_CHECK_LIB([socket], [setsockopt], + [LIBS="$LIBS -lsocket"], + [tcl_checkBoth=1])]) fi if test "$tcl_checkBoth" = 1; then tk_oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" - AC_CHECK_FUNC(accept, tcl_checkNsl=0, [LIBS=$tk_oldLibs]) + AC_CHECK_FUNC([accept], [tcl_checkNsl=0], [LIBS=$tk_oldLibs]) fi - AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname, - [LIBS="$LIBS -lnsl"])]) + AC_CHECK_FUNC([gethostbyname], [], + [AC_CHECK_LIB([nsl], [gethostbyname], + [LIBS="$LIBS -lnsl"])]) # Don't perform the eval of the libraries here because DL_LIBS # won't be set until we call SC_CONFIG_CFLAGS TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}' - AC_SUBST(TCL_LIBS) - AC_SUBST(MATH_LIBS) + AC_SUBST([TCL_LIBS]) + AC_SUBST([MATH_LIBS]) ]) #-------------------------------------------------------------------- @@ -2473,29 +2495,29 @@ # #-------------------------------------------------------------------- -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 -]$2], $3, - [tcl_cv_flag_]translit($1,[A-Z],[a-z])=yes, - [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no))) - if test ["x${tcl_cv_flag_]translit($1,[A-Z],[a-z])[}" = "xyes"] ; then - AC_DEFINE($1) +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 +$2], [$3], + [tcl_cv_flag_]translit([$1],[A-Z],[a-z])[=yes], + [tcl_cv_flag_]translit([$1],[A-Z],[a-z])[=no]))) + if test ["x${tcl_cv_flag_]translit([$1],[A-Z],[a-z])[}" = "xyes"] ; then + AC_DEFINE([$1]) tcl_flags="$tcl_flags $1" 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 ], + SC_TCL_EARLY_FLAG([_ISOC99_SOURCE], [#include ], [char *p = (char *)strtoll; char *q = (char *)strtoull;]) - SC_TCL_EARLY_FLAG(_LARGEFILE64_SOURCE,[#include ], + SC_TCL_EARLY_FLAG([_LARGEFILE64_SOURCE], [#include ], [struct stat64 buf; int i = stat64("/", &buf);]) if test "x${tcl_flags}" = "x" ; then - AC_MSG_RESULT(none) + AC_MSG_RESULT([none]) else - AC_MSG_RESULT(${tcl_flags}) + AC_MSG_RESULT([${tcl_flags}]) fi]) #-------------------------------------------------------------------- @@ -2517,61 +2539,61 @@ # #-------------------------------------------------------------------- -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,[ + AC_CACHE_VAL([tcl_cv_type_64bit], [ tcl_cv_type_64bit=none # See if the compiler knows natively about __int64 - AC_TRY_COMPILE(,[__int64 value = (__int64) 0;], - tcl_type_64bit=__int64, tcl_type_64bit="long long") + AC_TRY_COMPILE([], [__int64 value = (__int64) 0;], + [tcl_type_64bit=__int64], [tcl_type_64bit="long long"]) # See if we should use long anyway Note that we substitute in the # type that is our current guess for a 64-bit type inside this check # program, so it should be modified only carefully... - AC_TRY_COMPILE(,[switch (0) { - case 1: case (sizeof(]${tcl_type_64bit}[)==sizeof(long)): ; - }],tcl_cv_type_64bit=${tcl_type_64bit})]) + AC_TRY_COMPILE([], [switch (0) { + case 1: case (sizeof(${tcl_type_64bit})==sizeof(long)): ; + }], [tcl_cv_type_64bit=${tcl_type_64bit}])]) if test "${tcl_cv_type_64bit}" = none ; then - AC_DEFINE(TCL_WIDE_INT_IS_LONG) - AC_MSG_RESULT(using long) + AC_DEFINE([TCL_WIDE_INT_IS_LONG]) + AC_MSG_RESULT([using long]) else - AC_DEFINE_UNQUOTED(TCL_WIDE_INT_TYPE,${tcl_cv_type_64bit}) - AC_MSG_RESULT(${tcl_cv_type_64bit}) + AC_DEFINE_UNQUOTED([TCL_WIDE_INT_TYPE,${tcl_cv_type_64bit}]) + AC_MSG_RESULT([${tcl_cv_type_64bit}]) # Now check for auxiliary declarations AC_MSG_CHECKING([for struct dirent64]) - AC_CACHE_VAL(tcl_cv_struct_dirent64,[ + AC_CACHE_VAL([tcl_cv_struct_dirent64], [ AC_TRY_COMPILE([#include #include ],[struct dirent64 p;], - tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)]) + [tcl_cv_struct_dirent64=yes], [tcl_cv_struct_dirent64=no])]) if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then - AC_DEFINE(HAVE_STRUCT_DIRENT64) + AC_DEFINE([HAVE_STRUCT_DIRENT64]) fi - AC_MSG_RESULT(${tcl_cv_struct_dirent64}) + AC_MSG_RESULT([${tcl_cv_struct_dirent64}]) AC_MSG_CHECKING([for struct stat64]) - AC_CACHE_VAL(tcl_cv_struct_stat64,[ + AC_CACHE_VAL([tcl_cv_struct_stat64], [ AC_TRY_COMPILE([#include ],[struct stat64 p; ], tcl_cv_struct_stat64=yes,tcl_cv_struct_stat64=no)]) if test "x${tcl_cv_struct_stat64}" = "xyes" ; then - AC_DEFINE(HAVE_STRUCT_STAT64) + AC_DEFINE([HAVE_STRUCT_STAT64]) fi - AC_MSG_RESULT(${tcl_cv_struct_stat64}) + AC_MSG_RESULT([${tcl_cv_struct_stat64}]) AC_MSG_CHECKING([for off64_t]) - AC_CACHE_VAL(tcl_cv_type_off64_t,[ + AC_CACHE_VAL([tcl_cv_type_off64_t], [ AC_TRY_COMPILE([#include ],[off64_t offset; ], - tcl_cv_type_off64_t=yes,tcl_cv_type_off64_t=no)]) - AC_CHECK_FUNCS(open64 lseek64) + [tcl_cv_type_off64_t=yes], [tcl_cv_type_off64_t=no])]) + AC_CHECK_FUNCS([open64 lseek64]) dnl Define HAVE_TYPE_OFF64_T only when the off64_t type and the dnl functions lseek64 and open64 are defined. if test "x${tcl_cv_type_off64_t}" = "xyes" && \ test "x${ac_cv_func_lseek64}" = "xyes" && \ test "x${ac_cv_func_open64}" = "xyes" ; then - AC_DEFINE(HAVE_TYPE_OFF64_T, 1, [Is off64_t in ?]) - AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_TYPE_OFF64_T], [1], [Is off64_t in ?]) + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi])