* m4/init.m4 (AM_INIT_AUTOMAKE): Don't rely on variable

assignments changing $? - it's broken in ash-0.2.
* m4/missing.m4 (AM_MISSING_HAS_RUN): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ddcb7faf76a71e3a6a7fd3ebefa4628c2f1d300a..7167c6fd8df9bbe8fccd433f5934c3c6f7d09f07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-09  Pavel Roskin  <proski@gnu.org>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Don't rely on variable
+       assignments changing $? - it's broken in ash-0.2.
+       * m4/missing.m4 (AM_MISSING_HAS_RUN): Likewise.
+
 2000-10-06  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * aclocal.in (add_file): Strip comments while scanning for

diff --git a/m4/init.m4 b/m4/init.m4
index ef6fb8897ccb0b58f574d7114dd56f8a7bcc5eba..613e908b171dd2339ddc30dce76b405b482cb728 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -26,7 +26,7 @@ AC_DEFUN([AM_INIT_AUTOMAKE],
 [dnl We require 2.13 because we rely on SHELL being computed by configure.
 AC_REQUIRE([AC_PROG_INSTALL])dnl
 # test to see if srcdir already configured
-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi

diff --git a/m4/missing.m4 b/m4/missing.m4
index 1b6b1f55a4a40063bd5c6250810a98af43554745..d01f3fc49545babc791bfa9c415a34692fdf802a 100644 (file)
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -26,7 +26,7 @@ AC_SUBST(install_sh)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN], [
 test x"${MISSING+set}" = xset || \
-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
+  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run :"; then
   am_missing_run="$MISSING --run "