From 0c26326dceef3f9b6a4bf140c3f4dd74eef23a5d Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 10 Oct 2000 00:18:52 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ m4/init.m4 | 2 +- m4/missing.m4 | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddcb7faf..7167c6fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-09 Pavel Roskin + + * 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 * aclocal.in (add_file): Strip comments while scanning for diff --git a/m4/init.m4 b/m4/init.m4 index ef6fb889..613e908b 100644 --- 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 1b6b1f55..d01f3fc4 100644 --- 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 " -- 2.43.5