Ticket #38582: patch-liberally-configure.ac.diff

configure.ac

@@ -1 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl $Id$
-AC_PREREQ(2.63)
-AC_DEFUN([MACPORTS_VERSION_MACRO], [esyscmd(<config/macports_version tr -d '\n')])
+dnl#                                               -*- Autoconf -*-
+dnl# Process this file with autoconf to produce a configure script.
+dnl# $Id$
+
+AC_PREREQ([2.69])
+AC_DEFUN([MACPORTS_VERSION_MACRO],[esyscmd(<config/macports_version tr -d '\n')])
+dnl# Square brackets cannot be put around the middle argument to AC_INIT here.
+dnl# That would be how it is normally done, and it is what autoupdate 
+dnl# wants to do, but this cannot be done because of the following error:
+dnl# configure.ac:7: error: m4_divert_push: cannot change diversion to `GROW' inside m4_expand
+dnl# configure.ac:7: the top level
 AC_INIT([MacPorts],MACPORTS_VERSION_MACRO,[macports-dev@lists.macosforge.org],[macports])
 AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
 AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_TARGET
+AC_USE_SYSTEM_EXTENSIONS
+AC_OBJEXT
+AC_EXEEXT
 
 # Read in the MacPorts version from the base/config/macports_version file
-AC_MSG_CHECKING(MacPorts version)
+AC_MSG_CHECKING([MacPorts version])
 MACPORTS_VERSION=MACPORTS_VERSION_MACRO
 AC_MSG_RESULT([$MACPORTS_VERSION])
-AC_SUBST(MACPORTS_VERSION)
+AC_SUBST([MACPORTS_VERSION])
 
 # Check user PATH for MP paths, and remove as necessary.
 MP_PATH_SCAN
 
-AC_PATH_PROG(SW_VERS, sw_vers)
-AC_PATH_PROG(DEFAULTS, defaults)
-AC_PATH_PROG(XCODE_SELECT, xcode-select)
+AC_PATH_PROG([SW_VERS],[sw_vers])
+AC_PATH_PROG([DEFAULTS],[defaults])
+AC_PATH_PROG([XCODE_SELECT],[xcode-select])
 
 if test "x$SW_VERS" != "x"; then
-  AC_MSG_CHECKING(Mac OS X version)
+  AC_MSG_CHECKING([Mac OS X version])
   MACOSX_VERSION=`$SW_VERS -productVersion`
   AC_MSG_RESULT([$MACOSX_VERSION])
 fi
 
 case "$MACOSX_VERSION" in
   10.0*|10.1*|10.2*|10.3*)
-    AC_MSG_ERROR([This version of Mac OS X is not supported
+    AC_MSG_ERROR([This version of Mac OS X is not supported any more.
                   Please upgrade at http://store.apple.com/])
     ;;
   10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]]|10.8.[[0-3]])
-    AC_MSG_WARN([This version of Mac OS X is out of date])
-    AC_MSG_WARN([Please run Software Update to update it])
+    AC_MSG_WARN([This version of Mac OS X is out of date.])
+    AC_MSG_WARN([Please run Software Update to update it.])
     ;;
   10.4*|10.5*|10.6*|10.7*|10.8*)
-    dnl Supported version
+    dnl# Supported version
     ;;
   *)
     ;;
 esac
 
 # locate currently selected Xcode path
-AC_MSG_CHECKING(Xcode location)
+AC_MSG_CHECKING([Xcode location])
 if test "x$XCODE_SELECT" != "x"; then
   DEVELOPER_DIR=`$XCODE_SELECT -print-path`
 fi
@@ -56 +67 @@
     fi
 fi
 AC_MSG_RESULT([$DEVELOPER_DIR])
-AC_SUBST(DEVELOPER_DIR)
+AC_SUBST([DEVELOPER_DIR])
 
 case "$DEVELOPER_DIR" in
   *Xcode.app/Contents/Developer)
@@ -87 +98 @@
     AC_MSG_WARN([Please consider upgrading as some ports fail compiling])
     ;;
   2.*|3.*|4.*)
-    dnl Supported version
+    dnl# Supported version
     ;;
   *)
     ;;
 esac
 
 # Checks for programs.
