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

more fixups

Browse Source
This commit is contained in:
David MacKenzie 1996-11-20 22:53:55 +00:00
parent 85669bdcb1
commit 65bcd04475
6 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -7,9 +7,11 @@ Wed Nov 20 13:00:21 1996 David J MacKenzie <djm@catapult.va.pubnix.com>
* Test release 2.11.1. * Test release 2.11.1.
* acgeneral.m4 (AC_TRY_LIB): Remove an erroneous dnl. * acgeneral.m4 (AC_TRY_COMPILE, AC_TRY_LINK): Make the final
(AC_TRY_COMPILE, AC_TRY_LINK): Make the final newline consistent newline consistent with the other AC_TRY_* macros: no final dnl
with the other AC_TRY_* macros. is needed to avoid extraneous blank lines.
(AC_CHECK_LIB, AC_HAVE_LIBRARY, AC_COMPILE_CHECK): Remove
extraneous dnl's.
(AC_DIVERSION_CMDS, AC_DIVERSION_ICMDS): New macros. (AC_DIVERSION_CMDS, AC_DIVERSION_ICMDS): New macros.
(AC_OUTPUT_COMMANDS, AC_OUTPUT): Use them instead of appending to (AC_OUTPUT_COMMANDS, AC_OUTPUT): Use them instead of appending to
list macros. list macros.

6
acgeneral.m4
View File

@ -1528,7 +1528,7 @@ AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
AC_CACHE_VAL(AC_CV_NAME, AC_CACHE_VAL(AC_CV_NAME,
[ac_save_LIBS="$LIBS" [ac_save_LIBS="$LIBS"
LIBS="-l[]AC_LIB_NAME[] $4 $LIBS" LIBS="-l[]AC_LIB_NAME[] $4 $LIBS"
AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)dnl AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
])dnl ])dnl
AC_MSG_RESULT($AC_CV_NAME) AC_MSG_RESULT($AC_CV_NAME)
@ -1649,7 +1649,7 @@ AC_DEFUN(AC_COMPILE_CHECK,
[AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl [AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl
ifelse([$1], , , [AC_CHECKING([for $1]) ifelse([$1], , , [AC_CHECKING([for $1])
])dnl ])dnl
AC_TRY_LINK([$2], [$3], [$4], [$5])dnl AC_TRY_LINK([$2], [$3], [$4], [$5])
]) ])
dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY, dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY,
@ -1786,7 +1786,7 @@ choke me
#else #else
$1(); $1();
#endif #endif
], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])dnl ], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])
if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])

8
autoconf.texi
View File

@ -3487,11 +3487,9 @@ For example, @samp{broken} or @samp{set}. This part of the name may
be omitted if it does not apply. be omitted if it does not apply.
@end table @end table
Like their names, the values that may be assigned to cache variables The values assigned to cache variables may not contain newlines.
have a few restrictions. The values may not contain single quotes or Usually, their values will be boolean (@samp{yes} or @samp{no}) or the
curly braces. Usually, their values will be boolean (@samp{yes} or names of files or functions; so this is not an important restriction.
@samp{no}) or the names of files or functions; so this is not an
important restriction.
@node Cache Files, , Cache Variable Names, Caching Results @node Cache Files, , Cache Variable Names, Caching Results
@subsection Cache Files @subsection Cache Files

8
doc/autoconf.texi
View File

@ -3487,11 +3487,9 @@ For example, @samp{broken} or @samp{set}. This part of the name may
be omitted if it does not apply. be omitted if it does not apply.
@end table @end table
Like their names, the values that may be assigned to cache variables The values assigned to cache variables may not contain newlines.
have a few restrictions. The values may not contain single quotes or Usually, their values will be boolean (@samp{yes} or @samp{no}) or the
curly braces. Usually, their values will be boolean (@samp{yes} or names of files or functions; so this is not an important restriction.
@samp{no}) or the names of files or functions; so this is not an
important restriction.
@node Cache Files, , Cache Variable Names, Caching Results @node Cache Files, , Cache Variable Names, Caching Results
@subsection Cache Files @subsection Cache Files

6
lib/autoconf/general.m4
View File

@ -1528,7 +1528,7 @@ AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
AC_CACHE_VAL(AC_CV_NAME, AC_CACHE_VAL(AC_CV_NAME,
[ac_save_LIBS="$LIBS" [ac_save_LIBS="$LIBS"
LIBS="-l[]AC_LIB_NAME[] $4 $LIBS" LIBS="-l[]AC_LIB_NAME[] $4 $LIBS"
AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)dnl AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
])dnl ])dnl
AC_MSG_RESULT($AC_CV_NAME) AC_MSG_RESULT($AC_CV_NAME)
@ -1649,7 +1649,7 @@ AC_DEFUN(AC_COMPILE_CHECK,
[AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl [AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl
ifelse([$1], , , [AC_CHECKING([for $1]) ifelse([$1], , , [AC_CHECKING([for $1])
])dnl ])dnl
AC_TRY_LINK([$2], [$3], [$4], [$5])dnl AC_TRY_LINK([$2], [$3], [$4], [$5])
]) ])
dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY, dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY,
@ -1786,7 +1786,7 @@ choke me
#else #else
$1(); $1();
#endif #endif
], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])dnl ], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])
if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])

12
testsuite/config/unix.exp
View File

@ -88,6 +88,18 @@ proc autoconf_load { args } {
return 0 return 0
} }
# Check whether m4 processing left any icky residue.
# The autoconf script does this already, pretty much.
# catch "exec sed -n -e /dnl/p -e /AC_/p $args" exec_output
# if $verbose>1 then {
# send_user "Checked $args for unexpanded m4 macros\n"
# }
# if ![string match "" $exec_output] then {
# fail "$args, unexpanded m4 macros"
# send_log "$exec_output\n"
# return 0
# }
# Capture only stderr in exec_output, not "creating Makefile" etc. # Capture only stderr in exec_output, not "creating Makefile" etc.
catch "exec ./$args --cache=/dev/null >/dev/null" exec_output catch "exec ./$args --cache=/dev/null >/dev/null" exec_output
if $verbose>1 then { if $verbose>1 then {