From: Akim Demaille Date: Sat, 29 Jan 2000 09:46:28 +0000 (+0000) Subject: 1999-11-10 Akim Demaille X-Git-Tag: autoconf-2.50~1264 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=394a96e50d05b4734439b0c4e7110c5cbd30367d;p=thirdparty%2Fautoconf.git 1999-11-10 Akim Demaille No need for foo="`bar`", foo=`bar` is fine. Simplify ${foo} and ${1} into $foo and $1. * acgeneral.m4 (ac_LF_and_DOT): Remove the double quotes. * acspecific.m4 (AC_PROG_CC_C_O, AC_PROG_F77_C_O): Likewise. * autoconf.sh: Likewise. * autoheader.sh: Likewise. * autoreconf.sh: Likewise. * autoupdate.sh: Likewise. * ifnames.sh: Remove all the code and messages related to AC_MACRODIR, since ifnames is not related to macros in anyway. --- diff --git a/ChangeLog b/ChangeLog index 2593f1718..74b93a808 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +1999-11-10 Akim Demaille + + No need for foo="`bar`", foo=`bar` is fine. + Simplify ${foo} and ${1} into $foo and $1. + + * acgeneral.m4 (ac_LF_and_DOT): Remove the double quotes. + * acspecific.m4 (AC_PROG_CC_C_O, AC_PROG_F77_C_O): Likewise. + * autoconf.sh: Likewise. + * autoheader.sh: Likewise. + * autoreconf.sh: Likewise. + * autoupdate.sh: Likewise. + * ifnames.sh: Remove all the code and messages related to + AC_MACRODIR, since ifnames is not related to macros in anyway. + 1999-11-10 Akim Demaille New version of AC_INCLUDE, which does not glob, nor rely upon the diff --git a/acgeneral.m4 b/acgeneral.m4 index 36cab4e07..57924d37f 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -1537,7 +1537,7 @@ else cat <<\EOF_SED >conftestsed s,\\,\\\\,g; s,\$,$$,g EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" + program_transform_name=`echo $program_transform_name|sed -f conftestsed` rm -f conftestsed fi test "$program_prefix" != NONE && @@ -3591,7 +3591,7 @@ EOF # single-quotes doesn't work because, if this script is created in a # platform that uses two characters for line-breaks (e.g., DOS), tr # would break. -ac_LF_and_DOT="`echo; echo .`" +ac_LF_and_DOT=`echo; echo .` DEFS=`sed -f $ac_cs_root.defs confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f $ac_cs_root.defs ]) diff --git a/acspecific.m4 b/acspecific.m4 index a6f009fbd..d06eacb33 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -400,9 +400,9 @@ 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 | changequote(, )dnl - sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'` changequote([, ])dnl AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o, [echo 'foo(){}' >conftest.c @@ -455,9 +455,9 @@ dnl completeness, since a similar test exists for the C compiler. 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 | changequote(, )dnl -sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'` changequote([, ])dnl AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o, [cat >conftest.f <." @@ -72,7 +72,7 @@ esac # single-quotes doesn't work because, if this script is created in a # platform that uses two characters for line-breaks (e.g., DOS), tr # would break. -ac_LF_and_DOT="`echo; echo .`" +ac_LF_and_DOT=`echo; echo .` localdir=. debug=0 @@ -86,7 +86,7 @@ while test $# -gt 0 ; do -d | --debug | --d* ) debug=1; shift ;; --localdir=* | --l*=* ) - localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + localdir=`echo \"${1}\" | sed -e 's/^[^=]*=//'` shift ;; -l | --localdir | --l*) shift @@ -94,7 +94,7 @@ while test $# -gt 0 ; do localdir="${1}" shift ;; --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + AC_MACRODIR=`echo \"${1}\" | sed -e 's/^[^=]*=//'` shift ;; -m | --macrodir | --m* ) shift @@ -161,7 +161,7 @@ if test $debug -eq 0; then rm ./$ah_base.decls; fi # Start each symbol with a blank (to match the blank after "#undef") # to reduce the possibility of mistakenly matching another symbol that # is a substring of it. -syms="`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`" +syms=`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'` # Support "outfile[:infile]", defaulting infile="outfile.in". case "$config_h" in diff --git a/autoheader.sh b/autoheader.sh index a867c4a6b..57939bd1b 100644 --- a/autoheader.sh +++ b/autoheader.sh @@ -30,12 +30,12 @@ Create a template file of C \`#define' statements for \`configure' to use. To this end, scan TEMPLATE-FILE, or \`configure.in' if none given. + -h, --help print this help, then exit + --version print version number, then exit -d, --debug don't remove temporary files -m, --macrodir=DIR directory storing macro files -l, --localdir=DIR directory storing \`aclocal.m4' and \`acconfig.h' -v, --verbose verbosely report processing - -h, --help print this help, then exit - --version print version number, then exit Report bugs to ." @@ -72,7 +72,7 @@ esac # single-quotes doesn't work because, if this script is created in a # platform that uses two characters for line-breaks (e.g., DOS), tr # would break. -ac_LF_and_DOT="`echo; echo .`" +ac_LF_and_DOT=`echo; echo .` localdir=. debug=0 @@ -86,7 +86,7 @@ while test $# -gt 0 ; do -d | --debug | --d* ) debug=1; shift ;; --localdir=* | --l*=* ) - localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + localdir=`echo \"${1}\" | sed -e 's/^[^=]*=//'` shift ;; -l | --localdir | --l*) shift @@ -94,7 +94,7 @@ while test $# -gt 0 ; do localdir="${1}" shift ;; --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + AC_MACRODIR=`echo \"${1}\" | sed -e 's/^[^=]*=//'` shift ;; -m | --macrodir | --m* ) shift @@ -161,7 +161,7 @@ if test $debug -eq 0; then rm ./$ah_base.decls; fi # Start each symbol with a blank (to match the blank after "#undef") # to reduce the possibility of mistakenly matching another symbol that # is a substring of it. -syms="`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`" +syms=`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'` # Support "outfile[:infile]", defaulting infile="outfile.in". case "$config_h" in diff --git a/autoreconf.in b/autoreconf.in index c814d22b8..c337a4604 100644 --- a/autoreconf.in +++ b/autoreconf.in @@ -65,7 +65,7 @@ while test $# -gt 0; do -h | --help | --h*) echo "$usage"; exit 0 ;; --localdir=* | --l*=* ) - localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + localdir=`echo "$1" | sed -e 's/^[^=]*=//'` shift ;; -l | --localdir | --l*) shift @@ -73,7 +73,7 @@ while test $# -gt 0; do localdir="${1}" shift ;; --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"$1\" | sed -e 's/^[^=]*=//'`" + AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'` shift ;; -m | --macrodir | --m*) shift diff --git a/autoreconf.sh b/autoreconf.sh index c814d22b8..c337a4604 100644 --- a/autoreconf.sh +++ b/autoreconf.sh @@ -65,7 +65,7 @@ while test $# -gt 0; do -h | --help | --h*) echo "$usage"; exit 0 ;; --localdir=* | --l*=* ) - localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + localdir=`echo "$1" | sed -e 's/^[^=]*=//'` shift ;; -l | --localdir | --l*) shift @@ -73,7 +73,7 @@ while test $# -gt 0; do localdir="${1}" shift ;; --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"$1\" | sed -e 's/^[^=]*=//'`" + AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'` shift ;; -m | --macrodir | --m*) shift diff --git a/bin/autoheader.in b/bin/autoheader.in index a867c4a6b..57939bd1b 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -30,12 +30,12 @@ Create a template file of C \`#define' statements for \`configure' to use. To this end, scan TEMPLATE-FILE, or \`configure.in' if none given. + -h, --help print this help, then exit + --version print version number, then exit -d, --debug don't remove temporary files -m, --macrodir=DIR directory storing macro files -l, --localdir=DIR directory storing \`aclocal.m4' and \`acconfig.h' -v, --verbose verbosely report processing - -h, --help print this help, then exit - --version print version number, then exit Report bugs to ." @@ -72,7 +72,7 @@ esac # single-quotes doesn't work because, if this script is created in a # platform that uses two characters for line-breaks (e.g., DOS), tr # would break. -ac_LF_and_DOT="`echo; echo .`" +ac_LF_and_DOT=`echo; echo .` localdir=. debug=0 @@ -86,7 +86,7 @@ while test $# -gt 0 ; do -d | --debug | --d* ) debug=1; shift ;; --localdir=* | --l*=* ) - localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + localdir=`echo \"${1}\" | sed -e 's/^[^=]*=//'` shift ;; -l | --localdir | --l*) shift @@ -94,7 +94,7 @@ while test $# -gt 0 ; do localdir="${1}" shift ;; --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + AC_MACRODIR=`echo \"${1}\" | sed -e 's/^[^=]*=//'` shift ;; -m | --macrodir | --m* ) shift @@ -161,7 +161,7 @@ if test $debug -eq 0; then rm ./$ah_base.decls; fi # Start each symbol with a blank (to match the blank after "#undef") # to reduce the possibility of mistakenly matching another symbol that # is a substring of it. -syms="`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`" +syms=`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'` # Support "outfile[:infile]", defaulting infile="outfile.in". case "$config_h" in diff --git a/bin/autoreconf.in b/bin/autoreconf.in index c814d22b8..c337a4604 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -65,7 +65,7 @@ while test $# -gt 0; do -h | --help | --h*) echo "$usage"; exit 0 ;; --localdir=* | --l*=* ) - localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + localdir=`echo "$1" | sed -e 's/^[^=]*=//'` shift ;; -l | --localdir | --l*) shift @@ -73,7 +73,7 @@ while test $# -gt 0; do localdir="${1}" shift ;; --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"$1\" | sed -e 's/^[^=]*=//'`" + AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'` shift ;; -m | --macrodir | --m*) shift diff --git a/bin/ifnames.in b/bin/ifnames.in index 1d47a7171..f1038a7ad 100644 --- a/bin/ifnames.in +++ b/bin/ifnames.in @@ -32,10 +32,9 @@ identifiers that appear in those files in \`#if', \`#elif', \`#ifdef', or \`#ifndef' directives. Print each identifier on a line, followed by a space-separated list of the files in which that identifier occurs. - -m, --macrodir=DIR directory storing macro files -v, --verbose verbosely report processing -h, --help print this help, then exit - --version print version number, then exit + --version print version number, then exit Report bugs to ." @@ -47,20 +46,10 @@ Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -: ${AC_MACRODIR=@datadir@} - while test $# -gt 0; do case "$1" in -h | --help | --h* ) echo "$usage"; exit 0 ;; - --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"$1\" | sed -e 's/^[^=]*=//'`" - shift ;; - -m | --macrodir | --m* ) - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - AC_MACRODIR="$1" - shift ;; --version | --versio | --versi | --vers) echo "$version"; exit 0 ;; --) # Stop option processing. diff --git a/ifnames.in b/ifnames.in index 1d47a7171..f1038a7ad 100644 --- a/ifnames.in +++ b/ifnames.in @@ -32,10 +32,9 @@ identifiers that appear in those files in \`#if', \`#elif', \`#ifdef', or \`#ifndef' directives. Print each identifier on a line, followed by a space-separated list of the files in which that identifier occurs. - -m, --macrodir=DIR directory storing macro files -v, --verbose verbosely report processing -h, --help print this help, then exit - --version print version number, then exit + --version print version number, then exit Report bugs to ." @@ -47,20 +46,10 @@ Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -: ${AC_MACRODIR=@datadir@} - while test $# -gt 0; do case "$1" in -h | --help | --h* ) echo "$usage"; exit 0 ;; - --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"$1\" | sed -e 's/^[^=]*=//'`" - shift ;; - -m | --macrodir | --m* ) - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - AC_MACRODIR="$1" - shift ;; --version | --versio | --versi | --vers) echo "$version"; exit 0 ;; --) # Stop option processing. diff --git a/ifnames.sh b/ifnames.sh index 1d47a7171..f1038a7ad 100644 --- a/ifnames.sh +++ b/ifnames.sh @@ -32,10 +32,9 @@ identifiers that appear in those files in \`#if', \`#elif', \`#ifdef', or \`#ifndef' directives. Print each identifier on a line, followed by a space-separated list of the files in which that identifier occurs. - -m, --macrodir=DIR directory storing macro files -v, --verbose verbosely report processing -h, --help print this help, then exit - --version print version number, then exit + --version print version number, then exit Report bugs to ." @@ -47,20 +46,10 @@ Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -: ${AC_MACRODIR=@datadir@} - while test $# -gt 0; do case "$1" in -h | --help | --h* ) echo "$usage"; exit 0 ;; - --macrodir=* | --m*=* ) - AC_MACRODIR="`echo \"$1\" | sed -e 's/^[^=]*=//'`" - shift ;; - -m | --macrodir | --m* ) - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - AC_MACRODIR="$1" - shift ;; --version | --versio | --versi | --vers) echo "$version"; exit 0 ;; --) # Stop option processing. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 36cab4e07..57924d37f 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1537,7 +1537,7 @@ else cat <<\EOF_SED >conftestsed s,\\,\\\\,g; s,\$,$$,g EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" + program_transform_name=`echo $program_transform_name|sed -f conftestsed` rm -f conftestsed fi test "$program_prefix" != NONE && @@ -3591,7 +3591,7 @@ EOF # single-quotes doesn't work because, if this script is created in a # platform that uses two characters for line-breaks (e.g., DOS), tr # would break. -ac_LF_and_DOT="`echo; echo .`" +ac_LF_and_DOT=`echo; echo .` DEFS=`sed -f $ac_cs_root.defs confdefs.h | tr "$ac_LF_and_DOT" ' .'` rm -f $ac_cs_root.defs ]) diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index a6f009fbd..d06eacb33 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -400,9 +400,9 @@ 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 | changequote(, )dnl - sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'` changequote([, ])dnl AC_CACHE_VAL(ac_cv_prog_cc_${ac_cc}_c_o, [echo 'foo(){}' >conftest.c @@ -455,9 +455,9 @@ dnl completeness, since a similar test exists for the C compiler. 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 | changequote(, )dnl -sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'` changequote([, ])dnl AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o, [cat >conftest.f <