* acgeneral.m4: Simplify all the unjustified `[\$]foo' into

`\$foo', the quotes are needed only for `\$[1]', `\$[@]' etc.
Prefer `$$1' to `[$]$1', `$foo' to `[$]foo', `$[1]' to `[$]1' etc.
* aclang.m4: Likewise.
* acspecific.m4: Likewise.

diff --git a/ChangeLog b/ChangeLog
index dae43f85f876f7ec5fdac74b8453f6284e8c76e9..b0fc579ed8b5777131d4af3e8ee3c45242fe8ba0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-19  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4: Simplify all the unjustified `[\$]foo' into
+       `\$foo', the quotes are needed only for `\$[1]', `\$[@]' etc.
+       Prefer `$$1' to `[$]$1', `$foo' to `[$]foo', `$[1]' to `[$]1' etc.
+       * aclang.m4: Likewise.
+       * acspecific.m4: Likewise.
+
 2000-05-19  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_TRY_COMPILER): Fix quotation.

diff --git a/acgeneral.m4 b/acgeneral.m4
index bc3edaa9f9fc99ca4aefd5c4f0ae8f23ebc4693e..4faefa8b341c5eb46ec7434cecdba1683bd783b6 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -915,7 +915,7 @@ define([_AC_INIT_SRCDIR],
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
-  ac_prog=[$]0
+  ac_prog=$[0]
   ac_confdir=`echo "$ac_prog" | sed 's%/[[^/][^/]]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
@@ -1543,7 +1543,7 @@ running configure, to aid debugging if configure makes a mistake.
 
 It was created by configure ifset([AC_PACKAGE_STRING],
                             [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
- > [$]0 $ac_configure_args
+ > $[0] $ac_configure_args
 " >&AC_FD_LOG
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
@@ -2533,12 +2533,12 @@ ifval([$3], [test -n "$$1" || $1="$3"
 # -----------------------------------------------------------------------
 AC_DEFUN(AC_PATH_PROG,
 [# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
+set dummy $2; ac_word=$[2]
 AC_MSG_CHECKING([for $ac_word])
 AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
+[case "$$1" in
   [[\\/]]* | ?:[[\\/]]*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ac_cv_path_$1="$$1" # Let the user override the test with a path.
   ;;
   *)
   ac_save_ifs=$IFS; IFS=':'
@@ -2556,13 +2556,13 @@ dnl not every word.  This closes a longstanding sh security hole.
   IFS=$ac_save_ifs
 dnl If no 3rd arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
-ifval([$3], [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$3"
+ifval([$3], [  test -z "$ac_cv_path_$1" && ac_cv_path_$1="$3"
 ])dnl
   ;;
 esac])dnl
 $1=$ac_cv_path_$1
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
+if test -n "$$1"; then
+  AC_MSG_RESULT($$1)
 else
   AC_MSG_RESULT(no)
 fi
@@ -2576,10 +2576,10 @@ AC_SUBST($1)dnl
 AC_DEFUN(AC_PATH_PROGS,
 [for ac_prog in $2
 do
-AC_PATH_PROG($1, [$]ac_prog, , $4)
-test -n "[$]$1" && break
+AC_PATH_PROG($1, $ac_prog, , $4)
+test -n "$$1" && break
 done
-ifval([$3], [test -n "[$]$1" || $1="$3"
+ifval([$3], [test -n "$$1" || $1="$3"
 ])])
 
 
@@ -3693,8 +3693,8 @@ define([_AC_LINK_FILES_CNT], incr(_AC_LINK_FILES_CNT))dnl
 ac_sources="$1"
 ac_dests="$2"
 while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=[$]1; shift; ac_dests=[$]*
-  set $ac_sources; ac_source=[$]1; shift; ac_sources=[$]*
+  set $ac_dests; ac_dest=$[1]; shift; ac_dests=$[*]
+  set $ac_sources; ac_source=$[1]; shift; ac_sources=$[*]
   [ac_config_links_]_AC_LINK_FILES_CNT="$[ac_config_links_]_AC_LINK_FILES_CNT $ac_dest:$ac_source"
 done
 AC_CONFIG_LINKS($[ac_config_links_]_AC_LINK_FILES_CNT)dnl
@@ -3947,7 +3947,7 @@ do
     ac_option=`echo "$[1]" | sed -e 's/=.*//'`
     ac_optarg=`echo "$[1]" | sed -e ['s/[^=]*=//']`
     shift
-    set dummy "[\$]ac_option" "$ac_optarg" ${1+"$[@]"}
+    set dummy "$ac_option" "$ac_optarg" ${1+"$[@]"}
     shift
     ;;
   -*);;

diff --git a/aclang.m4 b/aclang.m4
index b7df8c446472fdf78dd309bce4c95220da44054d..1c29aabcea3edc39890acad72ed8d1e52a529ce7 100644 (file)
--- a/aclang.m4
+++ b/aclang.m4
@@ -193,7 +193,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG_SOURCE(C)(BODY)
 # -----------------------
 # This sometimes fails to find confdefs.h, for some reason.
-# #line __oline__ "[$]0"
+# #line __oline__ "$[0]"
 define([AC_LANG_SOURCE(C)],
 [#line __oline__ "configure"
 #include "confdefs.h"
@@ -517,7 +517,7 @@ AC_DEFUN(AC_PROG_CC_C_O,
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
 fi
-set dummy $CC; ac_cc=`echo [$]2 |
+set dummy $CC; ac_cc=`echo $[2] |
                      sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
 [echo 'foo(){}' >conftest.c
@@ -811,7 +811,7 @@ rm -f conftest*
 AC_DEFUN(AC_PROG_F77_C_O,
 [AC_BEFORE([$0], [AC_PROG_F77])dnl
 AC_MSG_CHECKING(whether $F77 understand -c and -o together)
-set dummy $F77; ac_f77=`echo [$]2 |
+set dummy $F77; ac_f77=`echo $[2] |
 sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,
 [cat >conftest.f <<EOF

diff --git a/acspecific.m4 b/acspecific.m4
index 7fb241450d779789e54817c768fab95152da3698..92ff311001e0c21b54089ec22e5dfc438fa1b8b3 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -100,7 +100,7 @@ fi])])
 # Define SET_MAKE to set ${MAKE} if make doesn't.
 AC_DEFUN(AC_PROG_MAKE_SET,
 [AC_MSG_CHECKING(whether ${MAKE-make} sets \${MAKE})
-set dummy ${MAKE-make}; ac_make=`echo "[$]2" | sed 'y%./+-%__p_%'`
+set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y%./+-%__p_%'`
 AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
 [cat >conftestmake <<\EOF
 all:
@@ -1426,11 +1426,11 @@ ac_save_IFS=$IFS; IFS=','
 set dummy `echo "$ac_cv_func_select_args" | sed -e 's/\*/\*/g'`
 IFS=$ac_save_IFS
 shift
-AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG1, [$]1,
+AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG1, $[1],
                    [Define to the type of arg 1 for `select'.])
-AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG234, ([$]2),
+AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG234, ($[2]),
                    [Define to the type of args 2, 3 and 4 for `select'.])
-AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5, ([$]3),
+AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5, ($[3]),
                    [Define to the type of arg 5 for `select'.])
 ])# AC_FUNC_SELECT_ARGTYPES
 

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index b7df8c446472fdf78dd309bce4c95220da44054d..1c29aabcea3edc39890acad72ed8d1e52a529ce7 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -193,7 +193,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG_SOURCE(C)(BODY)
 # -----------------------
 # This sometimes fails to find confdefs.h, for some reason.
-# #line __oline__ "[$]0"
+# #line __oline__ "$[0]"
 define([AC_LANG_SOURCE(C)],
 [#line __oline__ "configure"
 #include "confdefs.h"
@@ -517,7 +517,7 @@ AC_DEFUN(AC_PROG_CC_C_O,
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
 fi
-set dummy $CC; ac_cc=`echo [$]2 |
+set dummy $CC; ac_cc=`echo $[2] |
                      sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
 [echo 'foo(){}' >conftest.c
@@ -811,7 +811,7 @@ rm -f conftest*
 AC_DEFUN(AC_PROG_F77_C_O,
 [AC_BEFORE([$0], [AC_PROG_F77])dnl
 AC_MSG_CHECKING(whether $F77 understand -c and -o together)
-set dummy $F77; ac_f77=`echo [$]2 |
+set dummy $F77; ac_f77=`echo $[2] |
 sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,
 [cat >conftest.f <<EOF

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index b7df8c446472fdf78dd309bce4c95220da44054d..1c29aabcea3edc39890acad72ed8d1e52a529ce7 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -193,7 +193,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG_SOURCE(C)(BODY)
 # -----------------------
 # This sometimes fails to find confdefs.h, for some reason.
-# #line __oline__ "[$]0"
+# #line __oline__ "$[0]"
 define([AC_LANG_SOURCE(C)],
 [#line __oline__ "configure"
 #include "confdefs.h"
@@ -517,7 +517,7 @@ AC_DEFUN(AC_PROG_CC_C_O,
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
 fi
-set dummy $CC; ac_cc=`echo [$]2 |
+set dummy $CC; ac_cc=`echo $[2] |
                      sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
 [echo 'foo(){}' >conftest.c
@@ -811,7 +811,7 @@ rm -f conftest*
 AC_DEFUN(AC_PROG_F77_C_O,
 [AC_BEFORE([$0], [AC_PROG_F77])dnl
 AC_MSG_CHECKING(whether $F77 understand -c and -o together)
-set dummy $F77; ac_f77=`echo [$]2 |
+set dummy $F77; ac_f77=`echo $[2] |
 sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,
 [cat >conftest.f <<EOF

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index bc3edaa9f9fc99ca4aefd5c4f0ae8f23ebc4693e..4faefa8b341c5eb46ec7434cecdba1683bd783b6 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -915,7 +915,7 @@ define([_AC_INIT_SRCDIR],
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
-  ac_prog=[$]0
+  ac_prog=$[0]
   ac_confdir=`echo "$ac_prog" | sed 's%/[[^/][^/]]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
@@ -1543,7 +1543,7 @@ running configure, to aid debugging if configure makes a mistake.
 
 It was created by configure ifset([AC_PACKAGE_STRING],
                             [(AC_PACKAGE_STRING)]) AC_ACVERSION, executed with
- > [$]0 $ac_configure_args
+ > $[0] $ac_configure_args
 " >&AC_FD_LOG
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
@@ -2533,12 +2533,12 @@ ifval([$3], [test -n "$$1" || $1="$3"
 # -----------------------------------------------------------------------
 AC_DEFUN(AC_PATH_PROG,
 [# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
+set dummy $2; ac_word=$[2]
 AC_MSG_CHECKING([for $ac_word])
 AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
+[case "$$1" in
   [[\\/]]* | ?:[[\\/]]*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ac_cv_path_$1="$$1" # Let the user override the test with a path.
   ;;
   *)
   ac_save_ifs=$IFS; IFS=':'
@@ -2556,13 +2556,13 @@ dnl not every word.  This closes a longstanding sh security hole.
   IFS=$ac_save_ifs
 dnl If no 3rd arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
-ifval([$3], [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$3"
+ifval([$3], [  test -z "$ac_cv_path_$1" && ac_cv_path_$1="$3"
 ])dnl
   ;;
 esac])dnl
 $1=$ac_cv_path_$1
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
+if test -n "$$1"; then
+  AC_MSG_RESULT($$1)
 else
   AC_MSG_RESULT(no)
 fi
@@ -2576,10 +2576,10 @@ AC_SUBST($1)dnl
 AC_DEFUN(AC_PATH_PROGS,
 [for ac_prog in $2
 do
-AC_PATH_PROG($1, [$]ac_prog, , $4)
-test -n "[$]$1" && break
+AC_PATH_PROG($1, $ac_prog, , $4)
+test -n "$$1" && break
 done
-ifval([$3], [test -n "[$]$1" || $1="$3"
+ifval([$3], [test -n "$$1" || $1="$3"
 ])])
 
 
@@ -3693,8 +3693,8 @@ define([_AC_LINK_FILES_CNT], incr(_AC_LINK_FILES_CNT))dnl
 ac_sources="$1"
 ac_dests="$2"
 while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=[$]1; shift; ac_dests=[$]*
-  set $ac_sources; ac_source=[$]1; shift; ac_sources=[$]*
+  set $ac_dests; ac_dest=$[1]; shift; ac_dests=$[*]
+  set $ac_sources; ac_source=$[1]; shift; ac_sources=$[*]
   [ac_config_links_]_AC_LINK_FILES_CNT="$[ac_config_links_]_AC_LINK_FILES_CNT $ac_dest:$ac_source"
 done
 AC_CONFIG_LINKS($[ac_config_links_]_AC_LINK_FILES_CNT)dnl
@@ -3947,7 +3947,7 @@ do
     ac_option=`echo "$[1]" | sed -e 's/=.*//'`
     ac_optarg=`echo "$[1]" | sed -e ['s/[^=]*=//']`
     shift
-    set dummy "[\$]ac_option" "$ac_optarg" ${1+"$[@]"}
+    set dummy "$ac_option" "$ac_optarg" ${1+"$[@]"}
     shift
     ;;
   -*);;

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index b7df8c446472fdf78dd309bce4c95220da44054d..1c29aabcea3edc39890acad72ed8d1e52a529ce7 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -193,7 +193,7 @@ AU_DEFUN([AC_LANG_C], [AC_LANG(C)])
 # AC_LANG_SOURCE(C)(BODY)
 # -----------------------
 # This sometimes fails to find confdefs.h, for some reason.
-# #line __oline__ "[$]0"
+# #line __oline__ "$[0]"
 define([AC_LANG_SOURCE(C)],
 [#line __oline__ "configure"
 #include "confdefs.h"
@@ -517,7 +517,7 @@ AC_DEFUN(AC_PROG_CC_C_O,
 else
   AC_MSG_CHECKING(whether cc understands -c and -o together)
 fi
-set dummy $CC; ac_cc=`echo [$]2 |
+set dummy $CC; ac_cc=`echo $[2] |
                      sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o,
 [echo 'foo(){}' >conftest.c
@@ -811,7 +811,7 @@ rm -f conftest*
 AC_DEFUN(AC_PROG_F77_C_O,
 [AC_BEFORE([$0], [AC_PROG_F77])dnl
 AC_MSG_CHECKING(whether $F77 understand -c and -o together)
-set dummy $F77; ac_f77=`echo [$]2 |
+set dummy $F77; ac_f77=`echo $[2] |
 sed -e 's/[[^a-zA-Z0-9_]]/_/g' -e 's/^[[0-9]]/_/'`
 AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o,
 [cat >conftest.f <<EOF

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 7fb241450d779789e54817c768fab95152da3698..92ff311001e0c21b54089ec22e5dfc438fa1b8b3 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -100,7 +100,7 @@ fi])])
 # Define SET_MAKE to set ${MAKE} if make doesn't.
 AC_DEFUN(AC_PROG_MAKE_SET,
 [AC_MSG_CHECKING(whether ${MAKE-make} sets \${MAKE})
-set dummy ${MAKE-make}; ac_make=`echo "[$]2" | sed 'y%./+-%__p_%'`
+set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y%./+-%__p_%'`
 AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
 [cat >conftestmake <<\EOF
 all:
@@ -1426,11 +1426,11 @@ ac_save_IFS=$IFS; IFS=','
 set dummy `echo "$ac_cv_func_select_args" | sed -e 's/\*/\*/g'`
 IFS=$ac_save_IFS
 shift
-AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG1, [$]1,
+AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG1, $[1],
                    [Define to the type of arg 1 for `select'.])
-AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG234, ([$]2),
+AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG234, ($[2]),
                    [Define to the type of args 2, 3 and 4 for `select'.])
-AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5, ([$]3),
+AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5, ($[3]),
                    [Define to the type of arg 5 for `select'.])
 ])# AC_FUNC_SELECT_ARGTYPES