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.

diff --git a/ChangeLog b/ChangeLog
index d90e46dc442807860841333dfe504814315bfba6..0c005a14303b1ac99040203e7910d9c1710da991 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-02-05  Akim Demaille  <akim@epita.fr>
+
+       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.
+
 2001-02-03  Pavel Roskin  <proski@gnu.org>
 
        * tests/base.at (AC_TRY_COMMAND): Add a colon between "then" and

diff --git a/THANKS b/THANKS
index 818bb979864d354b6a72876e7a72ab019bc8cf3b..ad67c8134d869a528a90a74d8ad87163eaf9a97e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,7 @@ Daniele Arena         daniele@ripe.net
 Dave Adams             adams@hpesdwa.fc.hp.com
 Dave Love              fx@gnu.org
 David Morgan           dmorgan@symark.com
+Derek R. Price         derek.price@openavenue.com
 Didier Desseaux                didess@infonie.fr
 Didier Verna           didier@xemacs.org
 Dietmar P. Schindler   schd@mra.man.de

diff --git a/acfunctions.m4 b/acfunctions.m4
index 6f4fb0219c463586d4efb94c4dcc7e4fd7aaef7e..048027d60af6dbe1406c6503e133239110935b3e 100644 (file)
--- a/acfunctions.m4
+++ b/acfunctions.m4
@@ -92,7 +92,7 @@ done
 # 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 @@ AU_ALIAS([AC_HAVE_FUNCS], [AC_CHECK_FUNCS])
 # -----------------
 # 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'.])
 

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 6f4fb0219c463586d4efb94c4dcc7e4fd7aaef7e..048027d60af6dbe1406c6503e133239110935b3e 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -92,7 +92,7 @@ done
 # 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 @@ AU_ALIAS([AC_HAVE_FUNCS], [AC_CHECK_FUNCS])
 # -----------------
 # 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'.])
 

diff --git a/tests/aclocal.m4 b/tests/aclocal.m4
index 27f9478c08a62f0d06a94d705c41a23d540700bf..a584c1e585dda2c79338c1a25587a9162513c083 100644 (file)
--- a/tests/aclocal.m4
+++ b/tests/aclocal.m4
@@ -53,5 +53,5 @@ m4_defun([AC_STATE_SAVE],
   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

diff --git a/tests/semantics.at b/tests/semantics.at
index 57defd096476ce9f54eecce9d102483a154eca3c..c17c1835e8c37e522d32fd8934a7eedac8ec9c87 100644 (file)
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -47,6 +47,37 @@ AT_CHECK_MACRO([AC_CHECK_FUNCS],
 ])])
 
 
+# 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: