<!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>[137310] trunk/dports/devel/automake</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/137310">137310</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-06-08 17:21:57 -0700 (Mon, 08 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>automake: Use our compiler and Libtool for tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelautomakePortfile">trunk/dports/devel/automake/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/automake/files/</li>
<li><a href="#trunkdportsdevelautomakefilestestglibtoolpatch">trunk/dports/devel/automake/files/test-glibtool.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelautomakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/automake/Portfile (137309 => 137310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/automake/Portfile 2015-06-09 00:21:55 UTC (rev 137309)
+++ trunk/dports/devel/automake/Portfile 2015-06-09 00:21:57 UTC (rev 137310)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> checksums rmd160 f6b79bd925768c9175f79fdfc64f9a364a2230a5 \
</span><span class="cx"> sha256 7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924
</span><span class="cx">
</span><ins>+patchfiles test-glibtool.patch
+
</ins><span class="cx"> # It should be safe to use the system Perl, since Automake only uses
</span><span class="cx"> # core modules. The configure script recommends 5.8.2 or later, and
</span><span class="cx"> # Tiger has 5.8.6.
</span><span class="lines">@@ -42,6 +44,7 @@
</span><span class="cx"> configure.args --disable-silent-rules
</span><span class="cx">
</span><span class="cx"> test.run yes
</span><ins>+test.env CC=${configure.cc}
</ins><span class="cx"> test.target check
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre></div>
<a id="trunkdportsdevelautomakefilestestglibtoolpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/automake/files/test-glibtool.patch (0 => 137310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/automake/files/test-glibtool.patch (rev 0)
+++ trunk/dports/devel/automake/files/test-glibtool.patch 2015-06-09 00:21:57 UTC (rev 137310)
</span><span class="lines">@@ -0,0 +1,600 @@
</span><ins>+Coerce the testsuite into using our Libtool executables, which are
+"glibtool" and "glibtoolize".
+
+Index: t/ar-lib4.sh
+===================================================================
+--- t/ar-lib4.sh.orig
++++ t/ar-lib4.sh
+@@ -33,7 +33,7 @@ lib_LTLIBRARIES = libfoo.la
+ libfoo_la_SOURCES = foo.c
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ AUTOMAKE_fails
+
+Index: t/ar-lib6a.sh
+===================================================================
+--- t/ar-lib6a.sh.orig
++++ t/ar-lib6a.sh
+@@ -27,7 +27,7 @@ m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_
+ AM_PROG_AR
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF 2>stderr || { cat stderr >&2; exit 1; }
+ cat stderr >&2
+Index: t/ar-lib6b.sh
+===================================================================
+--- t/ar-lib6b.sh.orig
++++ t/ar-lib6b.sh
+@@ -27,7 +27,7 @@ AC_PROG_LIBTOOL
+ AM_PROG_AR
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF 2>stderr || { cat stderr >&2; exit 1; }
+ cat stderr >&2
+Index: t/ax/am-test-lib.sh
+===================================================================
+--- t/ax/am-test-lib.sh.orig
++++ t/ax/am-test-lib.sh
+@@ -862,6 +862,12 @@ require_tool ()
+ $AR -out:defstest.lib \
+ || skip_all_ "Microsoft 'lib' utility not available"
+ ;;
++ libtool|libtoolize)
++ # Look for MacPorts' "g-" prefixed executables.
++ echo "$me: running g$1 --version"
++ (g$1 --version) </dev/null \
++ || skip_all_ "MacPorts' GNU Libtool not available"
++ ;;
+ makedepend)
+ echo "$me: running makedepend -f-"
+ makedepend -f- \
+Index: t/ax/depcomp.sh
+===================================================================
+--- t/ax/depcomp.sh.orig
++++ t/ax/depcomp.sh
+@@ -258,7 +258,7 @@ cat > src/sub2/sub2foo.c <<'END'
+ int sub2foo (void) { return 0; }
+ END
+
+-test $depcomp_with_libtool = no || libtoolize \
++test $depcomp_with_libtool = no || glibtoolize \
+ || fatal_ "libtoolize failed"
+ $ACLOCAL && $AUTOCONF && $AUTOMAKE -a \
+ || fatal_ "autotools failed"
+Index: t/canon7.sh
+===================================================================
+--- t/canon7.sh.orig
++++ t/canon7.sh
+@@ -88,7 +88,7 @@ echo 'const char *dummy_func(void);' > l
+ echo 'const char *dummy_func(void) { return "Dynamic"; }' > libd.c
+ echo 'const char *dummy_func(void) { return "Static"; }' > libs.c
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+Index: t/ccnoco-lt.sh
+===================================================================
+--- t/ccnoco-lt.sh.orig
++++ t/ccnoco-lt.sh
+@@ -43,7 +43,7 @@ END
+ # Make sure the compiler doesn't understand '-c -o'.
+ CC=$am_testaux_builddir/cc-no-c-o; export CC
+
+-libtoolize --verbose --install
++glibtoolize --verbose --install
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --copy --add-missing
+Index: t/cxx-lt-demo.sh
+===================================================================
+--- t/cxx-lt-demo.sh.orig
++++ t/cxx-lt-demo.sh
+@@ -88,7 +88,7 @@ else
+ fi
+ END
+
+-libtoolize --copy
++glibtoolize --copy
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing --copy
+Index: t/depcomp8b.sh
+===================================================================
+--- t/depcomp8b.sh.orig
++++ t/depcomp8b.sh
+@@ -42,7 +42,7 @@ mkdir sub
+ echo 'int foo (void) { return 0; }' > foo.c
+ echo 'int bar (void) { return 0; }' > sub/bar.c
+
+-libtoolize
++glibtoolize
+
+ $ACLOCAL
+ # FIXME: stop disabling the warnings in the 'unsupported' category
+Index: t/extra-deps-lt.sh
+===================================================================
+--- t/extra-deps-lt.sh.orig
++++ t/extra-deps-lt.sh
+@@ -56,7 +56,7 @@ extern int libfoo ();
+ int main () { return libfoo (); }
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOMAKE --add-missing
+ $AUTOCONF
+Index: t/fort5.sh
+===================================================================
+--- t/fort5.sh.orig
++++ t/fort5.sh
+@@ -73,7 +73,7 @@ libgoodbye_la_FCFLAGS =
+ LDADD = $(FCLIBS)
+ END
+
+-libtoolize --force
++glibtoolize --force
+ $ACLOCAL
+ # FIXME: stop disabling the warnings in the 'unsupported' category
+ # FIXME: once the 'subdir-objects' option has been mandatory.
+Index: t/instdir-ltlib.sh
+===================================================================
+--- t/instdir-ltlib.sh.orig
++++ t/instdir-ltlib.sh
+@@ -53,7 +53,7 @@ cp p.c libpy.c
+ cp p.c libnpy.c
+ cp p.c sub/libnpy.c
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing
+Index: t/instfail-libtool.sh
+===================================================================
+--- t/instfail-libtool.sh.orig
++++ t/instfail-libtool.sh
+@@ -50,7 +50,7 @@ for n in 1 2 3; do
+ echo "int fooltn$n () { return 0; }" > libltn$n.c
+ done
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing
+Index: t/libtoo10.sh
+===================================================================
+--- t/libtoo10.sh.orig
++++ t/libtoo10.sh
+@@ -46,7 +46,7 @@ extern int foo ();
+ int main () { return foo (); }
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOMAKE --add-missing
+ $AUTOCONF
+Index: t/libtoo11.sh
+===================================================================
+--- t/libtoo11.sh.orig
++++ t/libtoo11.sh
+@@ -28,7 +28,7 @@ END
+
+ : > Makefile.am
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOMAKE --add-missing
+ $AUTOCONF
+Index: t/libtool-macros.sh
+===================================================================
+--- t/libtool-macros.sh.orig
++++ t/libtool-macros.sh
+@@ -26,7 +26,7 @@ echo : >> get.sh
+ # The 'libtoolize' script will look into Makefile.am.
+ echo ACLOCAL_AMFLAGS = -I m4 > Makefile.am
+
+-if libtoolize --copy --install && test -f m4/libtool.m4; then
++if glibtoolize --copy --install && test -f m4/libtool.m4; then
+ echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
+ echo "export ACLOCAL_PATH" >> get.sh
+ else
+Index: t/libtool3.sh
+===================================================================
+--- t/libtool3.sh.orig
++++ t/libtool3.sh
+@@ -74,7 +74,7 @@ END
+ # 'cp -p' tries to preserve group and owner of the source and fails
+ # to do so under normal accounts. With --copy we ensure we own all files.
+
+-libtoolize --force --copy
++glibtoolize --force --copy
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing --copy
+Index: t/libtool5.sh
+===================================================================
+--- t/libtool5.sh.orig
++++ t/libtool5.sh
+@@ -39,6 +39,6 @@ if COND2
+ endif
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOMAKE --add-missing
+Index: t/libtool6.sh
+===================================================================
+--- t/libtool6.sh.orig
++++ t/libtool6.sh
+@@ -38,7 +38,7 @@ if COND2
+ endif
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOMAKE --add-missing
+ # am_liba_la_rpath is defined twice, and used once
+Index: t/libtool7.sh
+===================================================================
+--- t/libtool7.sh.orig
++++ t/libtool7.sh
+@@ -73,7 +73,7 @@ int main (void)
+ }
+ END
+
+-libtoolize --force --copy
++glibtoolize --force --copy
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing --copy
+Index: t/libtool8.sh
+===================================================================
+--- t/libtool8.sh.orig
++++ t/libtool8.sh
+@@ -43,7 +43,7 @@ LIBTOOLFLAGS = ouch
+ endif
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ AUTOMAKE_fails --add-missing
+ grep libb stderr && exit 1
+Index: t/libtool9.sh
+===================================================================
+--- t/libtool9.sh.orig
++++ t/libtool9.sh
+@@ -78,7 +78,7 @@ int main (void)
+ }
+ END
+
+-libtoolize --force --copy
++glibtoolize --force --copy
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing --copy
+Index: t/ltcond.sh
+===================================================================
+--- t/ltcond.sh.orig
++++ t/ltcond.sh
+@@ -56,7 +56,7 @@ echo 'int two () { return 2; }' >bar.c
+
+ mkdir empty
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing
+Index: t/ltcond2.sh
+===================================================================
+--- t/ltcond2.sh.orig
++++ t/ltcond2.sh
+@@ -80,7 +80,7 @@ int main (void)
+ }
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing
+Index: t/ltconv.sh
+===================================================================
+--- t/ltconv.sh.orig
++++ t/ltconv.sh
+@@ -105,7 +105,7 @@ int main ()
+ }
+ EOF
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing
+Index: t/ltinit.sh
+===================================================================
+--- t/ltinit.sh.orig
++++ t/ltinit.sh
+@@ -43,7 +43,7 @@ int foo (void)
+ }
+ END
+
+-libtoolize
++glibtoolize
+ # Skip if older libtool (pre-2.0) is used.
+ { $ACLOCAL && $AUTOCONF; } || {
+ if test $? -eq 63; then
+Index: t/ltinstloc.sh
+===================================================================
+--- t/ltinstloc.sh.orig
++++ t/ltinstloc.sh
+@@ -38,7 +38,7 @@ endif
+ AUTOMAKE_OPTIONS = subdir-objects
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ AUTOMAKE_fails --add-missing
+Index: t/ltlibsrc.sh
+===================================================================
+--- t/ltlibsrc.sh.orig
++++ t/ltlibsrc.sh
+@@ -49,7 +49,7 @@ END
+ cp foo.c zoo.d/bar.c
+ cp foo.c old_la.c
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ AUTOMAKE_fails -a
+Index: t/ltorder.sh
+===================================================================
+--- t/ltorder.sh.orig
++++ t/ltorder.sh
+@@ -45,7 +45,7 @@ echo 'extern int a3 (); int a4 () { retu
+ echo 'extern int a4 (); int a5 () { return a4 (); }' >liba5.c
+ echo 'extern int a5 (); int main () { return a5 (); }' >p.c
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --add-missing
+Index: t/nobase-libtool.sh
+===================================================================
+--- t/nobase-libtool.sh.orig
++++ t/nobase-libtool.sh
+@@ -63,7 +63,7 @@ cp source.c source2.c
+
+ rm -f install-sh
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a --copy
+Index: t/objc-megademo.sh
+===================================================================
+--- t/objc-megademo.sh.orig
++++ t/objc-megademo.sh
+@@ -84,7 +84,7 @@ END
+
+ ## Run Autotools.
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOHEADER
+ $AUTOCONF
+Index: t/posixsubst-ltlibraries.sh
+===================================================================
+--- t/posixsubst-ltlibraries.sh.orig
++++ t/posixsubst-ltlibraries.sh
+@@ -50,7 +50,7 @@ END
+ echo 'int bar1(void) { return 0; }' > libfoo1.c
+ echo 'int bar2(void) { return 0; }' > libfoo2.c
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+Index: t/pr211.sh
+===================================================================
+--- t/pr211.sh.orig
++++ t/pr211.sh
+@@ -43,7 +43,7 @@ helldl_SOURCES = foo.c
+ libfoo_la_SOURCES = foo.c
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ AUTOMAKE_fails -Wnone -a
+ $FGREP 'foo.$(OBJEXT)' stderr
+Index: t/pr300-ltlib.sh
+===================================================================
+--- t/pr300-ltlib.sh.orig
++++ t/pr300-ltlib.sh
+@@ -39,7 +39,7 @@ cat > a.c << 'END'
+ int i = 3;
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE --copy --add-missing
+Index: t/pr307.sh
+===================================================================
+--- t/pr307.sh.orig
++++ t/pr307.sh
+@@ -64,7 +64,7 @@ for i in a b c d e f g h; do
+ EOF
+ done
+
+-libtoolize --force
++glibtoolize --force
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+Index: t/pr401b.sh
+===================================================================
+--- t/pr401b.sh.orig
++++ t/pr401b.sh
+@@ -79,7 +79,7 @@ EOF
+
+ cp "$am_scriptdir/ar-lib" . || fatal_ "fetching auxiliary script 'ar-lib'"
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+Index: t/reqd2.sh
+===================================================================
+--- t/reqd2.sh.orig
++++ t/reqd2.sh
+@@ -45,7 +45,7 @@ lib0_la_SOURCES = 0.c
+ END
+
+ : > ar-lib
+-libtoolize --force --copy
++glibtoolize --force --copy
+ $ACLOCAL
+ $AUTOCONF
+
+Index: t/silent-lt.sh
+===================================================================
+--- t/silent-lt.sh.orig
++++ t/silent-lt.sh
+@@ -54,7 +54,7 @@ cp libfoo.c libbar.c
+ cp libfoo.c sub/libbaz.c
+ cp libfoo.c sub/libbla.c
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOMAKE --add-missing
+ $AUTOCONF
+Index: t/strip3.sh
+===================================================================
+--- t/strip3.sh.orig
++++ t/strip3.sh
+@@ -36,7 +36,7 @@ END
+ echo 'int main (void) { return 0; }' > foo.c
+ echo 'int foo (void) { return 0; }' > libfoo.c
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+Index: t/subobj-clean-lt-pr10697.sh
+===================================================================
+--- t/subobj-clean-lt-pr10697.sh.orig
++++ t/subobj-clean-lt-pr10697.sh
+@@ -95,7 +95,7 @@ echo ' return 0;' >> main.c
+ echo '}' >> main.c
+ cat main.c # For debugging.
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+Index: t/subobj9.sh
+===================================================================
+--- t/subobj9.sh.orig
++++ t/subobj9.sh
+@@ -61,7 +61,7 @@ int doit2 (void)
+ END
+
+
+-libtoolize --force
++glibtoolize --force
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+@@ -72,7 +72,7 @@ $AUTOMAKE -a
+ export AUTOCONF AUTOMAKE
+
+ # Opportunistically check that --tag=CXX is used when supported.
+-if ./libtool --help | grep tag=TAG; then
++if ./glibtool --help | grep tag=TAG; then
+ run_make -O print
+ grep 'BEG1: .*--tag=CXX.*--mode=compile.* :1END' stdout
+ grep 'BEG2: .*--tag=CXX.*--mode=link.* :2END' stdout
+Index: t/suffix10.tap
+===================================================================
+--- t/suffix10.tap.orig
++++ t/suffix10.tap
+@@ -68,7 +68,7 @@ run_configure ()
+ test $st -eq 0
+ }
+
+-command_ok_ "libtoolize" libtoolize --force
++command_ok_ "libtoolize" glibtoolize --force
+ command_ok_ "aclocal" $ACLOCAL
+ command_ok_ "autoconf" $AUTOCONF
+ command_ok_ "automake" $AUTOMAKE --add-missing
+Index: t/suffix8.tap
+===================================================================
+--- t/suffix8.tap.orig
++++ t/suffix8.tap
+@@ -86,7 +86,7 @@ protect_output ()
+ test $st -eq 0
+ }
+
+-command_ok_ "libtoolize" libtoolize
++command_ok_ "libtoolize" glibtoolize
+ command_ok_ "aclocal" $ACLOCAL
+ command_ok_ "autoconf" $AUTOCONF
+ command_ok_ "automake" $AUTOMAKE -a
+Index: t/vala-libs.sh
+===================================================================
+--- t/vala-libs.sh.orig
++++ t/vala-libs.sh
+@@ -44,7 +44,7 @@ src/zardoz-bar.vala: src/zardoz-foo.vala
+ sed 's/Foo/Bar/g' $< >$@
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ $AUTOCONF
+ $AUTOMAKE -a
+Index: t/vartypo2.sh
+===================================================================
+--- t/vartypo2.sh.orig
++++ t/vartypo2.sh
+@@ -35,7 +35,7 @@ libfoo_la_DEPENDENCIES = unused
+ EXTRA_libfoo_la_DEPENDENCIES = unused
+ END
+
+-libtoolize
++glibtoolize
+ $ACLOCAL
+ AUTOMAKE_fails --add-missing
+ # The expected diagnostic is:
</ins></span></pre>
</div>
</div>
</body>
</html>