mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-24 10:54:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* lib/autoconf/general.m4 (_AC_INIT_PREPARE): Use '\'' for an

Browse Source 
apostrophe within a single-quoted string, as this is the usual
tradition and is easier to read than '"'"'.  Don't rely on the
shell treating "$/" like '$/'.  Use a more-consistent indenting
style for the trap.
This commit is contained in:
Paul Eggert 2006-04-09 06:22:28 +00:00
parent a6cd888c4f
commit 92e830d8a0
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-04-08 Paul Eggert <eggert@cs.ucla.edu>
* lib/autoconf/general.m4 (_AC_INIT_PREPARE): Use '\'' for an
apostrophe within a single-quoted string, as this is the usual
tradition and is easier to read than '"'"'. Don't rely on the
shell treating "$/" like '$/'. Use a more-consistent indenting
style for the trap.
2006-04-09 Eric Blake <ebb9@byu.net>
* tests/autotest.at (Backquote command substitution),

17
lib/autoconf/general.m4
View File

@ -1199,8 +1199,9 @@ AS_UNSET(ac_configure_args1)
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
# WARNING: Do not use single quotes inside single quotes.
trap 'exit_status=$?
# WARNING: Use '\'' to represent an apostrophe within the trap.
trap '
exit_status=$?
# Save into config.log some information that might help in debugging.
{
echo
@ -1210,7 +1211,7 @@ trap 'exit_status=$?
m4_bpatsubsts(m4_defn([_AC_CACHE_DUMP]),
[^ *\(#.*\)?
], [],
['], ['"'"'])
['], ['\\''])
echo
AS_BOX([Output variables.])
@ -1218,7 +1219,7 @@ trap 'exit_status=$?
for ac_var in $ac_subst_vars
do
eval ac_val=\$$ac_var
echo "$ac_var='"'"'$ac_val'"'"'"
echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@ -1228,7 +1229,7 @@ trap 'exit_status=$?
for ac_var in $ac_subst_files
do
eval ac_val=\$$ac_var
echo "$ac_var='"'"'$ac_val'"'"'"
echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@ -1236,7 +1237,7 @@ trap 'exit_status=$?
if test -s confdefs.h; then
AS_BOX([confdefs.h.])
echo
sed "/^$/d" confdefs.h | sort
grep . confdefs.h | sort
echo
fi
test "$ac_signal" != 0 &&
@ -1244,9 +1245,9 @@ trap 'exit_status=$?
echo "$as_me: exit $exit_status"
} >&AS_MESSAGE_LOG_FD
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$[$]* $ac_clean_files &&
rm -f -r conftest* confdefs* conf$[$]* $ac_clean_files &&
exit $exit_status
' 0
' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; AS_EXIT([1])' $ac_signal
done