[SCM] GNU Autoconf source repository branch, master, updated. v2.67-78-g6117b5a
"Eric Blake" <[email protected]> Tue, 21 Sep 2010 23:29:39 +0000
| Newsgroups | gmane.comp.sysutils.autoconf.cvs |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".
http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=6117b5a630834020b77722acd7e76580e113b728
The branch, master has been updated
via 6117b5a630834020b77722acd7e76580e113b728 (commit)
via 043b96c5db243d69f817bebd2ef90dd560625f36 (commit)
from 13418cc969e27f7531bc890545a7c261dbdee7f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6117b5a630834020b77722acd7e76580e113b728
Author: Eric Blake <[email protected]>
Date: Tue Sep 21 17:09:09 2010 -0600
AC_LIBOBJ: optimize internal use
* lib/autoconf/general.m4 (_AC_LIBOBJ): Move literal check...
(AC_LIBOBJ): ...into callers.
* lib/autoconf/functions.m4 (_AC_REPLACE_FUNC): Likewise, thus
avoiding a second call to AS_LITERAL_IF.
Signed-off-by: Eric Blake <[email protected]>
commit 043b96c5db243d69f817bebd2ef90dd560625f36
Author: Eric Blake <[email protected]>
Date: Tue Sep 21 17:00:09 2010 -0600
AC_REPLACE_FUNCS: restore shell loop for non-literal
* lib/autoconf/functions.m4 (AC_REPLACE_FUNCS): Handle
non-literals, which was lost in 2010-02-26 optimization.
* tests/semantics.at (AC_REPLACE_FUNCS): Enhance test.
* NEWS: Document the fix.
* THANKS: Update.
Reported by Wiseman Jun.
Signed-off-by: Eric Blake <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 ++++++++++++++
NEWS | 10 +++++++---
THANKS | 1 +
lib/autoconf/functions.m4 | 8 ++++++--
lib/autoconf/general.m4 | 12 ++++--------
tests/semantics.at | 13 ++++++++++---
6 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f705a59..a1a451a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2010-09-21 Eric Blake <[email protected]>
+ AC_LIBOBJ: optimize internal use
+ * lib/autoconf/general.m4 (_AC_LIBOBJ): Move literal check...
+ (AC_LIBOBJ): ...into callers.
+ * lib/autoconf/functions.m4 (_AC_REPLACE_FUNC): Likewise, thus
+ avoiding a second call to AS_LITERAL_IF.
+
+ AC_REPLACE_FUNCS: restore shell loop for non-literal
+ * lib/autoconf/functions.m4 (AC_REPLACE_FUNCS): Handle
+ non-literals, which was lost in 2010-02-26 optimization.
+ * tests/semantics.at (AC_REPLACE_FUNCS): Enhance test.
+ * NEWS: Document the fix.
+ * THANKS: Update.
+ Reported by Wiseman Jun.
+
maint: resync upstream files
* build-aux/gendocs.sh: Resync via 'make fetch'.
diff --git a/NEWS b/NEWS
index 65013c7..1cae249 100644
--- a/NEWS
+++ b/NEWS
@@ -5,12 +5,16 @@ GNU Autoconf NEWS - User visible changes.
** AC_MSG_ERROR (and AS_ERROR) can once again be followed immediately by
`dnl'. Regression introduced in 2.66.
-** AT_BANNER() with empty argument will cause visual separation from previous
- test category.
-
** AC_INIT again allows URLs with '?' for its BUG-REPORT argument.
Regression introduced in 2.66.
+** AC_REPLACE_FUNCS again allows a non-literal argument, such as a shell
+ variable that expands to a list of functions to check. Regression
+ introduced in 2.66.
+
+** AT_BANNER() with empty argument will cause visual separation from previous
+ test category.
+
** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and
AC_RUN_IFELSE now warn if the first argument failed to use
AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file
diff --git a/THANKS b/THANKS
index 4acb36f..ed871a8 100644
--- a/THANKS
+++ b/THANKS
@@ -414,6 +414,7 @@ Wayne Chapeskie [email protected]
Werner Lemberg [email protected]
Wilfredo Sanchez [email protected]
William Pursell [email protected]
+Wiseman Jun [email protected]
Wolfgang Mueller [email protected]
Yaakov Selkowitz [email protected]
Yavor Doganov [email protected]
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index f03991b..70a7ddf 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -123,7 +123,7 @@ m4_define([_AC_FUNCS_EXPANSION],
m4_define([_AC_REPLACE_FUNC],
[AC_CHECK_FUNC([$1],
[_AH_CHECK_FUNC([$1])AC_DEFINE(AS_TR_CPP([HAVE_$1]))],
- [AC_LIBOBJ([$1])])])
+ [_AC_LIBOBJ([$1])AC_LIBSOURCE([$1.c])])])
# AC_REPLACE_FUNCS(FUNCTION...)
# -----------------------------
@@ -131,8 +131,12 @@ m4_define([_AC_REPLACE_FUNC],
# equivalent of AC_CHECK_FUNC, then call AC_LIBOBJ if the function
# was not found.
AC_DEFUN([AC_REPLACE_FUNCS],
+[AS_LITERAL_IF([$1],
[m4_map_args_w([$1], [_AC_REPLACE_FUNC(], [)
-])])
+])],
+[AC_CHECK_FUNCS([$1],
+ [_AH_CHECK_FUNC([$ac_func])AC_DEFINE(AS_TR_CPP([HAVE_$ac_func]))],
+ [_AC_LIBOBJ([$ac_func])])])])
# AC_TRY_LINK_FUNC(FUNC, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 1410921..59c47ab 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2926,10 +2926,7 @@ AC_DEFUN([AC_LIBSOURCES],
# --------------------------------------------
# We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
m4_define([_AC_LIBOBJ],
-[AS_LITERAL_WORD_IF([$1],
- [AC_LIBSOURCE([$1.c])],
- [$2])dnl
-case " $LIB@&t@OBJS " in
+[case " $LIB@&t@OBJS " in
*" $1.$ac_objext "* ) ;;
*) AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS $1.$ac_objext"]) ;;
esac
@@ -2940,10 +2937,9 @@ esac
# --------------------------
# We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
AC_DEFUN([AC_LIBOBJ],
-[_AC_LIBOBJ([$1],
- [AC_DIAGNOSE(syntax,
- [$0($1): you should use literals])])dnl
-])
+[_AC_LIBOBJ([$1])]dnl
+[AS_LITERAL_WORD_IF([$1], [AC_LIBSOURCE([$1.c])],
+ [AC_DIAGNOSE([syntax], [$0($1): you should use literals])])])
# _AC_LIBOBJS_NORMALIZE
diff --git a/tests/semantics.at b/tests/semantics.at
index 48136cd..9fd08e0 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -176,8 +176,13 @@ AT_DATA([config.in],
])
AT_CONFIGURE_AC(
-[AC_CONFIG_FILES(config.libobjs:config.in)
-AC_REPLACE_FUNCS(printf autoconf_ftnirp)])
+[AC_CONFIG_FILES([config.libobjs:config.in])
+AC_REPLACE_FUNCS([printf autoconf_ftnirp])
+funcs='fprintf autoconf_ftnirpf'
+AH_TEMPLATE([HAVE_FPRINTF], [])
+AH_TEMPLATE([HAVE_AUTOCONF_FTNIRPF], [])
+AC_REPLACE_FUNCS([$funcs])
+AS_UNSET([funcs])])
AT_CHECK_AUTOCONF([-W obsolete])
AT_CHECK_AUTOHEADER
@@ -185,11 +190,13 @@ AT_CHECK_CONFIGURE
AT_CHECK_ENV
AT_CHECK_DEFINES(
[/* #undef HAVE_AUTOCONF_FTNIRP */
+/* #undef HAVE_AUTOCONF_FTNIRPF */
+#define HAVE_FPRINTF 1
#define HAVE_PRINTF 1
])
AT_CHECK([sed 's/ */ /g;s/^ //;s/ $//' config.libobjs], [],
- [${LIBOBJDIR}autoconf_ftnirp$U.o
+ [${LIBOBJDIR}autoconf_ftnirp$U.o ${LIBOBJDIR}autoconf_ftnirpf$U.o
])
AT_CLEANUP
hooks/post-receive
--
GNU Autoconf source repository