-AC_PROG_CC
+AC_PROG_AWK
+if test "x$CC" = "x"; then
+  AC_PROG_CC
+else
+  # The "test" is just a dummy to make sure that this "else" condition
+  # is not empty, as sometimes `autoconf` removes the AC_SUBSTs...
+  test ! -z "$CC"
+  AC_SUBST([CC])
+fi
+AC_PROG_CPP
+AC_PROG_CXX
+AC_PROG_GCC_TRADITIONAL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+AC_PROG_YACC
 AC_PROG_OBJC
 
-AC_PATH_PROGS(BSDMAKE, [bsdmake pmake], [])
-AC_PATH_PROG(BZIP2, [bzip2], [])
-AC_PATH_PROG(BZR, [bzr], [])
-AC_PATH_PROG(CHOWN, [chown], [], [$PATH:/usr/sbin])
-AC_PATH_PROG(CP, [cp], [])
-AC_PATH_PROG(CPIO, [cpio], [])
-AC_PATH_PROG(CVS, [cvs], [])
-AC_PATH_PROG(DIFF, [diff], [])
-AC_PATH_PROG(DSCL, [dscl], [])
-AC_PATH_PROG(DSEDITGROUP, [dseditgroup], [])
-AC_PATH_PROG(FILE, [file], [])
-AC_PATH_PROG(FIND, [find], [])
-AC_PATH_PROG(GIT, [git], [])
-AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [], [$PATH:/usr/local/bin])
-AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [], [$PATH:/usr/local/bin])
-AC_PATH_PROGS(GNUTAR, [gnutar gtar], [], [$PATH:/usr/local/bin])
-AC_PATH_PROG(GZIP, [gzip], [])
-AC_PATH_PROG(HDIUTIL, [hdiutil], [])
-AC_PATH_PROG(HG, [hg], [])
-AC_PATH_PROG(LAUNCHCTL, [launchctl], [])
-AC_PATH_PROG(LIPO, [lipo], [])
-AC_PATH_PROG(LSBOM, [lsbom], [])
-AC_PATH_PROG(LZMA, [lzma], [])
-AC_PATH_PROG(MAKE, [make])
-AC_PATH_PROG(MDFIND, [mdfind], [])
-AC_PATH_PROG(MDLS, [mdls], [])
-AC_PATH_PROG(MKBOM, [mkbom], [])
-AC_PATH_PROG(MTREE, [mtree], [], [$PATH:/usr/sbin])
-AC_PATH_PROG(OPEN, [open], [])
-AC_PATH_PROG(OPENSSL, [openssl], [])
-AC_PATH_PROG(PATCH, [patch], [])
-AC_PATH_PROG(PAX, [pax], [])
-AC_PATH_PROG(RMDIR, [rmdir], [])
-AC_PATH_PROG(RSYNC, [rsync], [])
-AC_PATH_PROG(SANDBOX_EXEC, [sandbox-exec], [], [/usr/bin])
-AC_PATH_PROG(SED, [sed])
-AC_PATH_PROG(SVN, [svn], [])
-AC_PATH_PROG(SWIG, [swig], [], [$PATH:/usr/local/bin])
-AC_PATH_PROG(TAR, [tar])
-AC_PATH_PROG(UNZIP, [unzip])
-AC_PATH_PROG(XAR, [xar], [])
-AC_PATH_PROG(XCODEBUILD, [xcodebuild], [])
-AC_PATH_PROG(XCRUN, [xcrun], [])
-AC_PATH_PROG(XZ, [xz], [])
-AC_PATH_PROG(ZIP, [zip])
+# programs without specifically-crafted AC_* macros
+AC_PATH_PROGS([BSDMAKE], [bsdmake pmake], [])
+AC_PATH_PROG([BZIP2], [bzip2], [])
+AC_PATH_PROG([BZR], [bzr], [])
+AC_PATH_PROG([CHOWN], [chown], [], [$PATH:/usr/sbin])
+AC_PATH_PROG([CHGRP], [chgrp], [], [$PATH:/usr/sbin])
+AC_PATH_PROG([CHMOD], [chmod], [], [$PATH:/usr/sbin])
+AC_PATH_PROG([CODESIGN], [codesign], [])
+AC_PATH_PROG([CP], [cp], [])
+AC_PATH_PROG([CPIO], [cpio], [])
+AC_PATH_PROG([CVS], [cvs], [])
+AC_PATH_PROG([DIFF], [diff], [])
+AC_PATH_PROG([DOXYGEN], [doxygen], [])
+AC_PATH_PROG([DSCL], [dscl], [])
+AC_PATH_PROG([DSEDITGROUP], [dseditgroup], [])
+AC_PATH_PROG([DYLIBBUNDLER], [dylibbundler], [])
+AC_PATH_PROG([ED], [ed])
+AC_PATH_PROG([FILE], [file], [])
+AC_PATH_PROG([GIT], [git], [])
+AC_PATH_PROGS([GNUMAKE], [gnumake gmake], [], [$PATH:/usr/local/bin])
+AC_PATH_PROGS([GNUPATCH], [gnupatch], [], [$PATH:/usr/local/bin])
+AC_PATH_PROGS([GNUTAR], [gnutar gtar], [], [$PATH:/usr/local/bin])
+AC_PATH_PROG([GZIP], [gzip], [])
+AC_PATH_PROG([HDIUTIL], [hdiutil], [])
+AC_PATH_PROG([HG], [hg], [])
+AC_PATH_PROG([LAUNCHCTL], [launchctl], [])
+AC_PATH_PROG([LIPO], [lipo], [])
+AC_PATH_PROG([LSBOM], [lsbom], [])
+AC_PATH_PROG([LZMA], [lzma], [])
+AC_PATH_PROG([MAKE], [make])
+AC_PATH_PROG([MDFIND], [mdfind], [])
+AC_PATH_PROG([MDLS], [mdls], [])
+AC_PATH_PROG([MKBOM], [mkbom], [])
+AC_PATH_PROG([MTREE], [mtree], [], [$PATH:/usr/sbin])
+AC_PATH_PROG([OPEN], [open], [])
+AC_PATH_PROG([OPENSSL], [openssl], [])
+AC_PATH_PROG([PAX], [pax], [])
+AC_PATH_PROG([PERL5], [perl], [])
+AC_PATH_PROG([RMDIR], [rmdir], [])
+AC_PATH_PROG([RSYNC], [rsync], [])
+AC_PATH_PROG([SANDBOX_EXEC], [sandbox-exec], [], [/usr/bin])
+AC_PATH_PROG([SED], [sed])
+AC_PATH_PROG([SVN], [svn], [])
+AC_PATH_PROG([TCLDOC], [tcldoc], [])
+AC_SUBST([TCLDOC])
+export TCLDOC
+AC_PATH_PROG([UNZIP], [unzip])
+AC_PATH_PROG([XATTR], [xattr], [])
+AC_PATH_PROG([XAR], [xar], [])
+AC_PATH_PROG([XARGS], [xargs], [])
+AC_PATH_PROG([XCODEBUILD], [xcodebuild], [])
+AC_PATH_PROG([XCRUN], [xcrun], [])
+AC_PATH_PROG([XZ], [xz], [])
+AC_PATH_PROG([ZIP], [zip])
 
-AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], [])
+AC_CHECK_PROG([HAVE_LAUNCHD], [launchd], [yes], [])
 
 # Define some precious variables allowing user to override PATH for some programs
-AC_ARG_VAR(BSDMAKE, [path to bsdmake/pmake command])
-AC_ARG_VAR(BZIP2, [path to bzip2 command])
-AC_ARG_VAR(CVS, [path to cvs command])
-AC_ARG_VAR(GNUMAKE, [path to gnumake command])
-AC_ARG_VAR(GNUTAR, [path to gnutar command])
-AC_ARG_VAR(LZMA, [path to lzma command])
-AC_ARG_VAR(MAKE, [path to make command])
-AC_ARG_VAR(MTREE, [path to mtree command])
-AC_ARG_VAR(OPEN, [path to open command])
-AC_ARG_VAR(OPENSSL, [path to openssl command])
-AC_ARG_VAR(RSYNC, [path to rsync command])
-AC_ARG_VAR(SED, [path to sed command])
-AC_ARG_VAR(SVN, [path to svn command])
-AC_ARG_VAR(SWIG, [path to swig command])
-AC_ARG_VAR(TAR, [path to tar command])
-AC_ARG_VAR(XAR, [path to xar command])
-AC_ARG_VAR(XZ, [path to xz command])
+AC_ARG_VAR([BSDMAKE], [path to bsdmake/pmake command])
+AC_ARG_VAR([BZIP2], [path to bzip2 command])
+AC_ARG_VAR([CVS], [path to cvs command])
+AC_ARG_VAR([GNUMAKE], [path to gnumake command])
+AC_ARG_VAR([GNUTAR], [path to gnutar command])
+AC_ARG_VAR([LZMA], [path to lzma command])
+AC_ARG_VAR([MAKE], [path to make command])
+AC_ARG_VAR([MTREE], [path to mtree command])
+AC_ARG_VAR([OPEN], [path to open command])
+AC_ARG_VAR([OPENSSL], [path to openssl command])
+AC_ARG_VAR([RSYNC], [path to rsync command])
+AC_ARG_VAR([SED], [path to sed command])
+AC_ARG_VAR([SVN], [path to svn command])
+AC_ARG_VAR([SWIG], [path to swig command])
+AC_ARG_VAR([TCLSH], [path to tclsh command])
+AC_ARG_VAR([TAR], [path to tar command])
+AC_ARG_VAR([XAR], [path to xar command])
+AC_ARG_VAR([XZ], [path to xz command])
 
 if test "x$MTREE" = "x"; then
