<!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>[125363] 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/125363">125363</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-09-14 12:48:38 -0700 (Sun, 14 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: configure: re-generate after <a href="https://trac.macports.org/changeset/125362">r125362</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 (125362 => 125363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure 2014-09-14 19:27:18 UTC (rev 125362)
+++ trunk/base/configure 2014-09-14 19:48:38 UTC (rev 125363)
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> LAUNCHCTL
</span><span class="cx"> HG
</span><span class="cx"> HDIUTIL
</span><del>-GZIP
</del><ins>+GZIP_BIN
</ins><span class="cx"> GNUTAR
</span><span class="cx"> GNUPATCH
</span><span class="cx"> GNUMAKE
</span><span class="lines">@@ -750,7 +750,7 @@
</span><span class="cx"> CP
</span><span class="cx"> CHOWN
</span><span class="cx"> BZR
</span><del>-BZIP2
</del><ins>+BZIP2_BIN
</ins><span class="cx"> BSDMAKE
</span><span class="cx"> ac_ct_OBJC
</span><span class="cx"> OBJCFLAGS
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> enable_option_checking
</span><span class="cx"> enable_flag_sanitization
</span><span class="cx"> with_bsdmake
</span><del>-with_bzip2
</del><ins>+with_bzip2_bin
</ins><span class="cx"> with_cvs
</span><span class="cx"> with_gnumake
</span><span class="cx"> with_gnutar
</span><span class="lines">@@ -1501,7 +1501,7 @@
</span><span class="cx"> --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
</span><span class="cx"> --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
</span><span class="cx"> --with-bsdmake=PATH Path to alternate bsdmake/pmake command
</span><del>- --with-bzip2=PATH Path to alternate bzip2 command
</del><ins>+ --with-bzip2_bin=PATH Path to alternate bzip2 command
</ins><span class="cx"> --with-cvs=PATH Path to alternate cvs command
</span><span class="cx"> --with-gnumake=PATH Path to alternate gnumake command
</span><span class="cx"> --with-gnutar=PATH Path to alternate gnutar command
</span><span class="lines">@@ -4094,15 +4094,16 @@
</span><span class="cx">
</span><span class="cx"> # Check for user-supplied paths before searching
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # Check whether --with-bsdmake was given.
</span><span class="cx"> if test "${with_bsdmake+set}" = set; then :
</span><span class="cx"> withval=$with_bsdmake; BSDMAKE=$withval
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><del>-# Check whether --with-bzip2 was given.
-if test "${with_bzip2+set}" = set; then :
- withval=$with_bzip2; BZIP2=$withval
</del><ins>+# Check whether --with-bzip2_bin was given.
+if test "${with_bzip2_bin+set}" = set; then :
+ withval=$with_bzip2_bin; BZIP2_BIN=$withval
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -4246,12 +4247,12 @@
</span><span class="cx"> set dummy bzip2; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_BZIP2+:} false; then :
</del><ins>+if ${ac_cv_path_BZIP2_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $BZIP2 in
</del><ins>+ case $BZIP2_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_BZIP2_BIN="$BZIP2_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -4261,7 +4262,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_BZIP2_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -4272,10 +4273,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-BZIP2=$ac_cv_path_BZIP2
-if test -n "$BZIP2"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
</del><ins>+BZIP2_BIN=$ac_cv_path_BZIP2_BIN
+if test -n "$BZIP2_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2_BIN" >&5
+$as_echo "$BZIP2_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -4863,12 +4864,12 @@
</span><span class="cx"> set dummy gzip; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_GZIP+:} false; then :
</del><ins>+if ${ac_cv_path_GZIP_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $GZIP in
</del><ins>+ case $GZIP_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_GZIP_BIN="$GZIP_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -4878,7 +4879,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_GZIP_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -4889,10 +4890,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-GZIP=$ac_cv_path_GZIP
-if test -n "$GZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
-$as_echo "$GZIP" >&6; }
</del><ins>+GZIP_BIN=$ac_cv_path_GZIP_BIN
+if test -n "$GZIP_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP_BIN" >&5
+$as_echo "$GZIP_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -9642,16 +9643,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- # Extract the first word of "gzip", so it can be a program name with args.
</del><ins>+ # Extract the first word of "gzip", so it can be a program name with args.
</ins><span class="cx"> set dummy gzip; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_GZIP+:} false; then :
</del><ins>+if ${ac_cv_path_GZIP_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $GZIP in
</del><ins>+ case $GZIP_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_GZIP_BIN="$GZIP_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -9661,7 +9662,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_GZIP_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -9672,10 +9673,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-GZIP=$ac_cv_path_GZIP
-if test -n "$GZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
-$as_echo "$GZIP" >&6; }
</del><ins>+GZIP_BIN=$ac_cv_path_GZIP_BIN
+if test -n "$GZIP_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP_BIN" >&5
+$as_echo "$GZIP_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -9686,12 +9687,12 @@
</span><span class="cx"> set dummy bzip2; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_BZIP2+:} false; then :
</del><ins>+if ${ac_cv_path_BZIP2_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $BZIP2 in
</del><ins>+ case $BZIP2_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_BZIP2_BIN="$BZIP2_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -9701,7 +9702,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_BZIP2_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -9712,10 +9713,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-BZIP2=$ac_cv_path_BZIP2
-if test -n "$BZIP2"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
</del><ins>+BZIP2_BIN=$ac_cv_path_BZIP2_BIN
+if test -n "$BZIP2_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2_BIN" >&5
+$as_echo "$BZIP2_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -9735,16 +9736,16 @@
</span><span class="cx"> mp_tarball_extract_cmd=
</span><span class="cx"> case "$mp_tarball" in
</span><span class="cx"> *.tar.gz | *.tgz)
</span><del>- if test "x$GZIP" = "x"; then
</del><ins>+ if test "x$GZIP_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "gzip not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$GZIP"
</del><ins>+ mp_tarball_extract_cmd="$GZIP_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *.tar.bz2 | *.tbz2)
</span><del>- if test "x$BZIP2" = "x"; then
</del><ins>+ if test "x$BZIP2_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "bzip2 not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$BZIP2"
</del><ins>+ mp_tarball_extract_cmd="$BZIP2_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
</span><span class="lines">@@ -10059,16 +10060,16 @@
</span><span class="cx"> # Tcl supports Threads internally, but to use threads from Tcl code we need
</span><span class="cx"> # this package
</span><span class="cx">
</span><del>- # Extract the first word of "gzip", so it can be a program name with args.
</del><ins>+ # Extract the first word of "gzip", so it can be a program name with args.
</ins><span class="cx"> set dummy gzip; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_GZIP+:} false; then :
</del><ins>+if ${ac_cv_path_GZIP_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $GZIP in
</del><ins>+ case $GZIP_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_GZIP_BIN="$GZIP_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -10078,7 +10079,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_GZIP_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -10089,10 +10090,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-GZIP=$ac_cv_path_GZIP
-if test -n "$GZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
-$as_echo "$GZIP" >&6; }
</del><ins>+GZIP_BIN=$ac_cv_path_GZIP_BIN
+if test -n "$GZIP_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP_BIN" >&5
+$as_echo "$GZIP_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -10103,12 +10104,12 @@
</span><span class="cx"> set dummy bzip2; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_BZIP2+:} false; then :
</del><ins>+if ${ac_cv_path_BZIP2_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $BZIP2 in
</del><ins>+ case $BZIP2_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_BZIP2_BIN="$BZIP2_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -10118,7 +10119,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_BZIP2_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -10129,10 +10130,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-BZIP2=$ac_cv_path_BZIP2
-if test -n "$BZIP2"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
</del><ins>+BZIP2_BIN=$ac_cv_path_BZIP2_BIN
+if test -n "$BZIP2_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2_BIN" >&5
+$as_echo "$BZIP2_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -10152,16 +10153,16 @@
</span><span class="cx"> mp_tarball_extract_cmd=
</span><span class="cx"> case "$mp_tarball" in
</span><span class="cx"> *.tar.gz | *.tgz)
</span><del>- if test "x$GZIP" = "x"; then
</del><ins>+ if test "x$GZIP_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "gzip not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$GZIP"
</del><ins>+ mp_tarball_extract_cmd="$GZIP_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *.tar.bz2 | *.tbz2)
</span><del>- if test "x$BZIP2" = "x"; then
</del><ins>+ if test "x$BZIP2_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "bzip2 not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$BZIP2"
</del><ins>+ mp_tarball_extract_cmd="$BZIP2_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
</span><span class="lines">@@ -10471,16 +10472,16 @@
</span><span class="cx"> ## TclX package
</span><span class="cx"> # TclX is required for signal handling
</span><span class="cx">
</span><del>- # Extract the first word of "gzip", so it can be a program name with args.
</del><ins>+ # Extract the first word of "gzip", so it can be a program name with args.
</ins><span class="cx"> set dummy gzip; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_GZIP+:} false; then :
</del><ins>+if ${ac_cv_path_GZIP_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $GZIP in
</del><ins>+ case $GZIP_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_GZIP_BIN="$GZIP_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -10490,7 +10491,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_GZIP_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -10501,10 +10502,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-GZIP=$ac_cv_path_GZIP
-if test -n "$GZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
-$as_echo "$GZIP" >&6; }
</del><ins>+GZIP_BIN=$ac_cv_path_GZIP_BIN
+if test -n "$GZIP_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP_BIN" >&5
+$as_echo "$GZIP_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -10515,12 +10516,12 @@
</span><span class="cx"> set dummy bzip2; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_BZIP2+:} false; then :
</del><ins>+if ${ac_cv_path_BZIP2_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $BZIP2 in
</del><ins>+ case $BZIP2_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_BZIP2_BIN="$BZIP2_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -10530,7 +10531,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_BZIP2_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -10541,10 +10542,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-BZIP2=$ac_cv_path_BZIP2
-if test -n "$BZIP2"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
</del><ins>+BZIP2_BIN=$ac_cv_path_BZIP2_BIN
+if test -n "$BZIP2_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2_BIN" >&5
+$as_echo "$BZIP2_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -10564,16 +10565,16 @@
</span><span class="cx"> mp_tarball_extract_cmd=
</span><span class="cx"> case "$mp_tarball" in
</span><span class="cx"> *.tar.gz | *.tgz)
</span><del>- if test "x$GZIP" = "x"; then
</del><ins>+ if test "x$GZIP_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "gzip not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$GZIP"
</del><ins>+ mp_tarball_extract_cmd="$GZIP_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *.tar.bz2 | *.tbz2)
</span><del>- if test "x$BZIP2" = "x"; then
</del><ins>+ if test "x$BZIP2_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "bzip2 not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$BZIP2"
</del><ins>+ mp_tarball_extract_cmd="$BZIP2_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
</span><span class="lines">@@ -10885,16 +10886,16 @@
</span><span class="cx"> # be the one we configure above, because that one isn't built yet. That's not
</span><span class="cx"> # a problem, though -- it's only used during installation.
</span><span class="cx">
</span><del>- # Extract the first word of "gzip", so it can be a program name with args.
</del><ins>+ # Extract the first word of "gzip", so it can be a program name with args.
</ins><span class="cx"> set dummy gzip; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_GZIP+:} false; then :
</del><ins>+if ${ac_cv_path_GZIP_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $GZIP in
</del><ins>+ case $GZIP_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_GZIP_BIN="$GZIP_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -10904,7 +10905,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_GZIP_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -10915,10 +10916,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-GZIP=$ac_cv_path_GZIP
-if test -n "$GZIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
-$as_echo "$GZIP" >&6; }
</del><ins>+GZIP_BIN=$ac_cv_path_GZIP_BIN
+if test -n "$GZIP_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP_BIN" >&5
+$as_echo "$GZIP_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -10929,12 +10930,12 @@
</span><span class="cx"> set dummy bzip2; ac_word=$2
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if ${ac_cv_path_BZIP2+:} false; then :
</del><ins>+if ${ac_cv_path_BZIP2_BIN+:} false; then :
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- case $BZIP2 in
</del><ins>+ case $BZIP2_BIN in
</ins><span class="cx"> [\\/]* | ?:[\\/]*)
</span><del>- ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
</del><ins>+ ac_cv_path_BZIP2_BIN="$BZIP2_BIN" # Let the user override the test with a path.
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span class="lines">@@ -10944,7 +10945,7 @@
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><del>- ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
</del><ins>+ ac_cv_path_BZIP2_BIN="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -10955,10 +10956,10 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx"> fi
</span><del>-BZIP2=$ac_cv_path_BZIP2
-if test -n "$BZIP2"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
</del><ins>+BZIP2_BIN=$ac_cv_path_BZIP2_BIN
+if test -n "$BZIP2_BIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2_BIN" >&5
+$as_echo "$BZIP2_BIN" >&6; }
</ins><span class="cx"> else
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><span class="lines">@@ -10978,16 +10979,16 @@
</span><span class="cx"> mp_tarball_extract_cmd=
</span><span class="cx"> case "$mp_tarball" in
</span><span class="cx"> *.tar.gz | *.tgz)
</span><del>- if test "x$GZIP" = "x"; then
</del><ins>+ if test "x$GZIP_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "gzip not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$GZIP"
</del><ins>+ mp_tarball_extract_cmd="$GZIP_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *.tar.bz2 | *.tbz2)
</span><del>- if test "x$BZIP2" = "x"; then
</del><ins>+ if test "x$BZIP2_BIN" = "x"; then
</ins><span class="cx"> as_fn_error $? "bzip2 not found" "$LINENO" 5
</span><span class="cx"> fi
</span><del>- mp_tarball_extract_cmd="$BZIP2"
</del><ins>+ mp_tarball_extract_cmd="$BZIP2_BIN"
</ins><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
</span></span></pre>
</div>
</div>
</body>
</html>