Regenerate.

diff --git a/bin/autoconf.in b/bin/autoconf.in
index cb86e1153a2125effcf7f3464276fed7d2957f3e..1b7aac07c798f11490007aa4afed5bddffefca0c 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -350,7 +350,7 @@ test \$exitcode = 0") || {
 }
 
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -437,6 +437,7 @@ exit 1"
 
 # Variables.
 : ${AUTOM4TE='@bindir@/@autom4te-name@'}
+autom4te_options=
 dir=`(dirname $0) 2>/dev/null ||
 $as_expr X$0 : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X$0 : 'X\(//\)[^/]' \| \
@@ -466,7 +467,7 @@ while test $# -gt 0 ; do
 
     --verbose | -v )
        verbose=echo
-       AUTOM4TE="$AUTOM4TE $1"; shift ;;
+       autom4te_options="$autom4te_options $1"; shift ;;
 
     # Arguments passed as is to autom4te.
     --debug      | -d   | \
@@ -474,14 +475,14 @@ while test $# -gt 0 ; do
     --include=*  | -I?* | \
     --prepend-include=* | -B?* | \
     --warnings=* | -W?* )
-       AUTOM4TE="$AUTOM4TE $1"; shift ;;
+       autom4te_options="$autom4te_options '$1'"; shift ;;
 
     # Options with separated arg passed as is to autom4te.
     --include | -I | \
     --prepend-include | -B | \
     --warnings | -W )
        test $# = 1 && eval "$exit_missing_arg"
-       AUTOM4TE="$AUTOM4TE $option $2"
+       autom4te_options="$autom4te_options $option '$2'"
        shift 2 ;;
 
     --trace=* | -t?* )
@@ -493,7 +494,7 @@ while test $# -gt 0 ; do
        traces="$traces --trace='"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'"
        shift ;;
     --initialization | -i )
-       AUTOM4TE="$AUTOM4TE --melt"
+       autom4te_options="$autom4te_options --melt"
        shift;;
 
     --output=* | -o?* )
@@ -547,6 +548,8 @@ esac
 test -z "$outfile" && outfile=-
 
 # Run autom4te with expansion.
-eval set \$AUTOM4TE --language=autoconf --output=\$outfile "$traces" \$infile
+eval set x $autom4te_options \
+  --language=autoconf --output=\$outfile "$traces" \$infile
+shift
 $verbose "$me: running $*" >&2
-exec "$@"
+exec "$AUTOM4TE" "$@"

diff --git a/tests/wrapper.in b/tests/wrapper.in
index 72f00fcccf4a71c5dfa30c9f533528f91af433ba..550e8212b7694d95eb14a2f8fe7bfa7eba8feef9 100755 (executable)
--- a/tests/wrapper.in
+++ b/tests/wrapper.in
@@ -350,24 +350,24 @@ test \$exitcode = 0") || {
 }
 
 
-testdir=@abs_top_builddir@/tests
+testdir='@abs_top_builddir@/tests'
 AUTOCONF=$testdir/autoconf
 AUTOHEADER=$testdir/autoheader
 AUTOM4TE=$testdir/autom4te
-AUTOM4TE_CFG=@abs_top_builddir@/lib/autom4te.cfg
-autom4te_perllibdir=@abs_top_srcdir@/lib
+AUTOM4TE_CFG='@abs_top_builddir@/lib/autom4te.cfg'
+autom4te_perllibdir='@abs_top_srcdir@/lib'
 export AUTOCONF AUTOHEADER AUTOM4TE AUTOM4TE_CFG autom4te_perllibdir
 
 case $as_me in
   ifnames)
      # Does not have lib files.
-     exec @abs_top_builddir@/bin/$as_me ${1+"$@"}
+     exec '@abs_top_builddir@'/bin/$as_me ${1+"$@"}
      ;;
   *)
      # We might need files from the build tree (frozen files), in
      # addition of src files.
-     exec @abs_top_builddir@/bin/$as_me \
-         -B @abs_top_builddir@/lib \
-         -B @abs_top_srcdir@/lib ${1+"$@"}
+     exec '@abs_top_builddir@'/bin/$as_me \
+         -B '@abs_top_builddir@'/lib \
+         -B '@abs_top_srcdir@/lib' ${1+"$@"}
 esac
 exit 1