<!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>[117518] trunk/base</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/117518">117518</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-02 08:00:30 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>configure.ac: Reset $PATH to the default before configuring
... and remove some references to /usr/local that we really don't want. Also
make sure all binaries that are in /sbin or /usr/sbin have an appropriate PATH
hint in AC_CHECK_PROG, just in case somebody doesn't have the sbin directories
in his $PATH (which should never happen now that configure resets the PATH, but
better be safe than sorry).
This avoids MacPorts thinking this was a SystemStarter-system because it can't
find /sbin/launchd during configure.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseaclocalm4">trunk/base/aclocal.m4</a></li>
<li><a href="#trunkbaseconfigureac">trunk/base/configure.ac</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: trunk/base/aclocal.m4 (117517 => 117518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/aclocal.m4 2014-03-02 14:21:22 UTC (rev 117517)
+++ trunk/base/aclocal.m4 2014-03-02 16:00:30 UTC (rev 117518)
</span><span class="lines">@@ -895,32 +895,14 @@
</span><span class="cx"> dnl This macro ensures MP installation prefix paths are NOT in PATH
</span><span class="cx"> dnl for configure to prevent potential problems when base/ code is updated
</span><span class="cx"> dnl and ports are installed that would match needed items.
</span><del>-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
- case "$as_dir" in
- $prefix/*)
- ;
- *)
- if test -z "$newPATH"; then
- newPATH=$as_dir
- else
- newPATH=$newPATH$PATH_SEPARATOR$as_dir
- fi
- ;
- esac
- done
- PATH=$newPATH; export PATH
- AC_SUBST(PATH_CLEANED,$newPATH)
- prefix=$oldprefix
</del><ins>+dnl This macro also resets the PATH to a standard value for this system; some
+dnl checks might fail if e.g. /sbin was missing.
+AC_DEFUN([MP_PATH_RESET],[
+ AC_MSG_CHECKING([for a clean \$PATH])
+ PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+ export PATH
+ AC_SUBST(PATH_CLEANED,$PATH)
+ AC_MSG_RESULT([$PATH])
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> dnl This macro tests for sed support of -E (BSD) or -r (GNU)
</span></span></pre></div>
<a id="trunkbaseconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/base/configure.ac (117517 => 117518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure.ac 2014-03-02 14:21:22 UTC (rev 117517)
+++ trunk/base/configure.ac 2014-03-02 16:00:30 UTC (rev 117518)
</span><span class="lines">@@ -14,8 +14,9 @@
</span><span class="cx"> AC_MSG_RESULT([$MACPORTS_VERSION])
</span><span class="cx"> AC_SUBST(MACPORTS_VERSION)
</span><span class="cx">
</span><del>-# Check user PATH for MP paths, and remove as necessary.
-MP_PATH_SCAN
</del><ins>+# Reset user PATH to /usr/bin:/bin:/usr/sbin:/sbin to avoid problems (e.g.
+# when /sbin isn't on the PATH)
+MP_PATH_RESET
</ins><span class="cx">
</span><span class="cx"> AC_PATH_PROG(SW_VERS, sw_vers)
</span><span class="cx"> AC_PATH_PROG(DEFAULTS, defaults)
</span><span class="lines">@@ -109,13 +110,13 @@
</span><span class="cx"> AC_PATH_PROG(CVS, [cvs], [])
</span><span class="cx"> AC_PATH_PROG(DIFF, [diff], [])
</span><span class="cx"> AC_PATH_PROG(DSCL, [dscl], [])
</span><del>-AC_PATH_PROG(DSEDITGROUP, [dseditgroup], [])
</del><ins>+AC_PATH_PROG(DSEDITGROUP, [dseditgroup], [], [$PATH:/usr/sbin])
</ins><span class="cx"> AC_PATH_PROG(FILE, [file], [])
</span><span class="cx"> AC_PATH_PROG(FIND, [find], [])
</span><span class="cx"> AC_PATH_PROG(GIT, [git], [])
</span><del>-AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [], [$PATH:/usr/local/bin])
-AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [], [$PATH:/usr/local/bin])
-AC_PATH_PROGS(GNUTAR, [gnutar gtar], [], [$PATH:/usr/local/bin])
</del><ins>+AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [])
+AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [])
+AC_PATH_PROGS(GNUTAR, [gnutar gtar], [])
</ins><span class="cx"> AC_PATH_PROG(GZIP, [gzip], [])
</span><span class="cx"> AC_PATH_PROG(HDIUTIL, [hdiutil], [])
</span><span class="cx"> AC_PATH_PROG(HG, [hg], [])
</span><span class="lines">@@ -137,7 +138,7 @@
</span><span class="cx"> AC_PATH_PROG(SANDBOX_EXEC, [sandbox-exec], [], [/usr/bin])
</span><span class="cx"> AC_PATH_PROG(SED, [sed])
</span><span class="cx"> AC_PATH_PROG(SVN, [svn], [])
</span><del>-AC_PATH_PROG(SWIG, [swig], [], [$PATH:/usr/local/bin])
</del><ins>+AC_PATH_PROG(SWIG, [swig], [], [])
</ins><span class="cx"> AC_PATH_PROG(TAR, [tar])
</span><span class="cx"> AC_PATH_PROG(UNZIP, [unzip])
</span><span class="cx"> AC_PATH_PROG(XAR, [xar], [])
</span><span class="lines">@@ -146,7 +147,7 @@
</span><span class="cx"> AC_PATH_PROG(XZ, [xz], [])
</span><span class="cx"> AC_PATH_PROG(ZIP, [zip])
</span><span class="cx">
</span><del>-AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], [])
</del><ins>+AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], [], [/sbin])
</ins><span class="cx">
</span><span class="cx"> # Define some precious variables allowing user to override PATH for some programs
</span><span class="cx"> AC_ARG_VAR(BSDMAKE, [path to bsdmake/pmake command])
</span></span></pre>
</div>
</div>
</body>
</html>