* tests/sh.test: Test the config/ltmain.sh and libtoolize in the

build directory not the source directory, where they won't exist
during 'make distcheck'.
* ltmain.in: Revert one line of previous intendation clean-up
to enable one of the sh.test checks to pass.

diff --git a/ChangeLog b/ChangeLog
index ce33d91442f74a785d4e9962645f2926349d7c6a..e0bb012768aaec845eef4fdc048c79acc69073a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-02-13  Scott James Remnant  <scott@netsplit.com>
 
+       * tests/sh.test: Test the config/ltmain.sh and libtoolize in the
+       build directory not the source directory, where they won't exist
+       during 'make distcheck'.
+       * ltmain.in: Revert one line of previous intendation clean-up
+       to enable one of the sh.test checks to pass.
+
        * tests/cdemo/configure.ac: Drop AC_PREREQ back to 2.54, this
        was debris from Gary's cvsapply going mad and wasn't backed
        out.

diff --git a/ltmain.in b/ltmain.in
index 6ed781d4739aa0a6ab7619e1a832e4f9894db8ad..db2d21eafad406bfa85ee9f2aa771e708cae8e84 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -3545,8 +3545,8 @@ EOF
          ;;
        none | unknown | *)
          newdeplibs=""
-         tmp_deplibs=`$echo "X $deplibs" |
-           $Xsed -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+         tmp_deplibs=`$echo "X $deplibs" | $Xsed \
+             -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
          if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
            for i in $predeps $postdeps ; do
              # can't use Xsed below, because $i might contain '/'

diff --git a/tests/sh.test b/tests/sh.test
index 24803e8eac635c17639f84a233e0ee7429ffcec4..dcfb3a850a0ae1ee0a13bf79f6f6f9d2a7e0a8c8 100755 (executable)
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -29,7 +29,7 @@ fi
 
 # Check all the "portable" shell scripts.
 status=$EXIT_SUCCESS
-scripts="$srcdir/../config/ltmain.sh $srcdir/../libtoolize"
+scripts="../config/ltmain.sh ../libtoolize"
 
 # Check for bad binary operators.
 if $EGREP -n -e 'if[   ]+["'\'']?\\$[^         ]+[     ]+(=|-[lg][te]|-eq|-ne)' $scripts; then