* autoupdate.sh: Don't dump --help on --wrong-option.

* autoconf.sh: Reformating, and use >&2 instead of 1>&2.
* autoreconf.sh: Likewise.
* autoheader.sh: Likewise.

diff --git a/ChangeLog b/ChangeLog
index bef4fad1dd684df57295800aad3600234f87263e..36b67520243130ca0199b17846130d42a1c42d1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-02-08  Akim Demaille  <akim@epita.fr>
+
+       * autoupdate.sh: Don't dump --help on --wrong-option.
+       * autoconf.sh: Reformating, and use >&2 instead of 1>&2.
+       * autoreconf.sh: Likewise.
+       * autoheader.sh: Likewise.
+
 2000-02-08  Akim Demaille  <akim@epita.fr>
 
        * libm4.m4 (m4_namespace_push, m4_namespace_pop): Use the private

diff --git a/autoconf.in b/autoconf.in
index 739697f29b2f38064d994a4a435109c3405ce3e1..4698dae338d1ad4875e57840d3e31bfe32f2cb25 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -113,7 +113,7 @@ while test $# -gt 0 ; do
        shift ;;
     --localdir | --l* | -l )
        shift
-       test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+       test $# -eq 0 && { echo "$help" >&2; exit 1; }
        localdir="$1"
        shift ;;
     --macrodir=* | --m*=* )
@@ -121,7 +121,7 @@ while test $# -gt 0 ; do
        shift ;;
     --macrodir | --m* | -m )
        shift
-       test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+       test $# -eq 0 && { echo "$help" >&2; exit 1; }
        AC_MACRODIR="$1"
        shift ;;
     --install )
@@ -151,10 +151,10 @@ while test $# -gt 0 ; do
     - )        # Use stdin as input.
        break ;;
     -* )
-        exec 1>&2
-        echo "$me: invalid option $1"
-        echo "$help"
-        exit 1 ;;
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
+       exit 1 ;;
     * )
        break ;;
   esac
@@ -171,7 +171,7 @@ case $# in
   0) infile=configure.in
      test $task = script && test "x$outfile" = x && outfile=configure;;
   1) infile="$1" ;;
-  *) exec 1>&2
+  *) exec >&2
      echo "$me: invalid number of arguments."
      echo "$help"
      exit 1 ;;

diff --git a/autoconf.sh b/autoconf.sh
index 739697f29b2f38064d994a4a435109c3405ce3e1..4698dae338d1ad4875e57840d3e31bfe32f2cb25 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -113,7 +113,7 @@ while test $# -gt 0 ; do
        shift ;;
     --localdir | --l* | -l )
        shift
-       test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+       test $# -eq 0 && { echo "$help" >&2; exit 1; }
        localdir="$1"
        shift ;;
     --macrodir=* | --m*=* )
@@ -121,7 +121,7 @@ while test $# -gt 0 ; do
        shift ;;
     --macrodir | --m* | -m )
        shift
-       test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+       test $# -eq 0 && { echo "$help" >&2; exit 1; }
        AC_MACRODIR="$1"
        shift ;;
     --install )
@@ -151,10 +151,10 @@ while test $# -gt 0 ; do
     - )        # Use stdin as input.
        break ;;
     -* )
-        exec 1>&2
-        echo "$me: invalid option $1"
-        echo "$help"
-        exit 1 ;;
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
+       exit 1 ;;
     * )
        break ;;
   esac
@@ -171,7 +171,7 @@ case $# in
   0) infile=configure.in
      test $task = script && test "x$outfile" = x && outfile=configure;;
   1) infile="$1" ;;
-  *) exec 1>&2
+  *) exec >&2
      echo "$me: invalid number of arguments."
      echo "$help"
      exit 1 ;;

diff --git a/autoheader.in b/autoheader.in
index 1e071bf660e1eb741a11c331a3cea760192aff2e..7746a16c3cd91afea73e2549a3d40aa1389f4ae7 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -97,7 +97,7 @@ while test $# -gt 0 ; do
          shift ;;
       -l | --localdir | --l*)
          shift
-         test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+         test $# -eq 0 && { echo "$help" >&2; exit 1; }
          localdir=$1
          shift ;;
       --macrodir=* | --m*=* )
@@ -105,7 +105,7 @@ while test $# -gt 0 ; do
          shift ;;
       -m | --macrodir | --m* )
          shift
-         test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+         test $# -eq 0 && { echo "$help" >&2; exit 1; }
          AC_MACRODIR=$1
          shift ;;
       -- )     # Stop option processing
