"Derek R. Price" <[EMAIL PROTECTED]> writes:
> AC_REPLACE_FUNCS is still trying to call AC_LIBOBJ_DECL. :(
Pfff, there was no test for AC_REPLACE_FUNCS at all!
Thanks!
Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
acfunctions.m4 was still using the old AC_LIBOBJ_DECL.
Reported by Derek R. Price.
* tests/semantics.at (AC_REPLACE_FUNCS): New test.
* acfunctions.m4 (AC_REPLACE_FUNCS, _AC_LIBOBJ_ALLOCA): Use
AC_LIBSOURCES.
Index: THANKS
===================================================================
RCS file: /cvs/autoconf/THANKS,v
retrieving revision 1.53
diff -u -u -r1.53 THANKS
--- THANKS 2001/01/30 19:29:39 1.53
+++ THANKS 2001/02/05 10:15:58
@@ -32,6 +32,7 @@
Dave Adams [EMAIL PROTECTED]
Dave Love [EMAIL PROTECTED]
David Morgan [EMAIL PROTECTED]
+Derek R. Price [EMAIL PROTECTED]
Didier Desseaux [EMAIL PROTECTED]
Didier Verna [EMAIL PROTECTED]
Dietmar P. Schindler [EMAIL PROTECTED]
Index: acfunctions.m4
===================================================================
RCS file: /cvs/autoconf/acfunctions.m4,v
retrieving revision 1.29
diff -u -u -r1.29 acfunctions.m4
--- acfunctions.m4 2001/02/03 13:22:26 1.29
+++ acfunctions.m4 2001/02/05 10:16:00
@@ -92,7 +92,7 @@
# AC_REPLACE_FUNCS(FUNCTION...)
# -----------------------------
AC_DEFUN([AC_REPLACE_FUNCS],
-[AC_FOREACH([AC_Func], [$1], [AC_LIBOBJ_DECL(AC_Func)])dnl
+[AC_FOREACH([AC_Func], [$1], [AC_LIBSOURCE(AC_Func.c)])dnl
AC_CHECK_FUNCS([$1], , [_AC_LIBOBJ($ac_func)])
])
@@ -129,13 +129,13 @@
# -----------------
# Set up the LIBOBJ replacement of `alloca'. Well, not exactly
# AC_LIBOBJ since we actually set the output variable `ALLOCA'.
-# Nevertheless, for Automake, AC_LIBOBJ_DECL it.
+# Nevertheless, for Automake, AC_LIBSOURCES it.
m4_define([_AC_LIBOBJ_ALLOCA],
[# The SVR3 libPW and SVR4 libucb both contain incompatible functions
# that cause trouble. Some versions do not even contain alloca or
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
-AC_LIBOBJ_DECL(alloca)
+AC_LIBSOURCES(alloca.c)
AC_SUBST(ALLOCA, alloca.$ac_objext)dnl
AC_DEFINE(C_ALLOCA, 1, [Define if using `alloca.c'.])
Index: tests/aclocal.m4
===================================================================
RCS file: /cvs/autoconf/tests/aclocal.m4,v
retrieving revision 1.13
diff -u -u -r1.13 aclocal.m4
--- tests/aclocal.m4 2001/01/24 13:19:11 1.13
+++ tests/aclocal.m4 2001/02/05 10:16:00
@@ -53,5 +53,5 @@
grep '^m4_defn([m4_re_word])=' >state-env.$1
test $? = 0 || rm -f state-env.$1
-ls -1 | egrep -v '^(state.*|config\.)' | sort >state-ls.$1
+ls -1 | egrep -v '^(at-|state-|config\.)' | sort >state-ls.$1
])# AC_STATE_SAVE
Index: tests/semantics.at
===================================================================
RCS file: /cvs/autoconf/tests/semantics.at,v
retrieving revision 1.19
diff -u -u -r1.19 semantics.at
--- tests/semantics.at 2001/01/22 09:03:38 1.19
+++ tests/semantics.at 2001/02/05 10:16:00
@@ -47,6 +47,37 @@
])])
+# AC_REPLACE_FUNCS
+# ----------------
+# Check that it performs the correct actions: autoconf_ftnirp.c must
+# be compiled, and must define HAVE_PRINTF, but not HAVE_AUTOCONF_FTNIRP
+# FIXME: Maybe check the traces?
+AT_SETUP([AC_REPLACE_FUNCS])
+
+AT_DATA([config.in],
+[@LIBOBJS@
+])
+
+AT_CONFIGURE_AC(
+[AC_CONFIG_FILES(config.libobjs:config.in)
+AC_REPLACE_FUNCS(printf autoconf_ftnirp)])
+
+AT_CHECK_AUTOCONF([-W obsolete])
+AT_CHECK_AUTOHEADER
+AT_CHECK_CONFIGURE
+AT_CHECK_ENV
+AT_CHECK_DEFINES(
+[/* #undef HAVE_AUTOCONF_FTNIRP */
+#define HAVE_PRINTF 1
+])
+
+AT_CHECK([sed 's/ */ /g;s/^ //;s/ $//' config.libobjs], [],
+ [autoconf_ftnirp.o
+])
+
+AT_CLEANUP([config.libobjs])
+
+
# AC_CHECK_HEADERS
# ----------------
# Check that it performs the correct actions:
