<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117623] trunk/base/configure</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117623">117623</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-05 14:21:43 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>configure: re-generate after <a href="https://trac.macports.org/changeset/117621">r117621</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseconfigure">trunk/base/configure</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseconfigure"></a>
<div class="modfile"><h4>Modified: trunk/base/configure (117622 => 117623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure 2014-03-05 22:21:12 UTC (rev 117622)
+++ trunk/base/configure 2014-03-05 22:21:43 UTC (rev 117623)
</span><span class="lines">@@ -623,25 +623,38 @@
</span><span class="cx"> #endif"
</span><span class="cx">
</span><span class="cx"> ac_default_prefix=/opt/local
</span><del>-enable_option_checking=no
</del><span class="cx"> ac_subst_vars='LTLIBOBJS
</span><span class="cx"> LIBOBJS
</span><ins>+INCLUDES
+INTREE_TCLSH
+TCLSH
+TCL_PACKAGE_PATH
+TCL_PREFIX
+SHLIB_SUFFIX
+SHLIB_CFLAGS
+STLIB_LD
+SHLIB_LD
+TCL_STUB_LIB_SPEC
+TCL_STUB_LIB_FLAG
+TCL_STUB_LIB_FILE
+TCL_LIB_SPEC
+TCL_LIB_FLAG
+TCL_LIB_FILE
+TCL_SRC_DIR
+TCL_BIN_DIR
+TCL_VERSION
+VENDOR_TCLLIB_INSTALL
+VENDOR_TCLLIB_SUBDIR
+VENDOR_TCLTHREAD_INSTALL
+VENDOR_TCLTHREAD_SUBDIR
+VENDOR_DESTROOT
+VENDOR_TCL_INSTALL
+VENDOR_TCL_SUBDIR
</ins><span class="cx"> macports_tcl_dir
</span><span class="cx"> localstatedir_expanded
</span><span class="cx"> MPCONFIGDIR_EXPANDED
</span><span class="cx"> prefix_expanded
</span><del>-OUR_INCLUDED_PACKAGES
-TCL_CC
-TCL_DEFS
-SHLIB_SUFFIX
-SHLIB_LDFLAGS
-SHLIB_CFLAGS
-SHLIB_LD
-STLIB_LD
-INCLUDES
-subdirs
</del><span class="cx"> TRACEMODE_SUPPORT
</span><del>-SQLITE3_TCL_DIR
</del><span class="cx"> LDFLAGS_SQLITE3
</span><span class="cx"> CFLAGS_SQLITE3
</span><span class="cx"> PKG_CONFIG
</span><span class="lines">@@ -650,17 +663,6 @@
</span><span class="cx"> CURL_CONFIG
</span><span class="cx"> OS_MAJOR
</span><span class="cx"> OS_PLATFORM
</span><del>-TCLSH
-TCL_INCLUDES
-TCL_STUB_LIB_SPEC
-TCL_STUB_LIB_FLAG
-TCL_STUB_LIB_FILE
-TCL_LIB_SPEC
-TCL_LIB_FLAG
-TCL_LIB_FILE
-TCL_SRC_DIR
-TCL_BIN_DIR
-TCL_VERSION
</del><span class="cx"> READLINE_LIBS
</span><span class="cx"> MD5_LIBS
</span><span class="cx"> READLINK_IS_NOT_P1003_1A
</span><span class="lines">@@ -671,7 +673,6 @@
</span><span class="cx"> MPFRAMEWORKSDIR
</span><span class="cx"> MPAPPLICATIONSDIR
</span><span class="cx"> DSTMODE
</span><del>-TCL_PACKAGE_DIR
</del><span class="cx"> RUNUSR
</span><span class="cx"> DSTGRP
</span><span class="cx"> DSTUSR
</span><span class="lines">@@ -838,13 +839,8 @@
</span><span class="cx"> with_frameworks_dir
</span><span class="cx"> with_universal_archs
</span><span class="cx"> enable_readline
</span><del>-with_tcl
-with_tclinclude
-with_tclpackage
</del><span class="cx"> with_curlprefix
</span><span class="cx"> with_sqlite3prefix
</span><del>-with_tcl_sqlite3
-with_included_tclthread
</del><span class="cx"> enable_shared
</span><span class="cx"> '
</span><span class="cx"> ac_precious_vars='build_alias
</span><span class="lines">@@ -876,8 +872,8 @@
</span><span class="cx"> XZ
</span><span class="cx"> OBJCPP
</span><span class="cx"> CPP'
</span><del>-ac_subdirs_all='src/thread2.6'
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> # Initialize some variables set by options.
</span><span class="cx"> ac_init_help=
</span><span class="cx"> ac_init_version=false
</span><span class="lines">@@ -1521,14 +1517,8 @@
</span><span class="cx"> --with-frameworks-dir Frameworks installation directory.
</span><span class="cx"> --with-universal-archs="CPU"
</span><span class="cx"> Universal CPU architectures (space separated)
</span><del>- --with-tcl directory containing tcl configuration (tclConfig.sh)
- --with-tclinclude directory containing the public Tcl header files.
- --with-tclpackage Tcl package installation directory.
</del><span class="cx"> --with-curlprefix base directory for the cURL install '/usr', '/usr/local',...
</span><span class="cx"> --with-sqlite3prefix base directory for the sqlite3 install '/usr', '/usr/local',...
</span><del>- --with-tcl-sqlite3=DIR directory for Tcl sqlite3 (default /usr/lib/sqlite3)
- --with-included-tclthread
- install included Thread package.
</del><span class="cx">
</span><span class="cx"> Some influential environment variables:
</span><span class="cx"> CC C compiler command
</span><span class="lines">@@ -7795,22 +7785,22 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether we will build daemondo" >&5
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether we will build daemondo" >&5
</ins><span class="cx"> $as_echo_n "checking for whether we will build daemondo... " >&6; }
</span><del>- result=no
</del><ins>+ result=no
</ins><span class="cx"> case $host_os in
</span><del>- 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="$ac_config_files src/programs/daemondo/Makefile"
</del><ins>+ 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="$ac_config_files src/programs/daemondo/Makefile"
</ins><span class="cx">
</span><del>- fi
</del><ins>+ fi
</ins><span class="cx"> ;
</span><del>- *)
</del><ins>+ *)
</ins><span class="cx"> esac
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${result}" >&5
</span><span class="cx"> $as_echo "${result}" >&6; }
</span><span class="lines">@@ -7900,7 +7890,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if test "${ROOTPRIVS+set}" = set; then
</span><del>-
</del><span class="cx"> # Set install-user to current user
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for install user" >&5
</span><span class="cx"> $as_echo_n "checking for install user... " >&6; }
</span><span class="lines">@@ -7924,21 +7913,6 @@
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUNUSR" >&5
</span><span class="cx"> $as_echo "$RUNUSR" >&6; }
</span><span class="cx">
</span><del>-
- # Set Tcl package directory to ~/Library/Tcl
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl package directory" >&5
-$as_echo_n "checking for Tcl package directory... " >&6; }
- 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}
-
- if test x"${ac_cv_c_tclpkgd}" = x ; then
- as_fn_error $? "Tcl package directory not found. Please specify its location with --with-tclpackage" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_c_tclpkgd}" >&5
-$as_echo "${ac_cv_c_tclpkgd}" >&6; }
- fi
</del><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -7957,7 +7931,7 @@
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for install user" >&5
</span><span class="cx"> $as_echo_n "checking for install user... " >&6; }
</span><span class="cx"> if test "x$DSTUSR" = "x" ; then
</span><del>- DSTUSR=root
</del><ins>+ DSTUSR=root
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSTUSR" >&5
</span><span class="lines">@@ -7977,21 +7951,20 @@
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for install group" >&5
</span><span class="cx"> $as_echo_n "checking for install group... " >&6; }
</span><span class="cx"> if test "x$DSTGRP" = "x" ; then
</span><del>-
- case $host_os in
- darwin*)
- DSTGRP="admin"
- ;
- freebsd*)
- DSTGRP="wheel"
- ;
- linux*)
- DSTGRP="root"
- ;
- *)
- DSTGRP="wheel"
- ;
- esac
</del><ins>+ case $host_os in
+ darwin*)
+ DSTGRP="admin"
+ ;
+ freebsd*)
+ DSTGRP="wheel"
+ ;
+ linux*)
+ DSTGRP="root"
+ ;
+ *)
+ DSTGRP="wheel"
+ ;
+ esac
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSTGRP" >&5
</span><span class="lines">@@ -8011,7 +7984,7 @@
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for macports user" >&5
</span><span class="cx"> $as_echo_n "checking for macports user... " >&6; }
</span><span class="cx"> if test "x$RUNUSR" = "x" ; then
</span><del>- RUNUSR=macports
</del><ins>+ RUNUSR=macports
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUNUSR" >&5
</span><span class="lines">@@ -8031,7 +8004,7 @@
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking what permissions to use for installation directories" >&5
</span><span class="cx"> $as_echo_n "checking what permissions to use for installation directories... " >&6; }
</span><span class="cx"> if test "x$DSTMODE" = "x" ; then
</span><del>- DSTMODE=0755
</del><ins>+ DSTMODE=0755
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSTMODE" >&5
</span><span class="lines">@@ -8051,7 +8024,7 @@
</span><span class="cx"> if test "${SHAREDIR+set}" = set; then
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to share the install directory with all members of the install group" >&5
</span><span class="cx"> $as_echo_n "checking whether to share the install directory with all members of the install group... " >&6; }
</span><del>- DSTMODE=0775
</del><ins>+ DSTMODE=0775
</ins><span class="cx">
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSTMODE" >&5
</span><span class="cx"> $as_echo "$DSTMODE" >&6; }
</span><span class="lines">@@ -8070,25 +8043,25 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><del>- oldprefix=$prefix
- if test "x$prefix" = "xNONE" ; then
- prefix=$ac_default_prefix
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Applications installation directory" >&5
</del><ins>+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Applications installation directory" >&5
</ins><span class="cx"> $as_echo_n "checking for Applications installation directory... " >&6; }
</span><span class="cx">
</span><span class="cx"> if test "x$MPAPPLICATIONSDIR" = "x" ; then
</span><del>- if test "$DSTUSR" = "root" ; then
- MPAPPLICATIONSDIR="/Applications/MacPorts"
- else
- MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
- fi
</del><ins>+ if test "$DSTUSR" = "root" ; then
+ MPAPPLICATIONSDIR="/Applications/MacPorts"
+ else
+ MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
+ fi
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPAPPLICATIONSDIR" >&5
</span><span class="cx"> $as_echo "$MPAPPLICATIONSDIR" >&6; }
</span><span class="cx">
</span><del>- prefix=$oldprefix
</del><ins>+ prefix=$oldprefix
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -8100,11 +8073,11 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><del>- oldprefix=$prefix
- if test "x$prefix" = "xNONE" ; then
- prefix=$ac_default_prefix
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Frameworks installation directory" >&5
</del><ins>+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Frameworks installation directory" >&5
</ins><span class="cx"> $as_echo_n "checking for Frameworks installation directory... " >&6; }
</span><span class="cx">
</span><span class="cx"> if test "x$MPFRAMEWORKSDIR" = "x" ; then
</span><span class="lines">@@ -8114,7 +8087,7 @@
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPFRAMEWORKSDIR" >&5
</span><span class="cx"> $as_echo "$MPFRAMEWORKSDIR" >&6; }
</span><span class="cx">
</span><del>- prefix=$oldprefix
</del><ins>+ prefix=$oldprefix
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Check for universal options
</span><span class="lines">@@ -8126,28 +8099,28 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><del>- if test "x$UNIVERSAL_ARCHS" = "x"; then
- case "$MACOSX_VERSION" in
- 10.1[0-9]*)
- UNIVERSAL_ARCHS="x86_64 i386"
- ;;
- 10.[0-5]*)
- UNIVERSAL_ARCHS="i386 ppc"
- ;;
- *)
- UNIVERSAL_ARCHS="x86_64 i386"
- ;;
- esac
- fi
</del><ins>+ if test "x$UNIVERSAL_ARCHS" = "x"; then
+ case "$MACOSX_VERSION" in
+ 10.1[0-9]*)
+ UNIVERSAL_ARCHS="x86_64 i386"
+ ;
+ 10.[0-5]*)
+ UNIVERSAL_ARCHS="i386 ppc"
+ ;
+ *)
+ UNIVERSAL_ARCHS="x86_64 i386"
+ ;
+ esac
+ fi
</ins><span class="cx">
</span><del>- UNIVERSAL_ARCHFLAGS=
- for arch in $UNIVERSAL_ARCHS; do
- UNIVERSAL_ARCHFLAGS="$UNIVERSAL_ARCHFLAGS -arch $arch"
- done
</del><ins>+ UNIVERSAL_ARCHFLAGS=
+ for arch in $UNIVERSAL_ARCHS; do
+ UNIVERSAL_ARCHFLAGS="$UNIVERSAL_ARCHFLAGS -arch $arch"
+ done
</ins><span class="cx">
</span><del>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Universal CPU architectures" >&5
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Universal CPU architectures" >&5
</ins><span class="cx"> $as_echo_n "checking for Universal CPU architectures... " >&6; }
</span><del>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIVERSAL_ARCHS" >&5
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIVERSAL_ARCHS" >&5
</ins><span class="cx"> $as_echo "$UNIVERSAL_ARCHS" >&6; }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -8619,8 +8592,6 @@
</span><span class="cx"> done
</span><span class="cx">
</span><span class="cx">
</span><del>-INCLUDES="-I.. -I. $INCLUDES"
-
</del><span class="cx"> # Checks for library functions.
</span><span class="cx"> for ac_func in OSAtomicCompareAndSwap32 OSAtomicCompareAndSwap64 OSAtomicCompareAndSwapPtr bzero \
</span><span class="cx"> clearenv copyfile fgetln flock fls kqueue lockf memset posix_spawn setmode strcasecmp strlcat \
</span><span class="lines">@@ -8698,7 +8669,6 @@
</span><span class="cx">
</span><span class="cx"> else
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Check for libmd from FreeBSD, which is preferred
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5File in -lmd" >&5
</span><span class="cx"> $as_echo_n "checking for MD5File in -lmd... " >&6; }
</span><span class="lines">@@ -9048,428 +9018,18 @@
</span><span class="cx"> $as_echo "#define MIN_USABLE_GID 500" >>confdefs.h
</span><span class="cx">
</span><span class="cx">
</span><del>-# Load tclConfig.sh
</del><ins>+# Substitute platform for base compatibility check
</ins><span class="cx">
</span><del>- #
- # Ok, lets find the tcl configuration
- # First, look for one uninstalled.
- # the alternative search directory is invoked by --with-tcl
- #
-
- if test x"${no_tcl}" = x ; then
- # we reset no_tcl in case something fails here
- no_tcl=true
-
-# Check whether --with-tcl was given.
-if test "${with_tcl+set}" = set; then :
- withval=$with_tcl; with_tclconfig=${withval}
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
-$as_echo_n "checking for Tcl configuration... " >&6; }
- if ${ac_cv_c_tclconfig+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-
- # First check to see if --with-tcl was specified.
- if test x"${with_tclconfig}" != x ; then
- if test -f "${with_tclconfig}/tclConfig.sh" ; then
- ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
- else
- as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5
- fi
- fi
-
- # then check for a private Tcl installation
- if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in \
- ../tcl \
- `ls -dr ../tcl[8-9].[0-9]* 2>/dev/null` \
- ../../tcl \
- `ls -dr ../../tcl[8-9].[0-9]* 2>/dev/null` \
- ../../../tcl \
- `ls -dr ../../../tcl[8-9].[0-9]* 2>/dev/null` ; do
- if test -f "$i/unix/tclConfig.sh" ; then
- ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
- break
- fi
- done
- fi
-
- # check in a few common install locations
- if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${libdir} 2>/dev/null` \
- `ls -d /usr/lib 2>/dev/null` \
- `ls -d /usr/local/lib 2>/dev/null` \
- `ls -d /usr/contrib/lib 2>/dev/null` \
- `ls -d /usr/pkg/lib 2>/dev/null` \
- `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
- `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
- `ls -d /usr/local/lib/tcl8.4 2>/dev/null` \
- `ls -d /usr/lib/tcl8.6 2>/dev/null` \
- `ls -d /usr/lib/tcl8.5 2>/dev/null` \
- `ls -d /usr/lib/tcl8.4 2>/dev/null` \
- do
- if test -f "$i/tclConfig.sh" ; then
- ac_cv_c_tclconfig=`(cd $i; pwd)`
- break
- fi
- done
- fi
-
- # check in a few other private locations
- if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in \
- ${srcdir}/../tcl \
- `ls -dr ${srcdir}/../tcl[8-9].[0-9]* 2>/dev/null` ; do
- if test -f "$i/unix/tclConfig.sh" ; then
- ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
- break
- fi
- done
- fi
-
-fi
-
-
- if test x"${ac_cv_c_tclconfig}" = x ; then
- TCL_BIN_DIR="# no Tcl configs found"
- as_fn_error $? "Can't find Tcl configuration definitions" "$LINENO" 5
- else
- no_tcl=
- TCL_BIN_DIR=${ac_cv_c_tclconfig}
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $TCL_BIN_DIR/tclConfig.sh" >&5
-$as_echo "found $TCL_BIN_DIR/tclConfig.sh" >&6; }
- fi
- fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
-$as_echo_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; }
-
- if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
-$as_echo "loading" >&6; }
- . $TCL_BIN_DIR/tclConfig.sh
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
-$as_echo "file not found" >&6; }
- fi
-
- #
- # If the TCL_BIN_DIR is the build directory (not the install directory),
- # then set the common variable name to the value of the build variables.
- # For example, the variable TCL_LIB_SPEC will be set to the value
- # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
- # instead of TCL_BUILD_LIB_SPEC since it will work with both an
- # installed and uninstalled version of Tcl.
- #
-
- if test -f $TCL_BIN_DIR/Makefile ; then
- TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
- TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
- TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
- fi
-
- #
- # eval is required to do the TCL_DBGX substitution
- #
-
- eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
- eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
- eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
-
- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
- eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
- eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check for Tcl public headers
-CYGPATH=echo
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl public headers" >&5
-$as_echo_n "checking for Tcl public headers... " >&6; }
-
-
-# Check whether --with-tclinclude was given.
-if test "${with_tclinclude+set}" = set; then :
- withval=$with_tclinclude; with_tclinclude=${withval}
-fi
-
-
- if test x"${with_tclinclude}" != x ; then
- if test -f "${with_tclinclude}/tcl.h" ; then
- ac_cv_c_tclh=${with_tclinclude}
- else
- as_fn_error $? "${with_tclinclude} directory does not contain Tcl public header file tcl.h" "$LINENO" 5
- fi
- else
- if ${ac_cv_c_tclh+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- # Use the value from --with-tclinclude, if it was given
-
- if test x"${with_tclinclude}" != x ; then
- ac_cv_c_tclh=${with_tclinclude}
- else
- # Do NOT check in $includedir, we need to prevent automatic
- # location of Tcl headers in $prefix/include unless explicitly
- # specified with the --with-tclinclude option. But go ahead and
- # check some other possible local system locations.
-
- for i in \
- /usr/include /usr/local/include /usr/local/include/tcl${TCL_VERSION} /usr/include/tcl${TCL_VERSION}; do
- if test -f "$i/tcl.h" ; then
- ac_cv_c_tclh=$i
- break
- fi
- done
- fi
-
-fi
-
- fi
-
- # Print a message based on how we determined the include path
-
- if test x"${ac_cv_c_tclh}" = x ; then
- as_fn_error $? "tcl.h not found. Please specify its location with --with-tclinclude" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_c_tclh}" >&5
-$as_echo "${ac_cv_c_tclh}" >&6; }
- fi
-
- # Convert to a native path and substitute into the output files.
-
- INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclh}`
-
- TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\"
-
-
-
-
-# Check for tclsh binary
-
-
-
- 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
- # Extract the first word of "tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh", so it can be a program name with args.
-set dummy tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TCLSH+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $TCLSH in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-TCLSH=$ac_cv_path_TCLSH
-if test -n "$TCLSH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
-$as_echo "$TCLSH" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- ;
- *)
- # Otherwise, look for a non-versioned tclsh
- # Extract the first word of "tclsh tclsh${TCL_VERSION}", so it can be a program name with args.
-set dummy tclsh tclsh${TCL_VERSION}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TCLSH+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $TCLSH in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-TCLSH=$ac_cv_path_TCLSH
-if test -n "$TCLSH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
-$as_echo "$TCLSH" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- ;
- esac
- if test "x$TCLSH" = "x" ; then
- as_fn_error $? "Could not find tclsh" "$LINENO" 5
- fi
-
-
-
-
-# Substitute Tcl platform for base compatibility check
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl target platform" >&5
-$as_echo_n "checking for Tcl target platform... " >&6; }
- OS_PLATFORM=`echo 'puts -nonewline [string tolower \$tcl_platform(os)]' | $TCLSH`
- OS_MAJOR=`echo 'puts -nonewline [lindex [split \$tcl_platform(osVersion) .] 0]' | $TCLSH`
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for target platform" >&5
+$as_echo_n "checking for target platform... " >&6; }
+ OS_PLATFORM=`uname -s | tr '[:upper:]' '[:lower:]'`
+ OS_MAJOR=`uname -r | cut -d '.' -f 1`
</ins><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OS_PLATFORM $OS_MAJOR" >&5
</span><span class="cx"> $as_echo "$OS_PLATFORM $OS_MAJOR" >&6; }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-# Check for Tcl package path
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl package directory" >&5
-$as_echo_n "checking for Tcl package directory... " >&6; }
-
-
-# Check whether --with-tclpackage was given.
-if test "${with_tclpackage+set}" = set; then :
- withval=$with_tclpackage; with_tclpackagedir=${withval}
-fi
-
-
- if test x"${with_tclpackagedir}" != x ; then
- ac_cv_c_tclpkgd=${with_tclpackagedir}
- else
- if ${ac_cv_c_tclpkgd+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- # 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
-
- fi
-
- if test x"${ac_cv_c_tclpkgd}" = x ; then
- as_fn_error $? "Tcl package directory not found. Please specify its location with --with-tclpackage" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_c_tclpkgd}" >&5
-$as_echo "${ac_cv_c_tclpkgd}" >&6; }
- 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}
-
-
-
-
-# Check if thread is enabled.
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tclsh was compiled with threads" >&5
-$as_echo_n "checking whether tclsh was compiled with threads... " >&6; }
- tcl_threadenabled=`echo 'puts -nonewline [info exists tcl_platform(threaded)]' | $TCLSH`
- if test "$tcl_threadenabled" = "1" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "tcl wasn't compiled with threads enabled" "$LINENO" 5
- fi
-
-
</del><span class="cx"> ## libcurl
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -9661,10 +9221,10 @@
</span><span class="cx"> LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib -lsqlite3"
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- # check if we have sqlite3ext.h, using the appropriate cppflags
- CPPFLAGS_OLD="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${CFLAGS_SQLITE3}"
- for ac_header in sqlite3ext.h
</del><ins>+ # check if we have sqlite3ext.h, using the appropriate cppflags
+ CPPFLAGS_OLD="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${CFLAGS_SQLITE3}"
+ for ac_header in sqlite3ext.h
</ins><span class="cx"> do :
</span><span class="cx"> ac_fn_c_check_header_mongrel "$LINENO" "sqlite3ext.h" "ac_cv_header_sqlite3ext_h" "$ac_includes_default"
</span><span class="cx"> if test "x$ac_cv_header_sqlite3ext_h" = xyes; then :
</span><span class="lines">@@ -9676,52 +9236,15 @@
</span><span class="cx">
</span><span class="cx"> done
</span><span class="cx">
</span><del>- CPPFLAGS="${CPPFLAGS_OLD}"
</del><ins>+ CPPFLAGS="${CPPFLAGS_OLD}"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>- # now the sqlite Tcl bindings
</del><span class="cx">
</span><del>-# Check whether --with-tcl-sqlite3 was given.
-if test "${with_tcl_sqlite3+set}" = set; then :
- withval=$with_tcl_sqlite3; mp_sqlite3_dir=$withval
-fi
</del><span class="cx">
</span><span class="cx">
</span><del>- 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
</del><span class="cx">
</span><del>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl sqlite3 location" >&5
-$as_echo_n "checking for Tcl sqlite3 location... " >&6; }
-if ${mp_cv_sqlite3_dir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- mp_cv_sqlite3_dir=
- test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mp_cv_sqlite3_dir" >&5
-$as_echo "$mp_cv_sqlite3_dir" >&6; }
-
- SQLITE3_TCL_DIR=$mp_cv_sqlite3_dir
-
-
-
-
-
-
</del><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite >= 3003011" >&5
</span><span class="cx"> $as_echo_n "checking for SQLite >= 3003011... " >&6; }
</span><span class="cx">
</span><span class="lines">@@ -9864,50 +9387,1049 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+# misc variables that need to be expanded for substitution into tcl
+oldprefix=$prefix
+oldexec_prefix=$exec_prefix
+if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+fi
+if test "x$exec_prefix" = "xNONE" ; then
+ exec_prefix=$prefix
+fi
+eval "prefix_expanded=$prefix"
+eval "exec_prefix_expanded=$exec_prefix"
+
+# do this twice, since there is a nested variable of
+# ${prefix} inside of ${sysconfdir}
+eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
+eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR_EXPANDED"
+
+eval "localstatedir_expanded=$localstatedir"
+
+eval "macports_tcl_dir=${datadir}/macports/Tcl"
+eval "macports_tcl_dir=$macports_tcl_dir"
+
+# Compute the libexec dir for the vendor packages
+eval "macports_libexec_dir=${libexecdir}/macports"
+eval "macports_libexec_dir=$macports_libexec_dir"
+prefix=$oldprefix
+exec_prefix=$oldexec_prefix
+
</ins><span class="cx"> # Determine if we need to install some bundled packages
</span><del>-OUR_INCLUDED_PACKAGES=
</del><ins>+VENDOR_PACKAGES=
</ins><span class="cx">
</span><del>-## Thread package.
</del><ins>+## Tcl package
+tcl_version=8.5.15
+tcl_thread_version=2.7.0
+tcllib_version=1.15
+ mp_fn_var_prepend() {
+ eval "$1=\"$2\$$1\""
+ }
</ins><span class="cx">
</span><del>-# Check whether --with-included-tclthread was given.
-if test "${with_included_tclthread+set}" = set; then :
- withval=$with_included_tclthread; with_included_tclthread=$withval
-else
- with_included_tclthread="unspecified"
-fi
</del><span class="cx">
</span><ins>+ mp_tarball="vendor/tcl${tcl_version}-src.tar.gz"
+ ac_dir=vendor/tcl${tcl_version}/unix
</ins><span class="cx">
</span><del>-# Check if thread package is already installed.
-if test "x$with_included_tclthread" = "xunspecified" ; then
</del><ins>+ if test "$no_recursion" != yes; then
+ mp_popdir=$(pwd)
+ if ! test -d "$ac_dir"; then
+ mp_tarball_vendordir="$(dirname "$mp_tarball")"
+ as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
+$as_echo "$as_me: === extracting $mp_tarball" >&6;}
+ (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+ fi
+ if ! test -d "$ac_dir"; then
+ as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
+ fi
</ins><span class="cx">
</span><del>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl Thread package" >&5
-$as_echo_n "checking for Tcl Thread package... " >&6; }
- package_present=`echo 'if {[catch {package require Thread}]} {puts -nonewline 0} else {puts -nonewline 1}' | $TCLSH`
- if test "$package_present" = "1"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; with_included_tclthread=no
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; with_included_tclthread=yes
-fi
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
</ins><span class="cx">
</span><del>-fi
</del><ins>+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
</ins><span class="cx">
</span><del>-# If thread package isn't installed, configure and install thread package.
-if test "$with_included_tclthread" = "yes"; then
- OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES thread2.6"
</del><ins>+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
</ins><span class="cx">
</span><ins>+ cd "$ac_dir"
+ if test -f "$ac_srcdir/configure"; then
+ mp_sub_configure_args=
+ mp_sub_configure_keys=
+ # Compile a list of keys that have been given to the MP_CONFIG_TARBALL
+ # macro; we want to skip copying those parameters from the original
+ # configure invocation.
+ for mp_arg in --prefix=${macports_libexec_dir} --enable-threads; do
+ case $mp_arg in
+ --*=* | -*=*)
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ case $mp_arg_key in
+ *\'*)
+ mp_arg_key=$($as_echo "$mp_arg_key" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg_key="'$mp_arg_key'"
+ as_fn_append mp_sub_configure_keys " $mp_arg_key"
</ins><span class="cx">
</span><del>-subdirs="$subdirs src/thread2.6"
</del><ins>+ ;
+ esac
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
</ins><span class="cx">
</span><del>- # 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
-fi
</del><ins>+ done
+ # Walk the list of arguments given to the original configure script;
+ # filter out a few common ones we likely would not want to pass along,
+ # add --disable-option-checking and filter those already given as
+ # argument to MP_CONFIG_TARBALL.
+ # Most of this code is adapted from _AC_OUTPUT_SUBDIRS in
+ # $prefix/share/autoconf/autoconf/status.m4.
+ mp_prev=
+ eval "set x $ac_configure_args"
+ shift
+ for mp_arg; do
+ if test -n "$mp_prev"; then
+ mp_prev=
+ continue
+ fi
+ case $mp_arg in
+ -cache-file \
+ | --cache-file \
+ | --cache-fil \
+ | --cache-fi \
+ | --cache-f \
+ | --cache- \
+ | --cache \
+ | --cach \
+ | --cac \
+ | --ca \
+ | --c)
+ mp_prev=cache_file
+ ;
+ -cache-file=* \
+ | --cache-file=* \
+ | --cache-fil=* \
+ | --cache-fi=* \
+ | --cache-f=* \
+ | --cache-=* \
+ | --cache=* \
+ | --cach=* \
+ | --cac=* \
+ | --ca=* \
+ | --c=*)
+ # ignore --cache-file
+ ;
+ --config-cache \
+ | -C)
+ # ignore -C
+ ;
+ -srcdir \
+ | --srcdir \
+ | -srcdi \
+ | -srcd \
+ | -src \
+ | -sr)
+ mp_prev=srcdir
+ ;
+ -srcdir=* \
+ | --srcdir=* \
+ | --srcdi=* \
+ | --srcd=* \
+ | --src=* \
+ | --sr=*)
+ # ignore --srcdir
+ ;
+ -prefix \
+ | --prefix \
+ | --prefi \
+ | --pref \
+ | --pre \
+ | --pr \
+ | --p)
+ mp_prev=prefix
+ ;
+ -prefix=* \
+ | --prefix=* \
+ | --prefi=* \
+ | --pref=* \
+ | --pre=* \
+ | --pr=* \
+ | --p=*)
+ # ignore --prefix
+ ;
+ --disable-option-checking)
+ # ignore --disable-option-checking
+ ;
+ --*=* | -*=*)
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
</ins><span class="cx">
</span><del>-# Allows building of shared libraries
</del><span class="cx">
</span><ins>+ fi
+
+ ;
+ *)
+ # always pass positional arguments
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+ ;
+ esac
+ done
+
+ # Now prepend some arguments that should always be present unless
+ # overriden, such as --prefix, --silent, --disable-option-checking,
+ # --cache-file, --srcdir
+ # Pass --prefix unless already given
+ mp_arg_key=prefix
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_args\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ mp_arg="--prefix=$prefix"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ fi
+
+
+ # Pass --silent
+ if test "$silent" = yes; then
+ mp_arg="--silent"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+ fi
+
+ # Always prepend --disable-option-checking to silence warnings, since
+ # different subdirs can have different --enable and --with options.
+ mp_arg="--disable-option-checking"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ # Make the cache file name correct relative to the subdirectory.
+ case $cache_file in
+ [\\/]* | ?:[\\/]* )
+ mp_sub_cache_file=$cache_file
+ ;
+ *) # Relative name.
+ mp_sub_cache_file=$ac_top_build_prefix$cache_file
+ ;
+ esac
+ mp_arg="--cache-file=$mp_sub_cache_file"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ mp_arg="--srcdir=$ac_srcdir"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&5
+$as_echo "$as_me: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&6;}
+ eval "\$SHELL \$ac_srcdir/configure $mp_sub_configure_args" || as_fn_error $? "configure failed for $ac_dir" "$LINENO" 5
+ else
+ as_fn_error $? "no configure script found in $ac_dir" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+
+ cd "$mp_popdir"
+ fi
+
+VENDOR_TCL_SUBDIR=tcl${tcl_version}/unix
+VENDOR_TCL_INSTALL="install-binaries install-libraries"
+
+
+
+# Set up some variables needed by MacPorts' Tcl setup
+VENDOR_DESTROOT=vendor/vendor-destroot
+
+
+## Tcl Thread package
+# Tcl supports Threads internally, but to use threads from Tcl code we need
+# this package
+
+ mp_tarball="vendor/thread${tcl_thread_version}.tar.gz"
+ ac_dir=vendor/thread${tcl_thread_version}
+
+ if test "$no_recursion" != yes; then
+ mp_popdir=$(pwd)
+ if ! test -d "$ac_dir"; then
+ mp_tarball_vendordir="$(dirname "$mp_tarball")"
+ as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
+$as_echo "$as_me: === extracting $mp_tarball" >&6;}
+ (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+ fi
+ if ! test -d "$ac_dir"; then
+ as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir"
+ if test -f "$ac_srcdir/configure"; then
+ mp_sub_configure_args=
+ mp_sub_configure_keys=
+ # Compile a list of keys that have been given to the MP_CONFIG_TARBALL
+ # macro; we want to skip copying those parameters from the original
+ # configure invocation.
+ for mp_arg in --prefix=${macports_libexec_dir}; do
+ case $mp_arg in
+ --*=* | -*=*)
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ case $mp_arg_key in
+ *\'*)
+ mp_arg_key=$($as_echo "$mp_arg_key" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg_key="'$mp_arg_key'"
+ as_fn_append mp_sub_configure_keys " $mp_arg_key"
+
+ ;
+ esac
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+ done
+ # Walk the list of arguments given to the original configure script;
+ # filter out a few common ones we likely would not want to pass along,
+ # add --disable-option-checking and filter those already given as
+ # argument to MP_CONFIG_TARBALL.
+ # Most of this code is adapted from _AC_OUTPUT_SUBDIRS in
+ # $prefix/share/autoconf/autoconf/status.m4.
+ mp_prev=
+ eval "set x $ac_configure_args"
+ shift
+ for mp_arg; do
+ if test -n "$mp_prev"; then
+ mp_prev=
+ continue
+ fi
+ case $mp_arg in
+ -cache-file \
+ | --cache-file \
+ | --cache-fil \
+ | --cache-fi \
+ | --cache-f \
+ | --cache- \
+ | --cache \
+ | --cach \
+ | --cac \
+ | --ca \
+ | --c)
+ mp_prev=cache_file
+ ;
+ -cache-file=* \
+ | --cache-file=* \
+ | --cache-fil=* \
+ | --cache-fi=* \
+ | --cache-f=* \
+ | --cache-=* \
+ | --cache=* \
+ | --cach=* \
+ | --cac=* \
+ | --ca=* \
+ | --c=*)
+ # ignore --cache-file
+ ;
+ --config-cache \
+ | -C)
+ # ignore -C
+ ;
+ -srcdir \
+ | --srcdir \
+ | -srcdi \
+ | -srcd \
+ | -src \
+ | -sr)
+ mp_prev=srcdir
+ ;
+ -srcdir=* \
+ | --srcdir=* \
+ | --srcdi=* \
+ | --srcd=* \
+ | --src=* \
+ | --sr=*)
+ # ignore --srcdir
+ ;
+ -prefix \
+ | --prefix \
+ | --prefi \
+ | --pref \
+ | --pre \
+ | --pr \
+ | --p)
+ mp_prev=prefix
+ ;
+ -prefix=* \
+ | --prefix=* \
+ | --prefi=* \
+ | --pref=* \
+ | --pre=* \
+ | --pr=* \
+ | --p=*)
+ # ignore --prefix
+ ;
+ --disable-option-checking)
+ # ignore --disable-option-checking
+ ;
+ --*=* | -*=*)
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+
+ fi
+
+ ;
+ *)
+ # always pass positional arguments
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+ ;
+ esac
+ done
+
+ # Now prepend some arguments that should always be present unless
+ # overriden, such as --prefix, --silent, --disable-option-checking,
+ # --cache-file, --srcdir
+ # Pass --prefix unless already given
+ mp_arg_key=prefix
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_args\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ mp_arg="--prefix=$prefix"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ fi
+
+
+ # Pass --silent
+ if test "$silent" = yes; then
+ mp_arg="--silent"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+ fi
+
+ # Always prepend --disable-option-checking to silence warnings, since
+ # different subdirs can have different --enable and --with options.
+ mp_arg="--disable-option-checking"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ # Make the cache file name correct relative to the subdirectory.
+ case $cache_file in
+ [\\/]* | ?:[\\/]* )
+ mp_sub_cache_file=$cache_file
+ ;
+ *) # Relative name.
+ mp_sub_cache_file=$ac_top_build_prefix$cache_file
+ ;
+ esac
+ mp_arg="--cache-file=$mp_sub_cache_file"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ mp_arg="--srcdir=$ac_srcdir"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&5
+$as_echo "$as_me: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&6;}
+ eval "\$SHELL \$ac_srcdir/configure $mp_sub_configure_args" || as_fn_error $? "configure failed for $ac_dir" "$LINENO" 5
+ else
+ as_fn_error $? "no configure script found in $ac_dir" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+
+ cd "$mp_popdir"
+ fi
+
+VENDOR_TCLTHREAD_SUBDIR=thread${tcl_thread_version}
+VENDOR_TCLTHREAD_INSTALL="install-binaries install-libraries"
+
+
+
+## Tcllib package
+# Note that Tcllib needs a Tcl interpreter during installation; it will *not*
+# be the one we configure above, because that one isn't built yet. That's not
+# a problem, though -- it's only used during installation.
+
+ mp_tarball="vendor/tcllib-${tcllib_version}.tar.gz"
+ ac_dir=vendor/tcllib-${tcllib_version}
+
+ if test "$no_recursion" != yes; then
+ mp_popdir=$(pwd)
+ if ! test -d "$ac_dir"; then
+ mp_tarball_vendordir="$(dirname "$mp_tarball")"
+ as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
+$as_echo "$as_me: === extracting $mp_tarball" >&6;}
+ (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+ fi
+ if ! test -d "$ac_dir"; then
+ as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir"
+ if test -f "$ac_srcdir/configure"; then
+ mp_sub_configure_args=
+ mp_sub_configure_keys=
+ # Compile a list of keys that have been given to the MP_CONFIG_TARBALL
+ # macro; we want to skip copying those parameters from the original
+ # configure invocation.
+ for mp_arg in --prefix=${macports_libexec_dir}; do
+ case $mp_arg in
+ --*=* | -*=*)
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ case $mp_arg_key in
+ *\'*)
+ mp_arg_key=$($as_echo "$mp_arg_key" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg_key="'$mp_arg_key'"
+ as_fn_append mp_sub_configure_keys " $mp_arg_key"
+
+ ;
+ esac
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+ done
+ # Walk the list of arguments given to the original configure script;
+ # filter out a few common ones we likely would not want to pass along,
+ # add --disable-option-checking and filter those already given as
+ # argument to MP_CONFIG_TARBALL.
+ # Most of this code is adapted from _AC_OUTPUT_SUBDIRS in
+ # $prefix/share/autoconf/autoconf/status.m4.
+ mp_prev=
+ eval "set x $ac_configure_args"
+ shift
+ for mp_arg; do
+ if test -n "$mp_prev"; then
+ mp_prev=
+ continue
+ fi
+ case $mp_arg in
+ -cache-file \
+ | --cache-file \
+ | --cache-fil \
+ | --cache-fi \
+ | --cache-f \
+ | --cache- \
+ | --cache \
+ | --cach \
+ | --cac \
+ | --ca \
+ | --c)
+ mp_prev=cache_file
+ ;
+ -cache-file=* \
+ | --cache-file=* \
+ | --cache-fil=* \
+ | --cache-fi=* \
+ | --cache-f=* \
+ | --cache-=* \
+ | --cache=* \
+ | --cach=* \
+ | --cac=* \
+ | --ca=* \
+ | --c=*)
+ # ignore --cache-file
+ ;
+ --config-cache \
+ | -C)
+ # ignore -C
+ ;
+ -srcdir \
+ | --srcdir \
+ | -srcdi \
+ | -srcd \
+ | -src \
+ | -sr)
+ mp_prev=srcdir
+ ;
+ -srcdir=* \
+ | --srcdir=* \
+ | --srcdi=* \
+ | --srcd=* \
+ | --src=* \
+ | --sr=*)
+ # ignore --srcdir
+ ;
+ -prefix \
+ | --prefix \
+ | --prefi \
+ | --pref \
+ | --pre \
+ | --pr \
+ | --p)
+ mp_prev=prefix
+ ;
+ -prefix=* \
+ | --prefix=* \
+ | --prefi=* \
+ | --pref=* \
+ | --pre=* \
+ | --pr=* \
+ | --p=*)
+ # ignore --prefix
+ ;
+ --disable-option-checking)
+ # ignore --disable-option-checking
+ ;
+ --*=* | -*=*)
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?(^=+)=.*$/\1/')
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+
+ fi
+
+ ;
+ *)
+ # always pass positional arguments
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+ ;
+ esac
+ done
+
+ # Now prepend some arguments that should always be present unless
+ # overriden, such as --prefix, --silent, --disable-option-checking,
+ # --cache-file, --srcdir
+ # Pass --prefix unless already given
+ mp_arg_key=prefix
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_args\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ mp_arg="--prefix=$prefix"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ fi
+
+
+ # Pass --silent
+ if test "$silent" = yes; then
+ mp_arg="--silent"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+ fi
+
+ # Always prepend --disable-option-checking to silence warnings, since
+ # different subdirs can have different --enable and --with options.
+ mp_arg="--disable-option-checking"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ # Make the cache file name correct relative to the subdirectory.
+ case $cache_file in
+ [\\/]* | ?:[\\/]* )
+ mp_sub_cache_file=$cache_file
+ ;
+ *) # Relative name.
+ mp_sub_cache_file=$ac_top_build_prefix$cache_file
+ ;
+ esac
+ mp_arg="--cache-file=$mp_sub_cache_file"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ mp_arg="--srcdir=$ac_srcdir"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&5
+$as_echo "$as_me: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&6;}
+ eval "\$SHELL \$ac_srcdir/configure $mp_sub_configure_args" || as_fn_error $? "configure failed for $ac_dir" "$LINENO" 5
+ else
+ as_fn_error $? "no configure script found in $ac_dir" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+
+ cd "$mp_popdir"
+ fi
+
+VENDOR_PACKAGES="$VENDOR_PACKAGES tcllib-${tcllib_version}"
+VENDOR_TCLLIB_SUBDIR=tcllib-${tcllib_version}
+VENDOR_TCLLIB_INSTALL="install-libraries"
+
+
+
+# Load tclConfig.sh from our private install of Tcl
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
+$as_echo_n "checking for Tcl configuration... " >&6; }
+TCL_BIN_DIR=`(cd vendor/tcl${tcl_version}/unix; pwd)`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found $TCL_BIN_DIR/tclConfig.sh" >&5
+$as_echo "found $TCL_BIN_DIR/tclConfig.sh" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+$as_echo_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; }
+
+ if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+ . $TCL_BIN_DIR/tclConfig.sh
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+ fi
+
+ #
+ # If the TCL_BIN_DIR is the build directory (not the install directory),
+ # then set the common variable name to the value of the build variables.
+ # For example, the variable TCL_LIB_SPEC will be set to the value
+ # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
+ # instead of TCL_BUILD_LIB_SPEC since it will work with both an
+ # installed and uninstalled version of Tcl.
+ #
+
+ if test -f $TCL_BIN_DIR/Makefile ; then
+ TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
+ TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
+ TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
+ fi
+
+ #
+ # eval is required to do the TCL_DBGX substitution
+ #
+
+ eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
+ eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
+ eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
+
+ eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+ eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
+ eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
</ins><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5
</span><span class="cx"> $as_echo_n "checking how to build libraries... " >&6; }
</span><span class="cx"> # Check whether --enable-shared was given.
</span><span class="lines">@@ -9939,13 +10461,15 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><del>-# Pull compiler / linker values from tclConfig.sh
-LDFLAGS_DEBUG=${TCL_LDFLAGS_DEBUG}
-LDFLAGS_OPTIMIZE=${TCL_LDFLAGS_OPTIMIZE}
</del><ins>+# Pull compiler/linker values from tclConfig.sh
</ins><span class="cx"> SHLIB_LD=${TCL_SHLIB_LD}
</span><span class="cx"> STLIB_LD=${TCL_STLIB_LD}
</span><span class="cx"> SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
</span><span class="cx"> SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
</span><ins>+TCLSH=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
+INTREE_TCLSH=${TCL_BIN_DIR}/tclsh
+# strip possible whitespace at the end of TCL_PACKAGE_PATH
+eval "TCL_PACKAGE_PATH=${TCL_PACKAGE_PATH}"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -9958,13 +10482,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-# misc variables that need to be expanded for substitution into tcl
</del><span class="cx">
</span><del>-oldprefix=$prefix
-if test "x$prefix" = "xNONE" ; then
- prefix=$ac_default_prefix
-fi
</del><ins>+INCLUDES="-I.. -I. $INCLUDES"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # Check if there's an existing DP/MP install too old to upgrade
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -9981,24 +10502,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-eval "prefix_expanded=$prefix"
-
-# do this twice, since there is a nested variable of
-# ${prefix} inside of ${sysconfdir}
-eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
-eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR_EXPANDED"
-
-eval "localstatedir_expanded=$localstatedir"
-
-eval "macports_tcl_dir=${datadir}/macports/Tcl"
-eval "macports_tcl_dir=$macports_tcl_dir"
-
-
-prefix=$oldprefix
-
-
</del><span class="cx"> # Output
</span><del>-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/freebsd/Makefile setupenv.bash src/Makefile src/machista1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/macports1.0/macports_fastload.tcl src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/registry_autoconf.tcl"
</del><ins>+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/freebsd/Makefile setupenv.bash src/Makefile src/cflib1.0/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_fastload.tcl src/macports1.0/macports_test_autoconf.tcl src/package1.0/Makefile src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port/Makefile src/port1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/Makefile src/registry2.0/registry_autoconf.tcl tests/Makefile vendor/Makefile"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ac_config_files="$ac_config_files src/pkg_mkindex.sh"
</span><span class="lines">@@ -10699,6 +11204,7 @@
</span><span class="cx"> "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
</span><span class="cx"> "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
</span><span class="cx"> "Mk/macports.autoconf.mk") CONFIG_FILES="$CONFIG_FILES Mk/macports.autoconf.mk" ;;
</span><ins>+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
</ins><span class="cx"> "doc/base.mtree") CONFIG_FILES="$CONFIG_FILES doc/base.mtree" ;;
</span><span class="cx"> "doc/macosx.mtree") CONFIG_FILES="$CONFIG_FILES doc/macosx.mtree" ;;
</span><span class="cx"> "doc/macports.conf") CONFIG_FILES="$CONFIG_FILES doc/macports.conf" ;;
</span><span class="lines">@@ -10707,16 +11213,26 @@
</span><span class="cx"> "portmgr/freebsd/Makefile") CONFIG_FILES="$CONFIG_FILES portmgr/freebsd/Makefile" ;;
</span><span class="cx"> "setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
</span><span class="cx"> "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
</span><ins>+ "src/cflib1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/cflib1.0/Makefile" ;;
+ "src/cregistry/Makefile") CONFIG_FILES="$CONFIG_FILES src/cregistry/Makefile" ;;
+ "src/darwintracelib1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/darwintracelib1.0/Makefile" ;;
</ins><span class="cx"> "src/machista1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/machista1.0/Makefile" ;;
</span><ins>+ "src/macports1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/macports1.0/Makefile" ;;
</ins><span class="cx"> "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
</span><ins>+ "src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
</ins><span class="cx"> "src/macports1.0/macports_test_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_test_autoconf.tcl" ;;
</span><del>- "src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
</del><ins>+ "src/package1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/package1.0/Makefile" ;;
</ins><span class="cx"> "src/package1.0/package_test_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/package1.0/package_test_autoconf.tcl" ;;
</span><span class="cx"> "src/pextlib1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/pextlib1.0/Makefile" ;;
</span><ins>+ "src/port/Makefile") CONFIG_FILES="$CONFIG_FILES src/port/Makefile" ;;
+ "src/port1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/port1.0/Makefile" ;;
</ins><span class="cx"> "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
</span><span class="cx"> "src/port1.0/port_test_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_test_autoconf.tcl" ;;
</span><span class="cx"> "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
</span><ins>+ "src/registry2.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/registry2.0/Makefile" ;;
</ins><span class="cx"> "src/registry2.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry2.0/registry_autoconf.tcl" ;;
</span><ins>+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "vendor/Makefile") CONFIG_FILES="$CONFIG_FILES vendor/Makefile" ;;
</ins><span class="cx"> "src/pkg_mkindex.sh") CONFIG_FILES="$CONFIG_FILES src/pkg_mkindex.sh" ;;
</span><span class="cx">
</span><span class="cx"> *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
</span><span class="lines">@@ -11304,151 +11820,6 @@
</span><span class="cx"> # would make configure fail if this is the last instruction.
</span><span class="cx"> $ac_cs_success || as_fn_exit 1
</span><span class="cx"> fi
</span><del>-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
- # Remove --cache-file, --srcdir, and --disable-option-checking arguments
- # so they do not pile up.
- ac_sub_configure_args=
- ac_prev=
- eval "set x $ac_configure_args"
- shift
- for ac_arg
- do
- if test -n "$ac_prev"; then
- ac_prev=
- continue
- fi
- case $ac_arg in
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
- | --c=*)
- ;;
- --config-cache | -C)
- ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- ;;
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- ;;
- --disable-option-checking)
- ;;
- *)
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
- esac
- done
-
- # Always prepend --prefix to ensure using the same prefix
- # in subdir configurations.
- ac_arg="--prefix=$prefix"
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
- # Pass --silent
- if test "$silent" = yes; then
- ac_sub_configure_args="--silent $ac_sub_configure_args"
- fi
-
- # Always prepend --disable-option-checking to silence warnings, since
- # different subdirs can have different --enable and --with options.
- ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
- test -d "$srcdir/$ac_dir" || continue
-
- ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
- $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
- $as_echo "$ac_msg" >&6
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- cd "$ac_dir"
-
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- ac_sub_configure=$ac_srcdir/configure.gnu
- elif test -f "$ac_srcdir/configure"; then
- ac_sub_configure=$ac_srcdir/configure
- elif test -f "$ac_srcdir/configure.in"; then
- # This should be Cygnus configure.
- ac_sub_configure=$ac_aux_dir/configure
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
- ac_sub_configure=
- fi
-
- # The recursion is here.
- if test -n "$ac_sub_configure"; then
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative name.
- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
- fi
-
- cd "$ac_popdir"
- done
-fi
</del><span class="cx"> if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
</span><span class="cx"> $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
</span></span></pre>
</div>
</div>
</body>
</html>