[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-52-g9fe8259

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9fe8259884e73d48c1962ba69cbb9aa59050b000

The branch, master has been updated
       via  9fe8259884e73d48c1962ba69cbb9aa59050b000 (commit)
      from  763de95bebe871a69b2e9378dca5a0db6834077b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9fe8259884e73d48c1962ba69cbb9aa59050b000
Author: Ralf Wildenhues <address@hidden>
Date:   Sun May 3 09:32:44 2009 +0200

    Disable test cleanup trap with OSF1/Tru64 sh.
    
    * configure.ac: Test whether /bin/sh has working 'set -e'
    in conjunction with an exit trap.  Set $am_cv_sh_errexit_works
    accordingly, substitute sh_errexit_works, and warn about
    leftover test directories with broken shells like Tru64 /bin/sh.
    * tests/defs.in: Do not install any traps with broken shells.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                      |    9 +++++++++
 Makefile.in                    |    1 +
 configure                      |   27 +++++++++++++++++++++++++++
 configure.ac                   |   17 +++++++++++++++++
 doc/Makefile.in                |    1 +
 lib/Automake/Makefile.in       |    1 +
 lib/Automake/tests/Makefile.in |    1 +
 lib/Makefile.in                |    1 +
 lib/am/Makefile.in             |    1 +
 m4/Makefile.in                 |    1 +
 tests/Makefile.in              |    1 +
 tests/defs.in                  |   33 ++++++++++++++++++---------------
 12 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2560eeb..c8e4689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-03  Ralf Wildenhues  <address@hidden>
+
+       Disable test cleanup trap with OSF1/Tru64 sh.
+       * configure.ac: Test whether /bin/sh has working 'set -e'
+       in conjunction with an exit trap.  Set $am_cv_sh_errexit_works
+       accordingly, substitute sh_errexit_works, and warn about
+       leftover test directories with broken shells like Tru64 /bin/sh.
+       * tests/defs.in: Do not install any traps with broken shells.
+
 2009-05-02  Bruno Haible  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/Makefile.in b/Makefile.in
index 34193e8..320635a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -210,6 +210,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/configure b/configure
index e73a0bd..6fb2ae7 100755
--- a/configure
+++ b/configure
@@ -603,6 +603,7 @@ PACKAGE_BUGREPORT='address@hidden'
 ac_unique_file="automake.in"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sh_errexit_works
 FGREP
 EGREP
 GREP
@@ -2818,6 +2819,32 @@ $as_echo "$ac_cv_path_FGREP" >&6; }
 
 
 
+{ $as_echo "$as_me:$LINENO: checking whether /bin/sh has working 'set -e' with 
exit trap" >&5
+$as_echo_n "checking whether /bin/sh has working 'set -e' with exit trap... " 
>&6; }
+if test "${am_cv_sh_errexit_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if /bin/sh -ec "trap 'exit \$?' 0; (exit 77); exit 77"; test $? = 77
+then
+  am_cv_sh_errexit_works=yes
+else
+  am_cv_sh_errexit_works=no
+fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_sh_errexit_works" >&5
+$as_echo "$am_cv_sh_errexit_works" >&6; }
+if test $am_cv_sh_errexit_works = no; then
+  { $as_echo "$as_me:$LINENO: WARNING: \`${MAKE-make} check' will leave 
leftover directories tests/*.dir" >&5
+$as_echo "$as_me: WARNING: \`${MAKE-make} check' will leave leftover 
directories tests/*.dir" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: you can clean them up manually using 
\`${MAKE-make} clean' or" >&5
+$as_echo "$as_me: WARNING: you can clean them up manually using \`${MAKE-make} 
clean' or" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: \`cd tests && ${MAKE-make} 
clean-local-check'" >&5
+$as_echo "$as_me: WARNING: \`cd tests && ${MAKE-make} clean-local-check'" >&2;}
+  fi
+sh_errexit_works=$am_cv_sh_errexit_works
+
+
 ac_config_files="$ac_config_files Makefile doc/Makefile lib/Automake/Makefile 
lib/Automake/tests/Makefile lib/Makefile lib/am/Makefile m4/Makefile 
tests/Makefile tests/defs"
 
 ac_config_files="$ac_config_files tests/aclocal-${APIVERSION}:tests/aclocal.in"
diff --git a/configure.ac b/configure.ac
index 4229d68..e3c8535 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,23 @@ AC_SUBST([MODIFICATION_DELAY])
 AC_PROG_EGREP
 AC_PROG_FGREP
 
+AC_CACHE_CHECK([whether /bin/sh has working 'set -e' with exit trap],
+[am_cv_sh_errexit_works],
+[if /bin/sh -ec "trap 'exit \$?' 0; (exit 77); exit 77"; test $? = 77
+then
+  am_cv_sh_errexit_works=yes
+else
+  am_cv_sh_errexit_works=no
+fi
+])
+if test $am_cv_sh_errexit_works = no; then
+  AC_MSG_WARN([`${MAKE-make} check' will leave leftover directories 
tests/*.dir])
+  AC_MSG_WARN([you can clean them up manually using `${MAKE-make} clean' or])
+  AC_MSG_WARN([`cd tests && ${MAKE-make} clean-local-check'])
+  dnl restore font-lock: `
+fi
+AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works])
+
 AC_CONFIG_FILES([
   Makefile
   doc/Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 189cdfb..6433ad8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -178,6 +178,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index f649390..9a62aa2 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -197,6 +197,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 222f751..9f3a097 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -213,6 +213,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ee031a9..ba470fe 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -200,6 +200,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index ce96885..84d09f0 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -157,6 +157,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 7cc2c68..bb7bbf9 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -157,6 +157,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3125d04..d735afa 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -217,6 +217,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
+sh_errexit_works = @sh_errexit_works@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
diff --git a/tests/defs.in b/tests/defs.in
index d44ac9f..47e1c3a 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -251,21 +251,24 @@ chmod -R u+rwx $testSubDir > /dev/null 2>&1
 rm -rf $testSubDir > /dev/null 2>&1
 mkdir $testSubDir
 
-trap 'exit_status=$?
-  cd "$curdir"
-  case $exit_status,$keep_testdirs in
-  0,)
-    chmod -R a+rwx $testSubDir > /dev/null 2>&1
-    rm -rf "$testSubDir" ;;
-  esac
-  test "$signal" != 0 &&
-    echo "$as_me: caught signal $signal"
-  echo "$as_me: exit $exit_status"
-  exit $exit_status
-' 0
-for signal in 1 2 13 15; do
-  trap 'signal='$signal'; { Exit 1; }' $signal
-done
address@hidden@
+if test "$sh_errexit_works" = yes; then
+  trap 'exit_status=$?
+    cd "$curdir"
+    case $exit_status,$keep_testdirs in
+    0,)
+      chmod -R a+rwx $testSubDir > /dev/null 2>&1
+      rm -rf "$testSubDir" ;;
+    esac
+    test "$signal" != 0 &&
+      echo "$as_me: caught signal $signal"
+    echo "$as_me: exit $exit_status"
+    exit $exit_status
+  ' 0
+  for signal in 1 2 13 15; do
+    trap 'signal='$signal'; { Exit 1; }' $signal
+  done
+fi
 signal=0
 
 # Copy in some files we need.


hooks/post-receive
-- 
GNU Automake