From: Akim Demaille Date: Tue, 21 Mar 2000 12:03:55 +0000 (+0000) Subject: Uniform idioms. X-Git-Tag: autoconf-2.50~1016 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a80cc62e06be72a7266d92e3e027dce7ad809e4;p=thirdparty%2Fautoconf.git Uniform idioms. * acgeneral.m4 (_AC_OUTPUT_FILES, _AC_OUTPUT_HEADERS, _AC_OUTPUT_LINKS, _AC_OUTPUT_COMMANDS): Prefer for i in : $is; do test $i = : && continue over for i in .. $is; do if test $i != ..; then --- diff --git a/ChangeLog b/ChangeLog index 8d6eb012d..d0e1ad943 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-03-21 Akim Demaille + + Uniform idioms. + + * acgeneral.m4 (_AC_OUTPUT_FILES, _AC_OUTPUT_HEADERS, + _AC_OUTPUT_LINKS, _AC_OUTPUT_COMMANDS): Prefer + for i in : $is; do test $i = : && continue + over + for i in .. $is; do if test $i != ..; then + 2000-03-21 Akim Demaille * acgeneral.m4 (_AC_INIT_PREPARE, _AC_INIT_PARSE_ARGS): Move more diff --git a/acgeneral.m4 b/acgeneral.m4 index bf643d777..2fd84613b 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -3962,7 +3962,7 @@ fi # test -n "$CONFIG_FILES" EOF cat >>$CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in *:*) ac_file_in=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4059,7 +4059,7 @@ ifset([AC_LIST_FILES_COMMANDS], AC_LIST_FILES_COMMANDS()dnl esac ])dnl -fi; done +done rm -f $ac_cs_root.s* EOF ])# _AC_OUTPUT_FILES @@ -4131,7 +4131,7 @@ ac_uB='$%\1#\2define\3' ac_uC=' ' ac_uD='%;t'] -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in *:*) ac_file_in=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4279,7 +4279,7 @@ ifset([AC_LIST_HEADERS_COMMANDS], AC_LIST_HEADERS_COMMANDS()dnl esac ])dnl -fi; done +done EOF ])# _AC_OUTPUT_HEADERS @@ -4301,7 +4301,7 @@ srcdir=$ac_given_srcdir dnl Here we use : instead of .. because if AC_LINK_FILES was used dnl with empty parameters (as in gettext.m4), then we obtain here dnl `:', which we want to skip. So let's keep a single exception: `:'. -for ac_file in : $CONFIG_LINKS; do if test "x$ac_file" != x:; then +for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's%:.*%%'` ac_source=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4344,7 +4344,7 @@ ifset([AC_LIST_LINKS_COMMANDS], AC_LIST_LINKS_COMMANDS()dnl esac ])dnl -fi; done +done EOF ])# _AC_OUTPUT_LINKS @@ -4362,7 +4362,7 @@ define(_AC_OUTPUT_COMMANDS, # # CONFIG_COMMANDS section. # -for ac_file in .. $CONFIG_COMMANDS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's%:.*%%'` ac_source=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4373,7 +4373,7 @@ dnl echo "executing commands of $ac_dest" case "$ac_dest" in AC_LIST_COMMANDS_COMMANDS()dnl esac -fi;done +done EOF ])# _AC_OUTPUT_COMMANDS diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index bf643d777..2fd84613b 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -3962,7 +3962,7 @@ fi # test -n "$CONFIG_FILES" EOF cat >>$CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in *:*) ac_file_in=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4059,7 +4059,7 @@ ifset([AC_LIST_FILES_COMMANDS], AC_LIST_FILES_COMMANDS()dnl esac ])dnl -fi; done +done rm -f $ac_cs_root.s* EOF ])# _AC_OUTPUT_FILES @@ -4131,7 +4131,7 @@ ac_uB='$%\1#\2define\3' ac_uC=' ' ac_uD='%;t'] -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in *:*) ac_file_in=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4279,7 +4279,7 @@ ifset([AC_LIST_HEADERS_COMMANDS], AC_LIST_HEADERS_COMMANDS()dnl esac ])dnl -fi; done +done EOF ])# _AC_OUTPUT_HEADERS @@ -4301,7 +4301,7 @@ srcdir=$ac_given_srcdir dnl Here we use : instead of .. because if AC_LINK_FILES was used dnl with empty parameters (as in gettext.m4), then we obtain here dnl `:', which we want to skip. So let's keep a single exception: `:'. -for ac_file in : $CONFIG_LINKS; do if test "x$ac_file" != x:; then +for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's%:.*%%'` ac_source=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4344,7 +4344,7 @@ ifset([AC_LIST_LINKS_COMMANDS], AC_LIST_LINKS_COMMANDS()dnl esac ])dnl -fi; done +done EOF ])# _AC_OUTPUT_LINKS @@ -4362,7 +4362,7 @@ define(_AC_OUTPUT_COMMANDS, # # CONFIG_COMMANDS section. # -for ac_file in .. $CONFIG_COMMANDS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's%:.*%%'` ac_source=`echo "$ac_file" | sed 's%[[^:]]*:%%'` @@ -4373,7 +4373,7 @@ dnl echo "executing commands of $ac_dest" case "$ac_dest" in AC_LIST_COMMANDS_COMMANDS()dnl esac -fi;done +done EOF ])# _AC_OUTPUT_COMMANDS