<!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>[117670] trunk/base/aclocal.m4</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/117670">117670</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-07 13:49:31 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>aclocal.m4: ignore --no-recursion if the subpackages are missing or unconfigured</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseaclocalm4">trunk/base/aclocal.m4</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: trunk/base/aclocal.m4 (117669 => 117670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/aclocal.m4 2014-03-07 20:37:11 UTC (rev 117669)
+++ trunk/base/aclocal.m4 2014-03-07 21:49:31 UTC (rev 117670)
</span><span class="lines">@@ -111,22 +111,23 @@
</span><span class="cx"> mp_tarball="$1"
</span><span class="cx"> ac_dir=$2
</span><span class="cx">
</span><del>- if test "$no_recursion" != yes; then
- mp_popdir=$(pwd)
- if ! test -d "$ac_dir"; then
- mp_tarball_vendordir="$(dirname "$mp_tarball")"
- AS_MKDIR_P(["$mp_tarball_vendordir"])
- AC_MSG_NOTICE([=== extracting $mp_tarball])
- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
- fi
- if ! test -d "$ac_dir"; then
- AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
- fi
-
</del><ins>+ mp_popdir=$(pwd)
+ if ! test -d "$ac_dir"; then
+ mp_tarball_vendordir="$(dirname "$mp_tarball")"
+ AS_MKDIR_P(["$mp_tarball_vendordir"])
+ AC_MSG_NOTICE([=== extracting $mp_tarball])
+ (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
+ fi
+ if ! test -d "$ac_dir"; then
+ AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
+ fi
+
+ AS_MKDIR_P(["$ac_dir"])
+ _AC_SRCDIRS(["$ac_dir"])
+ cd "$ac_dir"
+
+ if test "$no_recursion" != yes -o ! -f "$ac_srcdir/config.status"; then
</ins><span class="cx"> AC_MSG_NOTICE([=== configuring in $ac_dir ($mp_popdir/$ac_dir)])
</span><del>- AS_MKDIR_P(["$ac_dir"])
- _AC_SRCDIRS(["$ac_dir"])
- cd "$ac_dir"
</del><span class="cx"> if test -f "$ac_srcdir/configure"; then
</span><span class="cx"> mp_sub_configure_args=
</span><span class="cx"> mp_sub_configure_keys=
</span><span class="lines">@@ -279,9 +280,8 @@
</span><span class="cx"> AC_MSG_ERROR([no configure script found in $ac_dir])
</span><span class="cx"> fi
</span><span class="cx"> AC_MSG_NOTICE([=== finished configuring in $ac_dir ($mp_popdir/$ac_dir)])
</span><del>-
- cd "$mp_popdir"
</del><span class="cx"> fi
</span><ins>+ cd "$mp_popdir"
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>