* lib/autoconf/status.m4 (_AC_OUTPUT_COMMANDS): Don't output empty

case/esac, some shells don't support it.
Reported by Zack Weinberg.
* tests/torture.at (AC_CONFIG_COMMANDS with empty commands): New.

diff --git a/ChangeLog b/ChangeLog
index fb8dac891d905d4ae146f9e48db315e391a7f2e1..95042805da979c8050b27c6f7b59e8510060db01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-06  Akim Demaille  <akim@epita.fr>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_COMMANDS): Don't output empty
+       case/esac, some shells don't support it.
+       Reported by Zack Weinberg.
+       * tests/torture.at (AC_CONFIG_COMMANDS with empty commands): New.
+
 2002-02-06  Akim Demaille  <akim@epita.fr>
 
        * lib/autotest/general.m4 (AT_INIT): When handling --keywords, be

diff --git a/THANKS b/THANKS
index 36b978fa6a6f02dc53006b1314bdbbf30bc276da..b1fcd33d1859fbfd8ac8c4e985100a2bce950988 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -170,6 +170,7 @@ Volker Borchert             bt@teknon.de
 Werner Lemberg              wl@gnu.org
 Wilfredo Sanchez            wsanchez@apple.com
 Wolfgang Mueller            Wolfgang.Mueller@cui.unige.ch
+Zack Weinberg               zack@codesourcery.com
 
 Many people are not named here because we lost track of them.  We
 thank them!  Please, help us keep this list up to date.

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 5d72affe050bfcb335111f370e58101534df80e1..91450a9693bfe18cb14a0893684f3b425393a00b 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -361,9 +361,12 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   _AC_SRCPATHS(["$ac_dir"])
 
   AC_MSG_NOTICE([executing $ac_dest commands])
-  case $ac_dest in
+dnl Some shells don't like empty case/esac
+m4_ifset([AC_LIST_COMMANDS_COMMANDS],
+[  case $ac_dest in
 AC_LIST_COMMANDS_COMMANDS()dnl
   esac
+])dnl
 done
 _ACEOF
 ])# _AC_OUTPUT_COMMANDS

diff --git a/tests/torture.at b/tests/torture.at
index 7a3e67e04343dcd60a6d39257564d1d32d51acc6..4eda5f941c2130bad93dd095a3cb37efefa59389 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,15 +1,6 @@
 #                                                      -*- Autotest -*-
 
-AT_BANNER([[Testing config.status.
-
-## ---------------------------------------------------------------- ##
-## This section of torture tests is trying to make Autoconf produce ##
-## failing `configure' scripts, which must never happen.  If one of ##
-## these tests ever fails, it is extremely important that you       ##
-## report the failure to bug-autoconf@gnu.org.                      ##
-## ---------------------------------------------------------------- ##]])
-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright 2000, 2001, 2002 (C) Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,6 +18,18 @@ AT_BANNER([[Testing config.status.
 # 02111-1307, USA.
 
 
+AT_BANNER([[Testing config.status.]])
+
+
+## ---------------------------------------- ##
+## AC_CONFIG_COMMANDS with empty commands.  ##
+## ---------------------------------------- ##
+
+AT_CHECK_MACRO([AC_CONFIG_COMMANDS with empty commands],
+[[AC_CONFIG_COMMANDS([foo], [], [:])
+]])
+
+
 ## ------------ ##
 ## AC_ARG_VAR.  ##
 ## ------------ ##
@@ -179,8 +182,7 @@ AT_CHECK_CONFIG_CREATION(command)
 # Create a link
 AT_CHECK_CONFIG_CREATION(link)
 
-AT_CLEANUP(header file link commandvar-header var-file var-link var-command
-           input)
+AT_CLEANUP
 
 
 
@@ -246,7 +248,7 @@ AT_CHECK([./config.status --recheck | sed -n 's/^result=//p'], 0,
          ["'$ " ' $ "'$
 ])
 
-AT_CLEANUP(configure config.status config.log config.cache)
+AT_CLEANUP
 
 
 
@@ -453,7 +455,7 @@ AT_DATA([expout],
 [AT_BIG_VALUE
 ])])
 
-AT_CLEANUP(dummy)
+AT_CLEANUP
 
 
 ## -------- ##
@@ -493,7 +495,7 @@ AT_CHECK([cd at-dir && ../configure], [], [ignore])
 at_here=`pwd`
 AT_CHECK([cd at-dir && $at_here/configure], [], [ignore])
 
-AT_CLEANUP(at-dir foo.in foo)
+AT_CLEANUP
 
 
 ## ----------------- ##