diff -ur ../base/aclocal.m4 ./aclocal.m4
--- ../base/aclocal.m4	2012-09-21 16:23:13.000000000 -0400
+++ ./aclocal.m4	2013-03-29 16:21:23.000000000 -0400
@@ -1,1140 +1,18 @@
-dnl $Id: aclocal.m4 91512 2012-04-03 23:13:04Z jmr@macports.org $
-builtin(include,m4/tcl.m4)
-builtin(include,m4/pthread.m4)
-builtin(include,m4/foundation.m4)
+# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
 
-#------------------------------------------------------------------------
-# MP_CHECK_FRAMEWORK_COREFOUNDATION --
-#
-#	Check if CoreFoundation framework is available, define HAVE_FRAMEWORK_COREFOUNDATION if so.
-#
-# Arguments:
-#       None.
-#
-# Requires:
-#       None.
-#
-# Depends:
-#		AC_LANG_PROGRAM
-#
-# Results:
-#       Result is cached.
-#
-#	If CoreFoundation framework is available, defines the following variables:
-#		HAVE_FRAMEWORK_COREFOUNDATION
-#
-#------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FRAMEWORK_COREFOUNDATION, [
-	FRAMEWORK_LIBS="-framework CoreFoundation"
-
-	AC_MSG_CHECKING([for CoreFoundation framework])
-
-	AC_CACHE_VAL(mp_cv_have_framework_corefoundation, [
-		ac_save_LIBS="$LIBS"
-		LIBS="$FRAMEWORK_LIBS $LIBS"
-		
-		AC_LINK_IFELSE([
-			AC_LANG_PROGRAM([
-					#include <CoreFoundation/CoreFoundation.h>
-				], [
-					CFURLRef url = CFURLCreateWithFileSystemPath(NULL, CFSTR("/testing"), kCFURLPOSIXPathStyle, 1);
-					CFArrayRef bundles = CFBundleCreateBundlesFromDirectory(NULL, url, CFSTR("pkg"));
-			])
-			], [
-				mp_cv_have_framework_corefoundation="yes"
-			], [
-				mp_cv_have_framework_corefoundation="no"
-			]
-		)
-
-		LIBS="$ac_save_LIBS"
-	])
-
-	AC_MSG_RESULT(${mp_cv_have_framework_corefoundation})
-
-	if test x"${mp_cv_have_framework_corefoundation}" = "xyes"; then
-		AC_DEFINE([HAVE_FRAMEWORK_COREFOUNDATION], [], [Define if CoreFoundation framework is available])
-	fi
-
-	AC_SUBST(HAVE_FRAMEWORK_COREFOUNDATION)
-])
-
-
-#------------------------------------------------------------------------
-# MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER --
-#
-#	Check if if the routine CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
-#	is available in CoreFoundation.
-#
-# Arguments:
-#       None.
-#
-# Requires:
-#       None.
-#
-# Depends:
-#		AC_LANG_PROGRAM
-#
-# Results:
-#       Result is cached.
-#
-#	If function CFNotificationCenterGetDarwinNotifyCenter is in the CoreFoundation framework, defines the following variables:
-#		HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
-#
-#------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER, [
-	FRAMEWORK_LIBS="-framework CoreFoundation"
-
-	AC_MSG_CHECKING([for CFNotificationCenterGetDarwinNotifyCenter])
-
-	AC_CACHE_VAL(mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter, [
-		ac_save_LIBS="$LIBS"
-		LIBS="$FRAMEWORK_LIBS $LIBS"
-		
-		AC_LINK_IFELSE([
-			AC_LANG_PROGRAM([
-					#include <CoreFoundation/CoreFoundation.h>
-				], [
-					CFNotificationCenterRef ref = CFNotificationCenterGetDarwinNotifyCenter();
-			])
-			], [
-				mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter="yes"
-			], [
-				mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter="no"
-			]
-		)
-
-		LIBS="$ac_save_LIBS"
-	])
-
-	AC_MSG_RESULT(${mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter})
-
-	if test x"${mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter}" = "xyes"; then
-		AC_DEFINE([HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER], [], [Define if function CFNotificationCenterGetDarwinNotifyCenter in CoreFoundation framework])
-	fi
-
-	AC_SUBST(HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER)
-])
-
-
-#------------------------------------------------------------------------
-# MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION --
-#
-#	Check if SystemConfiguration framework is available, define HAVE_FRAMEWORK_SYSTEMCONFIGURATION if so.
-#
-# Arguments:
-#       None.
-#
-# Requires:
-#       None.
-#
-# Depends:
-#		AC_LANG_PROGRAM
-#
-# Results:
-#       Result is cached.
-#
-#	If SystemConfiguration framework is available, defines the following variables:
-#		HAVE_FRAMEWORK_SYSTEMCONFIGURATION
-#
-#------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION, [
-	FRAMEWORK_LIBS="-framework SystemConfiguration"
-
-	AC_MSG_CHECKING([for SystemConfiguration framework])
-
-	AC_CACHE_VAL(mp_cv_have_framework_systemconfiguration, [
-		ac_save_LIBS="$LIBS"
-		LIBS="$FRAMEWORK_LIBS $LIBS"
-		
-		AC_LINK_IFELSE([
-			AC_LANG_PROGRAM([
-					#include <SystemConfiguration/SystemConfiguration.h>
-				], [
-					int err = SCError();
-					SCDynamicStoreRef dsRef = SCDynamicStoreCreate(NULL, NULL, NULL, NULL);
-			])
-			], [
-				mp_cv_have_framework_systemconfiguration="yes"
-			], [
-				mp_cv_have_framework_systemconfiguration="no"
-			]
-		)
-
-		LIBS="$ac_save_LIBS"
-	])
-
-	AC_MSG_RESULT(${mp_cv_have_framework_systemconfiguration})
-
-	if test x"${mp_cv_have_framework_systemconfiguration}" = "xyes"; then
-		AC_DEFINE([HAVE_FRAMEWORK_SYSTEMCONFIGURATION], [], [Define if SystemConfiguration framework is available])
-	fi
-
-	AC_SUBST(HAVE_FRAMEWORK_SYSTEMCONFIGURATION)
-])
-
-
-#------------------------------------------------------------------------
-# MP_CHECK_FRAMEWORK_IOKIT --
-#
-#	Check if IOKit framework is available, define HAVE_FRAMEWORK_IOKIT if so.
-#
-# Arguments:
-#       None.
-#
-# Requires:
-#       None.
-#
-# Depends:
-#		AC_LANG_PROGRAM
-#
-# Results:
-#       Result is cached.
-#
-#	If IOKit framework is available, defines the following variables:
-#		HAVE_FRAMEWORK_IOKIT
-#
-#------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FRAMEWORK_IOKIT, [
-	FRAMEWORK_LIBS="-framework IOKit"
-
-	AC_MSG_CHECKING([for IOKit framework])
-
-	AC_CACHE_VAL(mp_cv_have_framework_iokit, [
-		ac_save_LIBS="$LIBS"
-		LIBS="$FRAMEWORK_LIBS $LIBS"
-		
-		AC_LINK_IFELSE([
-			AC_LANG_PROGRAM([
-					#include <IOKit/IOKitLib.h>
-				], [
-					IOCreateReceivePort(0, NULL);
-					IORegisterForSystemPower(0, NULL, NULL, NULL);
-			])
-			], [
-				mp_cv_have_framework_iokit="yes"
-			], [
-				mp_cv_have_framework_iokit="no"
-			]
-		)
-
-		LIBS="$ac_save_LIBS"
-	])
-
-	AC_MSG_RESULT(${mp_cv_have_framework_iokit})
-
-	if test x"${mp_cv_have_framework_iokit}" = "xyes"; then
-		AC_DEFINE([HAVE_FRAMEWORK_IOKIT], [], [Define if IOKit framework is available])
-	fi
-
-	AC_SUBST(HAVE_FRAMEWORK_IOKIT)
-])
-
-
-dnl This macro checks if the user specified a ports tree
-dnl explicitly. If not, search for it
-
-# MP_PATH_PORTSDIR(DEFAULT_PORTSDIR)
-#---------------------------------------
- AC_DEFUN([MP_PATH_PORTSDIR],[
- 	dnl For ease of reading, run after gcc has been found/configured
- 	AC_REQUIRE([AC_PROG_CC])
-
- 	AC_ARG_WITH(ports-dir, [AS_HELP_STRING([--with-ports-dir=DIR],[Specify alternate ports directory])], [ portsdir="$withval" ] )
-
-
- 	AC_MSG_CHECKING([for ports tree])
- 	if test "x$portsdir" != "x" ; then
- 	  if test -d "$portsdir" -a -e "$portsdir/PortIndex" ; then
- 		:
- 	  else
- 		AC_MSG_ERROR([$portsdir not a valid ports tree])
- 	  fi
- 	else
- 		dnl If the user didn't give a path, look for default
- 		if test "x$1" != "x" ; then
- 		  if test -d "$1" -a -e "$1/PortIndex" ; then
- 			portsdir=$1
- 		  fi
- 		fi
- 	fi
-
- 	if test "x$portsdir" != "x" ; then
- 		AC_MSG_RESULT($portsdir)
- 		PORTSDIR="$portsdir"
- 		AC_SUBST(PORTSDIR)
- 	else
- 		AC_MSG_WARN([No ports tree found])
- 	fi
-
-         ])
-
-
-# MP_PATH_MPCONFIGDIR
-#---------------------------------------
-AC_DEFUN([MP_PATH_MPCONFIGDIR],[
-	dnl if the user actually specified --prefix, shift
-	dnl mpconfigdir to $prefix/etc/macports
-	dnl 	AC_REQUIRE([MP_PATH_PORTSDIR])
-	
-        AC_MSG_CHECKING([for MacPorts config directory])
-
-	mpconfigdir='${sysconfdir}/macports'
-
-	AC_MSG_RESULT([$mpconfigdir])
-	MPCONFIGDIR="$mpconfigdir"
-        AC_SUBST(MPCONFIGDIR)
-
-	])
-
-# MP_CHECK_OLDLAYOUT
-#---------------------------------------
-AC_DEFUN([MP_CHECK_OLDLAYOUT],[
-	dnl Bail if there is an existing install of DP/MP older than 1.5
-
-	AC_MSG_CHECKING([that any existing MacPorts install can be upgraded])
-
-	eval dpversionfile="${sysconfdir}/ports/dp_version"
-	if test -f $dpversionfile; then
-		AC_MSG_ERROR([Existing MacPorts or DarwinPorts install is too old to be upgraded. Install MacPorts 1.7.1 first.])
-	else
-		AC_MSG_RESULT([yes])
-	fi
-
-	])
-
-# MP_CHECK_NOROOTPRIVILEGES
-#-------------------------------------------------
-AC_DEFUN([MP_CHECK_NOROOTPRIVILEGES],[
-	dnl if with user specifies --with-no-root-privileges,
-	dnl use current user and group.
-	dnl use ~/Library/Tcl as Tcl package directory
-		AC_REQUIRE([MP_PATH_MPCONFIGDIR])
-
-	AC_ARG_WITH(no-root-privileges, [AS_HELP_STRING([--with-no-root-privileges],[Specify that MacPorts should be installed in your home directory])], [ROOTPRIVS=$withval] )
-
-	if test "${ROOTPRIVS+set}" = set; then
-
-		# Set install-user to current user
-		AC_MSG_CHECKING([for install user])
-		DSTUSR=`id -un`
-		AC_MSG_RESULT([$DSTUSR])
-		AC_SUBST(DSTUSR)
-		
-		# Set install-group to current user
-		AC_MSG_CHECKING([for install group])
-		DSTGRP=`id -gn`
-		AC_MSG_RESULT([$DSTGRP])
-		AC_SUBST(DSTGRP)
-
-		# Set run-user to current user
-		AC_MSG_CHECKING([for macports user])
-		RUNUSR=`id -un`
-		AC_MSG_RESULT([$RUNUSR])
-		AC_SUBST(RUNUSR)
-
-		# Set Tcl package directory to ~/Library/Tcl
-	    AC_MSG_CHECKING(for Tcl package directory)
-		ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
-	    # Convert to a native path and substitute into the output files.
-	    PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
-	    TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE}
-	    AC_SUBST(TCL_PACKAGE_DIR)
-		if test x"${ac_cv_c_tclpkgd}" = x ; then
-			AC_MSG_ERROR(Tcl package directory not found.  Please specify its location with --with-tclpackage)
-	    else
-			AC_MSG_RESULT(${ac_cv_c_tclpkgd})
-	    fi
-	fi
-
-])
-
-# MP_CHECK_RUNUSER
-#-------------------------------------------------
-AC_DEFUN([MP_CHECK_RUNUSER],[
-	dnl if with user specifies --with-macports-user,
-	dnl use it. otherwise default to platform defaults
-       AC_REQUIRE([MP_PATH_MPCONFIGDIR])
-
-	AC_ARG_WITH(macports-user, [AS_HELP_STRING([--with-macports-user=USER],[Specify user to drop privileges to, if possible, during compiles etc.])], [ RUNUSR=$withval ] )
-	
-	AC_MSG_CHECKING([for macports user])
-	if test "x$RUNUSR" = "x" ; then
-	   RUNUSR=macports
-	fi
-
-	AC_MSG_RESULT([$RUNUSR])
-	AC_SUBST(RUNUSR)
-])
-
-
-# MP_SHARED_DIRECTORY
-#-------------------------------------------------
-AC_DEFUN([MP_SHARED_DIRECTORY],[
-	dnl if with user specifies --with-shared-directory,
-	dnl use 0775 permissions for ${prefix} directories
-        AC_REQUIRE([MP_PATH_MPCONFIGDIR])
-
-	AC_ARG_WITH(shared-directory, [AS_HELP_STRING([--with-shared-directory],[Use 0775 permissions for installed directories])], [ SHAREDIR=$withval ] )
-
-	if test "${SHAREDIR+set}" = set; then	
-		AC_MSG_CHECKING([whether to share the install directory with all members of the install group])
-	    DSTMODE=0775
-
-		AC_MSG_RESULT([$DSTMODE])
-		AC_SUBST(DSTMODE)
-	fi
-])
-
-# MP_CHECK_INSTALLUSER
-#-------------------------------------------------
-AC_DEFUN([MP_CHECK_INSTALLUSER],[
-	dnl if with user specifies --with-install-user,
-	dnl use it. otherwise default to platform defaults
-        AC_REQUIRE([MP_PATH_MPCONFIGDIR])
-
-	AC_ARG_WITH(install-user, [AS_HELP_STRING([--with-install-user=USER],[Specify user ownership of installed files])], [ DSTUSR=$withval ] )
-	
-	AC_MSG_CHECKING([for install user])
-	if test "x$DSTUSR" = "x" ; then
-	   DSTUSR=root
-	fi
-
-	AC_MSG_RESULT([$DSTUSR])
-	AC_SUBST(DSTUSR)
-])
-
-# MP_CHECK_INSTALLGROUP
-#-------------------------------------------------
-AC_DEFUN([MP_CHECK_INSTALLGROUP],[
-	dnl if with user specifies --with-install-group,
-	dnl use it. otherwise default to platform defaults
-        AC_REQUIRE([MP_CHECK_INSTALLUSER])
-
-	AC_ARG_WITH(install-group, [AS_HELP_STRING([--with-install-group=GROUP],[Specify group ownership of installed files])], [ DSTGRP=$withval ] )
-
-	AC_MSG_CHECKING([for install group])
-	if test "x$DSTGRP" = "x" ; then
-	   
-	   case $host_os in
-	   darwin*)
-		DSTGRP="admin"
-		;;
-	   freebsd*)
-		DSTGRP="wheel"
-		;;
-	   linux*)
-		DSTGRP="root"
-		;;
-	   *)
-		DSTGRP="wheel"
-		;;
-	   esac
-	fi
-
-	AC_MSG_RESULT([$DSTGRP])
-	AC_SUBST(DSTGRP)
-])
-
-# MP_DIRECTORY_MODE
-#-------------------------------------------------
-AC_DEFUN([MP_DIRECTORY_MODE],[
-	dnl if with user specifies --with-directory-mode,
-	dnl use the specified permissions for ${prefix} directories
-	dnl otherwise use 0755
-        AC_REQUIRE([MP_PATH_MPCONFIGDIR])
-
-	AC_ARG_WITH(directory-mode, [AS_HELP_STRING([--with-directory-mode=MODE],[Specify directory mode of installed directories])], [ DSTMODE=$withval ] )
-	
-	AC_MSG_CHECKING([what permissions to use for installation directories])
-	if test "x$DSTMODE" = "x" ; then
-	   DSTMODE=0755
-	fi
-
-	AC_MSG_RESULT([$DSTMODE])
-	AC_SUBST(DSTMODE)
-])
-
-# MP_PATH_APPLICATIONS
-#---------------------------------------
-AC_DEFUN([MP_PATH_APPLICATIONS],[
-        AC_REQUIRE([MP_CHECK_INSTALLUSER])
-
-    AC_ARG_WITH(applications-dir,[AS_HELP_STRING([--with-applications-dir],[Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
-
-    oldprefix=$prefix
-    if test "x$prefix" = "xNONE" ; then
-	prefix=$ac_default_prefix
-    fi
-    AC_MSG_CHECKING([for Applications installation directory])
-
-	if test "x$MPAPPLICATIONSDIR" = "x" ; then
-	    if test "$DSTUSR" = "root" ; then
-		MPAPPLICATIONSDIR="/Applications/MacPorts"
-	    else
-		MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
-	    fi
-	fi
-
-	AC_MSG_RESULT([$MPAPPLICATIONSDIR])
-    AC_SUBST(MPAPPLICATIONSDIR)
-    prefix=$oldprefix
-])
-
-# MP_PATH_FRAMEWORKS
-#---------------------------------------
-AC_DEFUN([MP_PATH_FRAMEWORKS],[
-        AC_REQUIRE([MP_CHECK_INSTALLUSER])
-
-    AC_ARG_WITH(frameworks-dir,[AS_HELP_STRING([--with-frameworks-dir],[Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
-
-    oldprefix=$prefix
-    if test "x$prefix" = "xNONE" ; then
-	prefix=$ac_default_prefix
-    fi
-    AC_MSG_CHECKING([for Frameworks installation directory])
-
-	if test "x$MPFRAMEWORKSDIR" = "x" ; then
-		MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
-	fi
-
-	AC_MSG_RESULT([$MPFRAMEWORKSDIR])
-    AC_SUBST(MPFRAMEWORKSDIR)
-    prefix=$oldprefix
-])
-
-
-# MP_UNIVERSAL_OPTIONS
-#---------------------------------------
-AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
-  AC_ARG_WITH(universal-archs,[AS_HELP_STRING([--with-universal-archs="CPU"],[Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
-
-  if test "x$UNIVERSAL_ARCHS" = "x"; then
-    case "$MACOSX_VERSION" in
-      10.[[0-5]]*)
-        UNIVERSAL_ARCHS="i386 ppc"
-        ;;
-      *)
-        UNIVERSAL_ARCHS="x86_64 i386"
-        ;;
-    esac
-  fi
-
-  AC_MSG_CHECKING([for Universal CPU architectures])
-  AC_MSG_RESULT([$UNIVERSAL_ARCHS])
-  AC_SUBST(UNIVERSAL_ARCHS)
-])
-
-# MP_LIB_MD5
-#---------------------------------------
-# Check for an md5 implementation
-AC_DEFUN([MP_LIB_MD5],[
-
-	# Check for libmd from FreeBSD, which is preferred
-	AC_CHECK_LIB([md], [MD5File],[
-		AC_CHECK_HEADERS([md5.h sha.h], ,[
-			AC_MSG_ERROR([libmd was found, but md5.h or sha.h is missing.])
-		])
-		ac_save_LIBS="$LIBS"
-		LIBS="-lmd $LIBS"
-		AC_CHECK_FUNCS([SHA1_File])
-		LIBS="$ac_save_LIBS"
-		AC_CHECK_HEADERS([ripemd.h sha256.h])
-		AC_DEFINE([HAVE_LIBMD], ,[Define if you have the `md' library (-lmd).])
-		MD5_LIBS="-lmd"]
-	)
-	if test "x$MD5_LIBS" = "x"; then
-		# If libmd is not found, check for libcrypto from OpenSSL
-		AC_CHECK_LIB([crypto], [MD5_Update],[
-			AC_CHECK_HEADERS([openssl/md5.h openssl/sha.h], ,[
-				AC_MSG_ERROR([libcrypto was found, but openssl/md5.h or openssl/sha.h is missing.])
-			])
-			AC_CHECK_HEADERS([openssl/ripemd.h])
-			ac_save_LIBS="$LIBS"
-			LIBS="-lcrypto $LIBS"
-			AC_CHECK_FUNCS([SHA256_Update])
-			LIBS="$ac_save_LIBS"
-			AC_DEFINE([HAVE_LIBCRYPTO], ,[Define if you have the `crypto' library (-lcrypto).])
-			MD5_LIBS="-lcrypto"]
-		)
-	fi
-	if test "x$MD5_LIBS" = "x"; then
-		AC_MSG_ERROR([Neither CommonCrypto, libmd nor libcrypto were found. A working md5 implementation is required.])
-	fi
-	AC_SUBST([MD5_LIBS])
-])
-
-# MP_PROG_DAEMONDO
-#---------------------------------------
-AC_DEFUN([MP_PROG_DAEMONDO],[
-	AC_REQUIRE([MP_CHECK_FRAMEWORK_COREFOUNDATION])
-	AC_REQUIRE([MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION])
-	AC_REQUIRE([MP_CHECK_FRAMEWORK_IOKIT])
-	AC_REQUIRE([MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER])
-	
-    AC_MSG_CHECKING(for whether we will build daemondo)
-    result=no
-	case $host_os in
-	darwin*)
-		if test "x$mp_cv_have_framework_corefoundation" == "xyes" &&
-		   test "x$mp_cv_have_framework_systemconfiguration" == "xyes" &&
-		   test "x$mp_cv_have_framework_iokit" == "xyes" &&
-		   test "x$mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter" == "xyes"; then
-			result=yes
-			EXTRA_PROGS="$EXTRA_PROGS daemondo"
-			AC_CONFIG_FILES([src/programs/daemondo/Makefile])
-		fi
-		;;
-	*)
-	esac
-	AC_MSG_RESULT(${result})
-])
-
-#------------------------------------------------------------------------
-# MP_TCL_PACKAGE_DIR --
-#
-#	Locate the correct directory for Tcl package installation
-#
-# Arguments:
-#	None.
-#
-# Requires:
-#	TCLVERSION must be set
-#	CYGPATH must be set
-#	TCLSH must be set
-#
-# Results:
-#
-#	Adds a --with-tclpackage switch to configure.
-#	Result is cached.
-#
-#	Substs the following vars:
-#		TCL_PACKAGE_DIR
-#------------------------------------------------------------------------
-
-AC_DEFUN(MP_TCL_PACKAGE_DIR, [
-	AC_REQUIRE([MP_CHECK_INSTALLUSER])
-
-    AC_MSG_CHECKING(for Tcl package directory)
-
-    AC_ARG_WITH(tclpackage, [  --with-tclpackage       Tcl package installation directory.], with_tclpackagedir=${withval})
-
-    if test x"${with_tclpackagedir}" != x ; then
-	ac_cv_c_tclpkgd=${with_tclpackagedir}
-    else
-	AC_CACHE_VAL(ac_cv_c_tclpkgd, [
-	    # Use the value from --with-tclpackage, if it was given
-
-	    if test x"${with_tclpackagedir}" != x ; then
-		echo "tclpackagedir"
-		ac_cv_c_tclpkgd=${with_tclpackagedir}
-	    else
-		# On darwin we can do some intelligent guessing
-		case $host_os in
-		    darwin*)
-		    	tcl_autopath=`echo 'puts -nonewline \$auto_path' | $TCLSH`
-			for path in $tcl_autopath; do
-			if test "$DSTUSR" = "root" ; then
-			    if test "$path" = "/Library/Tcl"; then
-				ac_cv_c_tclpkgd="$path"
-				break
-			    fi
-			    if test "$path" = "/System/Library/Tcl"; then
-				if test -d "$path"; then
-				    ac_cv_c_tclpkgd="$path"
-				    break
-			        fi
-			    fi
-			elif test "$path" = "~/Library/Tcl"; then
-			    ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
-			    break
-			fi
-			done
-		    ;;
-		esac
-    		if test x"${ac_cv_c_tclpkgd}" = x ; then
-		    # Fudge a path from the first entry in the auto_path
-		    tcl_pkgpath=`echo 'puts -nonewline [[lindex \$auto_path 0]]' | $TCLSH`
-		    if test -d "$tcl_pkgpath"; then
-			ac_cv_c_tclpkgd="$tcl_pkgpath"
-		    fi
-		    # If the first entry does not exist, do nothing
-		fi
-	    fi
-	])
-    fi
-
-    if test x"${ac_cv_c_tclpkgd}" = x ; then
-	AC_MSG_ERROR(Tcl package directory not found.  Please specify its location with --with-tclpackage)
-    else
-	AC_MSG_RESULT(${ac_cv_c_tclpkgd})
-    fi
-
-    # Convert to a native path and substitute into the output files.
-
-    PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
-
-    TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE}
-
-    AC_SUBST(TCL_PACKAGE_DIR)
-])
-
-# MP_PROG_TCLSH
-#---------------------------------------
-AC_DEFUN([MP_PROG_TCLSH],[
-
-
-	case $host_os in
-		freebsd*)
-			# FreeBSD installs a dummy tclsh (annoying)
-			# Look for a real versioned tclsh with threads first
-			# Look for a real versioned tclsh without threads second
-			AC_PATH_PROG([TCLSH], [tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh])
-			;;
-		*)
-			# Otherwise, look for a non-versioned tclsh
-			AC_PATH_PROG([TCLSH], [tclsh tclsh${TCL_VERSION}])
-			;;
-	esac
-	if test "x$TCLSH" = "x" ; then
-		AC_MSG_ERROR([Could not find tclsh])
-	fi
-
-	AC_SUBST(TCLSH)
-])
-
-# MP_TCL_PACKAGE
-#	Determine if a Tcl package is present.
-#
-# Arguments:
-#	Package name (may include the version)
-#
-# Syntax:
-#   MP_TCL_PACKAGE (package, [action-if-found], [action-if-not-found])
-#
-# Requires:
-#	TCLSH must be set
-#
-# Results:
-#	Execute action-if-found or action-if-not-found
-#---------------------------------------
-AC_DEFUN([MP_TCL_PACKAGE],[
-	AC_MSG_CHECKING([for Tcl $1 package])
-	package_present=`echo 'if {[[catch {package require $1}]]} {puts -nonewline 0} else {puts -nonewline 1}' | $TCLSH`
-	AS_IF([test "$package_present" = "1"], [$2], [$3])[]
-])
-
-# MP_TCL_THREAD_SUPPORT
-#	Determine if thread support is available in tclsh.
-#
-# Arguments:
-#	None.
-#
-# Requires:
-#	TCLSH must be set
-#
-# Results:
-#   Fails if thread support isn't available.
-#---------------------------------------
-AC_DEFUN([MP_TCL_THREAD_SUPPORT],[
-	AC_MSG_CHECKING([whether tclsh was compiled with threads])
-	tcl_threadenabled=`echo 'puts -nonewline [[info exists tcl_platform(threaded)]]' | $TCLSH`
-	if test "$tcl_threadenabled" = "1" ; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([tcl wasn't compiled with threads enabled])
-	fi
-])
-
-# MP_LIBCURL_FLAGS
-#	Sets the flags to compile with libcurl.
-#
-# Arguments:
-#	None.
-#
-# Requires:
-#   curl-config or user parameters to define the flags.
-#
-# Results:
-#   defines some help strings.
-#   sets CFLAGS_LIBCURL and LDFLAGS_LIBCURL
-#---------------------------------------
-AC_DEFUN([MP_LIBCURL_FLAGS],[
-	AC_ARG_WITH(curlprefix,
-		   [  --with-curlprefix       base directory for the cURL install '/usr', '/usr/local',...],
-		   [  curlprefix=$withval ])
-
-	if test "x$curlprefix" = "x"; then
-		AC_PATH_PROG([CURL_CONFIG], [curl-config])
-	else
-		AC_PATH_PROG([CURL_CONFIG], [curl-config], , [$curlprefix/bin])
-	fi
-
-	if test "x$CURL_CONFIG" = "x"; then
-		AC_MSG_ERROR([cannot find curl-config. Is libcurl installed?])
-	fi
-
-	CFLAGS_LIBCURL=$($CURL_CONFIG --cflags)
-	if test "x$curlprefix" = "x"; then
-		# System curl-config emits absurd output for --libs
-		# See rdar://7244457
-		LDFLAGS_LIBCURL="-lcurl"
-	else
-		# Due to a bug in dist, --arch flags are improperly supplied by curl-config.
-		# Get rid of them.
-		LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | [sed 's/-arch [A-Za-z0-9_]* //g'])
-	fi
-
-	AC_SUBST(CFLAGS_LIBCURL)
-	AC_SUBST(LDFLAGS_LIBCURL)
-])
-
-# MP_SQLITE3_FLAGS
-#	Sets the flags to compile with libsqlite3 and tclsqlite3.
-#
-# Arguments:
-#	None.
-#
-# Requires:
-#   pkgconfig, libsqlite3 in /usr/lib, or user parameters to define the flags.
-#
-# Results:
-#   defines some help strings.
-#   sets CFLAGS_SQLITE3 and LDFLAGS_SQLITE3
-#---------------------------------------
-AC_DEFUN([MP_SQLITE3_FLAGS],[
-    # first sqlite3 itself
-	AC_ARG_WITH(sqlite3prefix,
-		   [  --with-sqlite3prefix       base directory for the sqlite3 install '/usr', '/usr/local',...],
-		   [  sqlite3prefix=$withval ])
-
-	if test "x$sqlite3prefix" = "x"; then
-		# see if it's somewhere like /usr that needs no extra flags
-		LDFLAGS_SQLITE3="-lsqlite3"
-		AC_CHECK_HEADER(sqlite3.h, [],[
-		    # nope - try pkg-config
-			AC_PATH_PROG([PKG_CONFIG], [pkg-config])
-			if test "x$PKG_CONFIG" = "x" || ! $PKG_CONFIG --exists sqlite3; then
-				AC_MSG_ERROR([cannot find sqlite3 header])
-			else
-				CFLAGS_SQLITE3=$($PKG_CONFIG --cflags sqlite3)
-				LDFLAGS_SQLITE3=$($PKG_CONFIG --libs sqlite3)
-				# for tclsqlite below
-				mp_sqlite3_dir=$($PKG_CONFIG --variable=prefix sqlite3)
-            			if test "x$mp_sqlite3_dir" != "x"; then
-                			mp_sqlite3_dir=${mp_sqlite3_dir}/lib/sqlite3
-            			fi
-			fi
-		])
-	else
-	    CFLAGS_SQLITE3="-I${sqlite3prefix}/include"
-		LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib -lsqlite3"
-	fi
-
-    # check if we have sqlite3ext.h, using the appropriate cppflags
-    CPPFLAGS_OLD="${CPPFLAGS}"
-    CPPFLAGS="${CPPFLAGS} ${CFLAGS_SQLITE3}"
-    AC_CHECK_HEADERS(sqlite3ext.h)
-    CPPFLAGS="${CPPFLAGS_OLD}"
-
-	AC_SUBST(CFLAGS_SQLITE3)
-	AC_SUBST(LDFLAGS_SQLITE3)
-
-	# now the sqlite Tcl bindings
-	AC_ARG_WITH(tcl-sqlite3,
-		AS_HELP_STRING([--with-tcl-sqlite3=DIR],
-			[directory for Tcl sqlite3 (default /usr/lib/sqlite3)]),
-		[mp_sqlite3_dir=$withval])
-
-    if test "x$mp_sqlite3_dir" = "x"; then
-        case $host_os in
-            darwin*)
-                mp_sqlite3_dir="/usr/lib/sqlite3"
-                ;;
-            freebsd*)
-                mp_sqlite3_dir="/usr/local/lib/sqlite"
-                ;;
-            *)
-                mp_sqlite3_dir="/usr/share/tcl${TCL_VERSION}/sqlite3"
-                ;;
-        esac
-    fi
-
-	AC_CACHE_CHECK([for Tcl sqlite3 location], [mp_cv_sqlite3_dir],
-		[mp_cv_sqlite3_dir=
-		test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
-		])
-
-	SQLITE3_TCL_DIR=$mp_cv_sqlite3_dir
-	AC_SUBST(SQLITE3_TCL_DIR)
-])
-
-dnl This macro tests if the compiler supports GCC's
-dnl __attribute__ syntax for unused variables/parameters
-AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
-	AC_MSG_CHECKING([how to mark unused variables])
-	AC_COMPILE_IFELSE(
-		[AC_LANG_SOURCE([[int a __attribute__ ((unused));]])],
-		[AC_DEFINE(UNUSED, [__attribute__((unused))], [Attribute to mark unused variables])],
-		[AC_DEFINE(UNUSED, [])])
-
-	AC_MSG_RESULT([])
-	
-])
-
-dnl This macro ensures MP installation prefix bin/sbin paths are NOT in PATH
-dnl for configure to prevent potential problems when base/ code is updated
-dnl and ports are installed that would match needed items.
-AC_DEFUN([MP_PATH_SCAN],[
-	oldprefix=$prefix
-	if test "x$prefix" = "xNONE" ; then
-		prefix=$ac_default_prefix
-	fi
-	oldPATH=$PATH
-	newPATH=
-	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-	for as_dir in $oldPATH
-	do
-		IFS=$as_save_IFS
-		if test "x$as_dir" != "x$prefix/bin" &&
-			test "x$as_dir" != "x$prefix/sbin"; then
-			if test -z "$newPATH"; then
-				newPATH=$as_dir
-			else
-				newPATH=$newPATH$PATH_SEPARATOR$as_dir
-			fi
-		fi
-	done
-	PATH=$newPATH; export PATH
-	AC_SUBST(PATH_CLEANED,$newPATH)
-	prefix=$oldprefix
-])
-
-dnl This macro tests for sed support of -E (BSD) or -r (GNU)
-AC_DEFUN([MP_SED_EXTENDED_REGEXP],[
-	AC_PATH_PROG(SED, [sed])
-
-	if test "x$SED" = "x"; then
-		AC_MSG_ERROR([cannot find sed. Is sed installed?])
-	fi
-
-	AC_MSG_CHECKING([which sed flag to use for extended regexp])
-	[any_sed_flag=`echo foo | $SED    -e s/foo+/OK/ 2>&1 | grep OK`]
-	[bsd_sed_flag=`echo foo | $SED -E -e s/foo+/OK/ 2>&1 | grep OK`]
-	[gnu_sed_flag=`echo foo | $SED -r -e s/foo+/OK/ 2>&1 | grep OK`]
-	if test "x$any_sed_flag" = "xOK" ; then
-		AC_MSG_RESULT([none])
-		SED_EXT=
-	elif test "x$bsd_sed_flag" = "xOK" ; then
-		AC_MSG_RESULT([-E (BSD)])
-		SED_EXT=-E
-	elif test "x$gnu_sed_flag" = "xOK" ; then
-		AC_MSG_RESULT([-r (GNU)])
-		SED_EXT=-r
-	else
-		AC_MSG_RESULT([not available])
-		SED_EXT='N/A'
-	fi
-	AC_SUBST(SED_EXT)
-])
-
-dnl This macro tests for tar support of -q (BSD) or not (GNU)
-AC_DEFUN([MP_TAR_FAST_READ],[
-	AC_PATH_PROG(TAR, [tar])
-	
-	AC_MSG_CHECKING([whether tar supports -q])
-	if $TAR -t -q -f - </dev/null 2>/dev/null ; then
-		AC_MSG_RESULT([yes (bsdtar)])
-		TAR_Q='q'
-	else
-		AC_MSG_RESULT([no (gnutar)])
-		TAR_Q=
-	fi
-	AC_SUBST(TAR_Q)
-])
-
-dnl This macro tests for tar support of --no-same-owner
-AC_DEFUN([MP_TAR_NO_SAME_OWNER],[
-	AC_PATH_PROG(TAR, [tar])
-	AC_PATH_PROG(GNUTAR, [gnutar])
-	
-	AC_MSG_CHECKING([for which tar variant to use])
-	AS_IF([test -n "$GNUTAR"], [TAR_CMD=$GNUTAR], [TAR_CMD=$TAR])
-	AC_MSG_RESULT([$TAR_CMD])
-	AC_SUBST(TAR_CMD)
-
-	AC_MSG_CHECKING([for $TAR_CMD --no-same-owner support])
-	[no_same_owner_support=`$TAR_CMD --help 2>&1 | grep no-same-owner`]
-	if test -z "$no_same_owner_support" ; then
-		AC_MSG_RESULT([no])
-	else
-		AC_MSG_RESULT([yes])
-		TAR_CMD="$TAR_CMD --no-same-owner"
-	fi
-])
-
-dnl This macro tests for GNU patch
-AC_DEFUN([MP_PATCH_GNU_VERSION],[
-	AC_PATH_PROG(PATCH, [patch])
-	AC_PATH_PROG(GNUPATCH, [gpatch])
-	
-	AC_MSG_CHECKING([for GNU (FSF) patch])
-	AS_IF([test -n "$GNUPATCH"], [PATCH_CMD=$GNUPATCH], [PATCH_CMD=$PATCH])
-	[fsf_version=`$PATCH_CMD --version 2>&1 | grep "Free Software Foundation"`]
-	if test -z "$fsf_version" ; then
-		AC_MSG_RESULT([none])
-	else
-		AC_MSG_RESULT([$PATCH_CMD])
-		GNUPATCH="$PATCH_CMD"
-	fi
-])
-
-#------------------------------------------------------------------------
-# MP_CHECK_READLINK_IS_P1003_1A --
-#
-#	Check if readlink conforms to POSIX 1003.1a standard, define
-#	READLINK_IS_NOT_P1003_1A if it doesn't.
-#
-# Arguments:
-#       None.
-#
-# Requires:
-#       None.
-#
-# Depends:
-#		AC_LANG_PROGRAM
-#
-# Results:
-#       Result is cached.
-#
-#	If readlink doesn't conform to POSIX 1003.1a, defines the following variables:
-#		READLINK_IS_NOT_P1003_1A
-#
-#------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_READLINK_IS_P1003_1A, [
-	AC_MSG_CHECKING([if readlink conforms to POSIX 1003.1a])
-
-	AC_CACHE_VAL(mp_cv_readlink_is_posix_1003_1a, [
-		AC_COMPILE_IFELSE([
-			AC_LANG_PROGRAM([
-					#include <unistd.h>
-					ssize_t readlink(const char *, char *, size_t);
-				], [
-			])
-			], [
-				mp_cv_readlink_is_posix_1003_1a="yes"
-			], [
-				mp_cv_readlink_is_posix_1003_1a="no"
-			]
-		)
-	])
-
-	AC_MSG_RESULT(${mp_cv_readlink_is_posix_1003_1a})
-
-	if test x"${mp_cv_readlink_is_posix_1003_1a}" = "xno"; then
-		AC_DEFINE([READLINK_IS_NOT_P1003_1A], [], [Define to 1 if readlink does not conform with POSIX 1003.1a (where third argument is a size_t and return value is a ssize_t)])
-	fi
-
-	AC_SUBST(READLINK_IS_NOT_P1003_1A)
-])
-
-#------------------------------------------------------------------------
-# MP_WERROR --
-#
-#       Enable -Werror
-#
-# Arguments:
-#       None.
-#
-# Requires:
-#       none
-#
-# Depends:
-#       none
-#
-# Results:
-#       Substitutes WERROR_CFLAGS variable
-#------------------------------------------------------------------------
-AC_DEFUN([MP_WERROR],[
-	AC_REQUIRE([AC_PROG_CC])
-	AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[Add -Werror to CFLAGS. Used for development.]), [enable_werror=${enableval}], [enable_werror=no])
-	if test x"$enable_werror" != "xno"; then
-		CFLAGS_WERROR="-Werror"
-	else
-		CFLAGS_WERROR=""
-	fi
-	AC_SUBST([CFLAGS_WERROR])
-])
-
-#------------------------------------------------------------------------
-# MP_CHECK_SQLITE_VERSION --
-#
-#	Check for a specific SQLite version and execute commands depending on availability
-#
-# Arguments:
-#       Required SQLite version for the test to succeed in the form of SQLITE_VERSION_NUMBER
-#
-# Requires:
-#       MP_SQLITE3_FLAGS
-#
-# Depends:
-#		AC_LANG_SOURCE
-#
-# Results:
-#		Result is cached.
-#
-#       sets mp_sqlite_version_ge_$1 to yes or no
-#
-#------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_SQLITE_VERSION, [
-	AC_REQUIRE([MP_SQLITE3_FLAGS])
-
-	AC_MSG_CHECKING([for SQLite >= $1])
-
-	mp_check_sqlite_version_cppflags_save=$CPPFLAGS
-	CPPFLAGS="$CPPFLAGS $CFLAGS_SQLITE3"
-
-	AC_CACHE_VAL(mp_cv_sqlite_version_defined, [
-		AC_PREPROC_IFELSE(
-			[AC_LANG_SOURCE(
-				[[
-					#include <sqlite3.h>
-					#ifndef SQLITE_VERSION_NUMBER
-					#  error "SQLITE_VERSION_NUMBER undefined"
-					#endif
-				]]
-			)],
-			[mp_cv_sqlite_version_defined="yes"],
-			[AC_MSG_ERROR("SQLITE_VERSION_NUMBER undefined or sqlite3.h not found")]
-		)
-	])
-
-	if test x"${mp_cv_sqlite_version_defined}" = "xno"; then
-		AC_MSG_RESULT([SQLite version not found])
-		mp_sqlite_version_ge_$1="no"
-	else
-		AC_CACHE_VAL(mp_cv_sqlite_version_ge_$1, [
-			AC_PREPROC_IFELSE(
-				[AC_LANG_SOURCE(
-					[[
-						#include <sqlite3.h>
-						#if (SQLITE_VERSION_NUMBER >= $1)
-						/* Everything is fine */
-						#else
-						#  error "SQLite version too old"
-						#endif
-					]]
-				)],
-				[mp_cv_sqlite_version_ge_$1="yes"],
-				[mp_cv_sqlite_version_ge_$1="no"]
-			)
-		])
-
-		AC_MSG_RESULT(${mp_cv_sqlite_version_ge_$1})
-		mp_sqlite_version_ge_$1=${mp_cv_sqlite_version_ge_$1}
-	fi
-
-	CPPFLAGS=$mp_check_sqlite_version_cppflags_save
-])
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_include([m4/acinclude.m4])
+m4_include([m4/foundation.m4])
+m4_include([m4/pthread.m4])
+m4_include([m4/tcl.m4])
Only in ./m4: acinclude.m4
diff -ur ../base/m4/tcl.m4 ./m4/tcl.m4
--- ../base/m4/tcl.m4	2012-09-21 16:23:12.000000000 -0400
+++ ./m4/tcl.m4	2013-03-29 16:18:40.000000000 -0400
@@ -64,7 +64,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.
@@ -164,7 +164,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.
@@ -259,7 +259,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
@@ -325,7 +325,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
@@ -362,9 +362,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])
 