@@ -113,7 +113,7 @@ while test $# -gt 0 ; do
       - )     # Use stdin as input.
         break ;;
       -* )
-        exec 1>&2
+        exec >&2
         echo "$me: invalid option $1"
         echo "$help"
         exit 1 ;;
@@ -128,7 +128,7 @@ test -r $localdir/acconfig.h && acconfigs="$acconfigs $localdir/acconfig.h"
 case $# in
   0) infile=configure.in ;;
   1) infile=$1 ;;
-  *) exec 1>&2
+  *) exec >&2
      echo "$me: invalid number of arguments."
      echo "$help"
      exit 1 ;;

diff --git a/autoheader.sh b/autoheader.sh
index 1e071bf660e1eb741a11c331a3cea760192aff2e..7746a16c3cd91afea73e2549a3d40aa1389f4ae7 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -97,7 +97,7 @@ while test $# -gt 0 ; do
          shift ;;
       -l | --localdir | --l*)
          shift
-         test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+         test $# -eq 0 && { echo "$help" >&2; exit 1; }
          localdir=$1
          shift ;;
       --macrodir=* | --m*=* )
@@ -105,7 +105,7 @@ while test $# -gt 0 ; do
          shift ;;
       -m | --macrodir | --m* )
          shift
-         test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+         test $# -eq 0 && { echo "$help" >&2; exit 1; }
          AC_MACRODIR=$1
          shift ;;
       -- )     # Stop option processing
@@ -113,7 +113,7 @@ while test $# -gt 0 ; do
       - )     # Use stdin as input.
         break ;;
       -* )
-        exec 1>&2
+        exec >&2
         echo "$me: invalid option $1"
         echo "$help"
         exit 1 ;;
@@ -128,7 +128,7 @@ test -r $localdir/acconfig.h && acconfigs="$acconfigs $localdir/acconfig.h"
 case $# in
   0) infile=configure.in ;;
   1) infile=$1 ;;
-  *) exec 1>&2
+  *) exec >&2
      echo "$me: invalid number of arguments."
      echo "$help"
      exit 1 ;;

diff --git a/autoreconf.in b/autoreconf.in
index 9daff96c7b540ea37db2b51c89ff2bf7bd0b01fc..c51cfc0b899e1d2f00c6b9264baa86e6b205faf2 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -74,7 +74,7 @@ while test $# -gt 0; do
     shift ;;
   --localdir | --l* | -l )
     shift
-    test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+    test $# -eq 0 && { echo "$help" >&2; exit 1; }
     localdir="${1}"
     shift ;;
   --macrodir=* | --m*=* )
@@ -82,7 +82,7 @@ while test $# -gt 0; do
     shift ;;
   --macrodir | --m* | -m )
     shift
-    test $# -eq 0 && { echo "help" 1>&2; exit 1; }
+    test $# -eq 0 && { echo "help" >&2; exit 1; }
     AC_MACRODIR="$1"
     shift ;;
   -v | --verbose | --verb*)
@@ -98,7 +98,7 @@ while test $# -gt 0; do
   --)     # Stop option processing.
     shift; break ;;
   -*)
-    exec 1>&2
+    exec >&2
     echo "$me: invalid option $1"
     echo "$help"
     exit 1 ;;
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 done
 
 if test $# -ne 0; then
-  exec 1>&2
+  exec >&2
   echo "$me: invalid number of arguments."
   echo "$help"
   exit 1 ;;

diff --git a/autoreconf.sh b/autoreconf.sh
index 9daff96c7b540ea37db2b51c89ff2bf7bd0b01fc..c51cfc0b899e1d2f00c6b9264baa86e6b205faf2 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -74,7 +74,7 @@ while test $# -gt 0; do
     shift ;;
   --localdir | --l* | -l )
     shift
-    test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+    test $# -eq 0 && { echo "$help" >&2; exit 1; }
     localdir="${1}"
     shift ;;
   --macrodir=* | --m*=* )
@@ -82,7 +82,7 @@ while test $# -gt 0; do
     shift ;;
   --macrodir | --m* | -m )
     shift
-    test $# -eq 0 && { echo "help" 1>&2; exit 1; }
+    test $# -eq 0 && { echo "help" >&2; exit 1; }
     AC_MACRODIR="$1"
     shift ;;
   -v | --verbose | --verb*)
@@ -98,7 +98,7 @@ while test $# -gt 0; do
   --)     # Stop option processing.
     shift; break ;;
   -*)
-    exec 1>&2
+    exec >&2
     echo "$me: invalid option $1"
     echo "$help"
     exit 1 ;;
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 done
 
 if test $# -ne 0; then
