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 314a90d2503de5ceaa2fc18579965b2ea6dc4cf0..1d6c7e8970ee19c3bf0899cbb0874f8c296c1621 100644 (file)
--- 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 eeb8aee2a4fc62834147803567a4136c4c309257..86234232bf0dde215b2bc2cea7d5c8dcd890fd15 100644 (file)
--- 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 4fd3bb3e63a534f95f80039fbb384b495fb0d8e2..2435ab26b223aa6ee904c0514f9beedf275e0e02 100755 (executable)
--- 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