-    AC_MSG_ERROR([mtree not found])
+    AC_MSG_ERROR([mtree not found; you can get a copy from http://opensource.apple.com/source/file_cmds/file_cmds-220.7/])
 fi
 
 MP_SED_EXTENDED_REGEXP
@@ -181 +215 @@
         CFLAGS_QUICHEEATERS='-Wextra -Wall'
         CFLAGS_PEDANTIC='-pedantic'
 fi
-AC_SUBST(CFLAGS_QUICHEEATERS)
-AC_SUBST(CFLAGS_PEDANTIC)
+AC_SUBST([CFLAGS_QUICHEEATERS])
+AC_SUBST([CFLAGS_PEDANTIC])
 MP_WERROR
 
 MP_COMPILER_ATTRIBUTE_UNUSED
@@ -191 +225 @@
 # Foundation checks
 ACX_PTHREAD
 MP_OBJC_RUNTIME
+AC_MSG_CHECKING([for GNUStep system root])
+if test "x$GNUSTEP_SYSTEM_ROOT" = "x"; then
+  # TODO: move prefix-checking code above this step so that configured prefix
+  # can be used instead of hardwiring /opt/local
+  if test -d /opt/local/GNUStep/System; then
+    export GNUSTEP_SYSTEM_ROOT=/opt/local/GNUSTEP/System
+    AC_MSG_RESULT([using MacPorts GNUStep system root: $GNUSTEP_SYSTEM_ROOT])
+    AC_SUBST([GNUSTEP_SYSTEM_ROOT])
+  else
+    # This had previously been in the other "else" condition, but I think
+    # that was the wrong order...
+    AC_MSG_RESULT([not found])
+  fi
+else
+  AC_MSG_RESULT([using user-set GNUStep system root: $GNUSTEP_SYSTEM_ROOT])
+  AC_SUBST([GNUSTEP_SYSTEM_ROOT])
+fi
 MP_OBJC_FOUNDATION
 
 MP_PROG_DAEMONDO
 
-AC_SUBST(EXTRA_PROGS)
+AC_SUBST([EXTRA_PROGS])
 
 # set default ports-directory
 PORTS_DIR_DEFAULT=`pwd | sed -e "s/base/ports/"`
 
 # Check for paths
-AC_PREFIX_DEFAULT(/opt/local)
-AC_ARG_WITH(
-                unsupported-prefix,
-                AS_HELP_STRING([--with-unsupported-prefix],
-                [Acknowledge that you accept the consequences of using an unsupported prefix.]),
+AC_PREFIX_DEFAULT([/opt/local])
+AC_ARG_WITH([unsupported-prefix],
+                [AS_HELP_STRING([--with-unsupported-prefix],
+                [Acknowledge that you accept the consequences of using an unsupported prefix.])],
                 [with_unsupported_prefix=$withval],
                 [with_unsupported_prefix=no])
 if test x$prefix = x/usr/local -o x$prefix = x/usr && test x$with_unsupported_prefix != xyes; then
@@ -233 +283 @@
 # Check for universal options
 MP_UNIVERSAL_OPTIONS
 
+# Checks for libraries.
+# FIXME: Replace `main' with a function in `-ltcl':
+AC_CHECK_LIB([tcl], [main])
+
 # Check for standard header files.
-AC_HEADER_STDC
+# AC_HEADER_STDC is no longer needed by itself, as it automatically gets
+# pulled in by other macros
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h sys/socket.h \
-        sys/event.h sys/sysctl.h readline/readline.h readline/history.h pwd.h sys/paths.h utime.h])
+AC_CHECK_HEADERS([crt_externs.h err.h fcntl.h limits.h mach/mach.h \
+        netdb.h paths.h pwd.h readline/history.h readline/readline.h \
+        stddef.h stdio.h sys/cdefs.h sys/event.h sys/fcntl.h sys/file.h \
+        sys/ioctl.h sys/mount.h sys/param.h sys/paths.h sys/socket.h \
+        sys/sysctl.h sys/time.h utime.h])
 
 INCLUDES="-I.. -I. $INCLUDES"
 
+# Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_HEADER_STDBOOL
+AC_TYPE_UID_T
+AC_C_BIGENDIAN
+AC_C_INLINE
+AC_TYPE_INTMAX_T
+AC_TYPE_INTPTR_T
+AC_TYPE_LONG_DOUBLE
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_C_PROTOTYPES
+AC_C_RESTRICT
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT8_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINTMAX_T
+AC_TYPE_UINTPTR_T
+AC_C_FLEXIBLE_ARRAY_MEMBER
+AC_C_VARARRAYS
+AC_CHECK_MEMBERS([Tcl_Interp.errorLine])
+AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([uint8_t])
+AC_CHECK_SIZEOF([uint32_t])
+
 # Checks for library functions.
-AC_CHECK_FUNCS([bzero memset fgetln lockf flock setmode strcasecmp strncasecmp strlcpy strlcat copyfile clearenv sysctlbyname kqueue])
+AC_FUNC_CHOWN
+AC_FUNC_FORK
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
+AC_FUNC_MMAP
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([bzero clearenv copyfile dup2 fgetln flock getcwd lchown \
+localtime_r lockf kqueue memmove memset mkdir munmap realpath regcomp \
+rmdir select setenv setmode socket strcasecmp strchr strdup strerror \
+strlcat strlcpy strncasecmp strrchr strstr strtol strtoul sysctlbyname \
+utime])
 AC_SUBST(ac_cv_func_strlcat)
 
 MP_CHECK_READLINK_IS_P1003_1A
@@ -252 +346 @@
 AC_CHECK_HEADER([CommonCrypto/CommonDigest.h], [AC_DEFINE([HAVE_COMMONCRYPTO_COMMONDIGEST_H], [1], [Define if CommonCrypto is available.])], [MP_LIB_MD5])
 
 # Check for readline
-AC_ARG_ENABLE(readline, AS_HELP_STRING([--enable-readline],[Enable addition of readline support, if readline present.]),
+AC_ARG_ENABLE([readline], [AS_HELP_STRING([--enable-readline],[Enable addition of readline support, if readline present.])],
 [
         AC_CHECK_LIB([readline], [readline], [
                                   READLINE_LIBS=-lreadline
@@ -266 +360 @@
         #endif
         ])
 ])
-AC_SUBST(READLINE_LIBS)
+AC_SUBST([READLINE_LIBS])
 
 # Lowest non-system-reserved uid and gid (Apple claims <500)
 AC_DEFINE([MIN_USABLE_UID], [500], [Lowest non-system-reserved UID.])
@@ -276 +370 @@
 SC_PATH_TCLCONFIG
 SC_LOAD_TCLCONFIG
 
-# Check for Tcl public headers
-dnl XXX  hardwire CYGPATH (CYGPATH must be set for SC_PUBLIC_TCL_HEADERS)
+# Check for Tcl public headers (and other Tcl-relevant headers)
+dnl# XXX hardwire CYGPATH (CYGPATH must be set for SC_PUBLIC_TCL_HEADERS)
 CYGPATH=echo
 SC_PUBLIC_TCL_HEADERS
 
@@ -292 +386 @@
 
 ## libcurl
 MP_LIBCURL_FLAGS
+AC_CHECK_HEADERS([curl/curl.h curl/curlrules.h])
 
 ## sqlite3
 MP_SQLITE3_FLAGS
 
-MP_CHECK_SQLITE_VERSION(3003011)
+MP_CHECK_SQLITE_VERSION([3003011])
 if test "x${mp_sqlite_version_ge_3003011}" = "xno"; then
         AC_DEFINE([sqlite3_prepare_v2], [sqlite3_prepare], [define sqlite3_prepare to sqlite_prepare_v2 if the latter is not available])
 fi
@@ -305 +400 @@
 OUR_INCLUDED_PACKAGES=
 
 ## Thread package.
-AC_ARG_WITH(
-                included-tclthread,
-                AS_HELP_STRING([--with-included-tclthread],
-                        [install included Thread package.]),
+AC_ARG_WITH([included-tclthread],
+                [AS_HELP_STRING([--with-included-tclthread],
+                        [install included Thread package.])],
                 [with_included_tclthread=$withval],
                 [with_included_tclthread="unspecified"])
 
 # Check if thread package is already installed.
 if test "x$with_included_tclthread" = "xunspecified" ; then
-        MP_TCL_PACKAGE(
-                [Thread],
+        MP_TCL_PACKAGE([Thread],
                 [AC_MSG_RESULT([yes]); with_included_tclthread=no],
                 [AC_MSG_RESULT([no]); with_included_tclthread=yes])
 fi
@@ -324 +417 @@
 if test "$with_included_tclthread" = "yes"; then
         OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES thread2.6"
         AC_CONFIG_SUBDIRS([src/thread2.6])
-        # Extract thread package
-        (cd src/; gzip -d < thread2.6.tar.gz | tar xf -)
-        # Patch thread package (so thread2.6 is the vanilla distribution directory)
-        patch -p0 < src/thread2.6.diff
+        # Extract thread package (only if it has not already been extracted)
+        if test ! -d src/thread2.6 ; then
+                (cd src/; gzip -d < thread2.6.tar.gz | tar xf -)
+                # If extracting a fresh copy, we have to patch the thread package 
+                # (so that thread2.6 is the vanilla distribution directory)
+                patch -p0 < src/thread2.6.diff
+        fi
 fi
 
+AH_TEMPLATE([TRACE_SDK],[SDK for SDK redirect in tracelib])
+AC_ARG_WITH([trace-sdk],
+        [AS_HELP_STRING([--with-trace-sdk=SDK],
+                [SDK for redirection in trace lib (for example MacOSX10.4u.sdk)])],
+        [test -d ${DEVELOPER_DIR}/SDKs/${withval} && AC_DEFINE_UNQUOTED([TRACE_SDK],["${withval}"])], [])
+
 # Allows building of shared libraries
 SC_ENABLE_SHARED
 
@@ -341 +443 @@
 SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
 SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
 
-AC_SUBST(INCLUDES)
-AC_SUBST(STLIB_LD)
-AC_SUBST(SHLIB_LD)
-AC_SUBST(SHLIB_CFLAGS)
-AC_SUBST(SHLIB_LDFLAGS)
-AC_SUBST(SHLIB_SUFFIX)
-AC_SUBST(TCL_DEFS)
-AC_SUBST(TCL_STUB_LIB_SPEC)
-AC_SUBST(TCL_CC)
-AC_SUBST(OUR_INCLUDED_PACKAGES)
+AC_SUBST([INCLUDES])
+AC_SUBST([STLIB_LD])
+AC_SUBST([SHLIB_LD])
+AC_SUBST([SHLIB_CFLAGS])
+AC_SUBST([SHLIB_LDFLAGS])
+AC_SUBST([SHLIB_SUFFIX])
+AC_SUBST([TCL_DEFS])
+AC_SUBST([TCL_STUB_LIB_SPEC])
+AC_SUBST([TCL_CC])
+AC_SUBST([OUR_INCLUDED_PACKAGES])
 
 # misc variables that need to be expanded for substitution into tcl
 
@@ -363 +465 @@
 MP_CHECK_OLDLAYOUT
 
 eval "prefix_expanded=$prefix"
-AC_SUBST(prefix_expanded)
+AC_SUBST([prefix_expanded])
 # do this twice, since there is a nested variable of
 # ${prefix} inside of ${sysconfdir}
 eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
 eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR_EXPANDED"
-AC_SUBST(MPCONFIGDIR_EXPANDED)
+AC_SUBST([MPCONFIGDIR_EXPANDED])
 eval "localstatedir_expanded=$localstatedir"
-AC_SUBST(localstatedir_expanded)
+AC_SUBST([localstatedir_expanded])
 eval "macports_tcl_dir=${datadir}/macports/Tcl"
 eval "macports_tcl_dir=$macports_tcl_dir"
-AC_SUBST(macports_tcl_dir)
+AC_SUBST([macports_tcl_dir])
 
 prefix=$oldprefix
 
-dnl man page settings (compressed, links, etc)
-dnl
-dnl SC_CONFIG_MANPAGES
+dnl# man page settings (compressed, links, etc)
+dnl#
+SC_CONFIG_MANPAGES
 
 # Output
 AC_CONFIG_FILES([