-  exec 1>&2
+  exec >&2
   echo "$me: invalid number of arguments."
   echo "$help"
   exit 1 ;;

diff --git a/bin/autoconf.in b/bin/autoconf.in
index 739697f29b2f38064d994a4a435109c3405ce3e1..4698dae338d1ad4875e57840d3e31bfe32f2cb25 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -113,7 +113,7 @@ while test $# -gt 0 ; do
        shift ;;
     --localdir | --l* | -l )
        shift
-       test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+       test $# -eq 0 && { echo "$help" >&2; exit 1; }
        localdir="$1"
        shift ;;
     --macrodir=* | --m*=* )
@@ -121,7 +121,7 @@ while test $# -gt 0 ; do
        shift ;;
     --macrodir | --m* | -m )
        shift
-       test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+       test $# -eq 0 && { echo "$help" >&2; exit 1; }
        AC_MACRODIR="$1"
        shift ;;
     --install )
@@ -151,10 +151,10 @@ while test $# -gt 0 ; do
     - )        # Use stdin as input.
        break ;;
     -* )
-        exec 1>&2
-        echo "$me: invalid option $1"
-        echo "$help"
-        exit 1 ;;
+       exec >&2
+       echo "$me: invalid option $1"
+       echo "$help"
+       exit 1 ;;
     * )
        break ;;
   esac
@@ -171,7 +171,7 @@ case $# in
   0) infile=configure.in
      test $task = script && test "x$outfile" = x && outfile=configure;;
   1) infile="$1" ;;
-  *) exec 1>&2
+  *) exec >&2
      echo "$me: invalid number of arguments."
      echo "$help"
      exit 1 ;;

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 1e071bf660e1eb741a11c331a3cea760192aff2e..7746a16c3cd91afea73e2549a3d40aa1389f4ae7 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -97,7 +97,7 @@ while test $# -gt 0 ; do
          shift ;;
       -l | --localdir | --l*)
          shift
-         test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+         test $# -eq 0 && { echo "$help" >&2; exit 1; }
          localdir=$1
          shift ;;
       --macrodir=* | --m*=* )
@@ -105,7 +105,7 @@ while test $# -gt 0 ; do
          shift ;;
       -m | --macrodir | --m* )
          shift
-         test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+         test $# -eq 0 && { echo "$help" >&2; exit 1; }
          AC_MACRODIR=$1
          shift ;;
       -- )     # Stop option processing
@@ -113,7 +113,7 @@ while test $# -gt 0 ; do
       - )     # Use stdin as input.
         break ;;
       -* )
-        exec 1>&2
+        exec >&2
         echo "$me: invalid option $1"
         echo "$help"
         exit 1 ;;
@@ -128,7 +128,7 @@ test -r $localdir/acconfig.h && acconfigs="$acconfigs $localdir/acconfig.h"
 case $# in
   0) infile=configure.in ;;
   1) infile=$1 ;;
-  *) exec 1>&2
+  *) exec >&2
      echo "$me: invalid number of arguments."
      echo "$help"
      exit 1 ;;

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 9daff96c7b540ea37db2b51c89ff2bf7bd0b01fc..c51cfc0b899e1d2f00c6b9264baa86e6b205faf2 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -74,7 +74,7 @@ while test $# -gt 0; do
     shift ;;
   --localdir | --l* | -l )
     shift
-    test $# -eq 0 && { echo "$help" 1>&2; exit 1; }
+    test $# -eq 0 && { echo "$help" >&2; exit 1; }
     localdir="${1}"
     shift ;;
   --macrodir=* | --m*=* )
@@ -82,7 +82,7 @@ while test $# -gt 0; do
     shift ;;
   --macrodir | --m* | -m )
     shift
-    test $# -eq 0 && { echo "help" 1>&2; exit 1; }
+    test $# -eq 0 && { echo "help" >&2; exit 1; }
     AC_MACRODIR="$1"
     shift ;;
   -v | --verbose | --verb*)
@@ -98,7 +98,7 @@ while test $# -gt 0; do
   --)     # Stop option processing.
     shift; break ;;
   -*)
-    exec 1>&2
+    exec >&2
     echo "$me: invalid option $1"
     echo "$help"
     exit 1 ;;
@@ -107,7 +107,7 @@ while test $# -gt 0; do
 done
 
 if test $# -ne 0; then
-  exec 1>&2
+  exec >&2
   echo "$me: invalid number of arguments."
   echo "$help"
   exit 1 ;;