@@ -402,9 +402,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 frameworks [--disable-framework]],
 	[tcl_ok=$enableval], [tcl_ok=no])
 
@@ -451,7 +451,7 @@
 #
 #------------------------------------------------------------------------
 
-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])
@@ -543,9 +543,9 @@
 #
 #------------------------------------------------------------------------
 
-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)'
@@ -600,8 +600,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])
@@ -647,17 +647,17 @@
 #				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" && MKLINKS_FLAGS="$MKLINKS_FLAGS --symlinks",
 		enableval="no")
 	AC_MSG_RESULT([$enableval])
 
 	AC_MSG_CHECKING([compression for manpages])
-	AC_ARG_ENABLE(man-compression,
+	AC_ARG_ENABLE([man-compression],
 		[  --enable-man-compression=PROG
                           compress the manpages with PROG],
 		test "$enableval" = "yes" && echo && AC_MSG_ERROR([missing argument to --enable-man-compression])
@@ -764,12 +764,12 @@
 #
 #--------------------------------------------------------------------
 
-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
@@ -1829,10 +1829,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 <termios.h>
 
@@ -1958,8 +1958,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 <sys/types.h>
 #include <dirent.h>], [
 #ifndef _POSIX_SOURCE
@@ -2038,12 +2038,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 <X11/XIntrinsic.h>], , not_really_there="yes")
+	    AC_TRY_CPP([#include <X11/XIntrinsic.h>], [], [not_really_there="yes"])
 	else
 	    if test ! -r $x_includes/X11/Intrinsic.h; then
 		not_really_there="yes"
@@ -2051,7 +2051,7 @@
 	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 <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
 	if test "$found_xincludes" = "no"; then
@@ -2123,9 +2123,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`
@@ -2188,12 +2188,12 @@
 #
 #--------------------------------------------------------------------
 
-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,
@@ -2265,11 +2265,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() {
@@ -2327,7 +2327,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.
@@ -2335,8 +2335,8 @@
     # 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
@@ -2403,7 +2403,7 @@
 #
 #--------------------------------------------------------------------
 
-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
@@ -2415,7 +2415,7 @@
 	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 <stdlib.h>],
@@ -2447,9 +2447,9 @@
 #
 #--------------------------------------------------------------------
 
-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;],
@@ -2520,10 +2520,10 @@
 #		TCL_INCLUDES
 #------------------------------------------------------------------------
 
-AC_DEFUN(SC_PUBLIC_TCL_HEADERS, [
-    AC_MSG_CHECKING(for Tcl public headers)
+AC_DEFUN([SC_PUBLIC_TCL_HEADERS], [
+    AC_MSG_CHECKING([for Tcl public headers])
 
-    AC_ARG_WITH(tclinclude, [  --with-tclinclude       directory containing the public Tcl header files.], with_tclinclude=${withval})
+    AC_ARG_WITH([tclinclude], [  --with-tclinclude       directory containing the public Tcl header files.], [with_tclinclude=${withval}])
 
     if test x"${with_tclinclude}" != x ; then
 	if test -f "${with_tclinclude}/tcl.h" ; then
Only in .: patch-base.diff
