From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 26 Sep 2010 11:19:18 +0000 (+0700)
Subject: tests: DRYing out `tests/sh.test'.
X-Git-Tag: v2.4.2.418~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25b333e759ff00ee0b1e17c821c73c72c5a28314;p=thirdparty%2Flibtool.git

tests: DRYing out `tests/sh.test'.

* Makefile.am (libtool_m4): Canonical location of libtool.m4 file.
(lt_aclocal_m4_deps): Use it.
---

diff --git a/ChangeLog b/ChangeLog
index 314a90d25..1d6c7e897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-26  Gary V. Vaughan  <gary@gnu.org>
+
+	tests: DRYing out `tests/sh.test'.
+	* Makefile.am (libtool_m4): Canonical location of libtool.m4 file.
+	(lt_aclocal_m4_deps): Use it.
+
 2010-09-23  Gary V. Vaughan  <gary@gnu.org>
 
 	maint: pass directory declarations in configure.ac into Makefile.
diff --git a/Makefile.am b/Makefile.am
index eeb8aee2a..86234232b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,7 @@ configure_ac	= $(srcdir)/configure.ac
 config_status	= $(top_builddir)/config.status
 libtoolize_in	= $(srcdir)/libtoolize.in
 ltmain_sh	= $(aux_dir)/ltmain.sh
+libtool_m4	= $(macro_dir)/libtool.m4
 ltversion_in	= $(macro_dir)/ltversion.in
 ltversion_m4	= $(macro_dir)/ltversion.m4
 
@@ -338,7 +339,7 @@ $(stamp_mk): $(lt_Makefile_in)
 lt_aclocal_m4_deps = \
 	$(lt_obsolete_m4) \
 	$(ltversion_m4) \
-	$(macro_dir)/libtool.m4 \
+	$(libtool_m4) \
 	$(macro_dir)/ltoptions.m4 \
 	$(macro_dir)/ltdl.m4 \
 	$(macro_dir)/ltsugar.m4 \
diff --git a/tests/sh.test b/tests/sh.test
index 4fd3bb3e6..2435ab26b 100755
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -125,7 +125,7 @@ for s in "$macro_dir/libtool.m4"
 do
   if $SED -n '/case \$cc_basename in/,/esac/ {
 	      /^[ 	]*[a-zA-Z][a-zA-Z0-9+]*[^*][ 	]*)/p
-  	      }'  $s 2>&1 | $EGREP .; then
+	      }'  $s 2>&1 | $EGREP .; then
     echo "\$cc_basename matches should include a trailing \`*' in $s."
     status=$EXIT_FAILURE
   fi