Work around fact that gnulib-tool doesn't use m4_copy.

* lib/autoconf/general.m4 (AC_LIBOBJ, AC_LIBSOURCES): Defun, not
define, so that an initial location is present, to account for
fact that gnulib-tool pushes another AC_DEFUN'd macro on top.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 18ac8e0377ad5ec0a0d0b7f15084e43499935ab6..b26d7ca193cd3888c9d55e24c446874ed107556e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-10-24  Eric Blake  <ebb9@byu.net>
 
+       Work around fact that gnulib-tool doesn't use m4_copy.
+       * lib/autoconf/general.m4 (AC_LIBOBJ, AC_LIBSOURCES): Defun, not
+       define, so that an initial location is present, to account for
+       fact that gnulib-tool pushes another AC_DEFUN'd macro on top.
+
        Make m4_defun_init more robust.
        * lib/m4sugar/m4sugar.m4 (m4_defun_init): Handle indirect macro
        names, and correct number of arguments.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 4f13b58e68dc3ed4930db0fbc92fc84d6b7ee10c..299facd063fba34c9195c4dd0c70c5c6f3077c72 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2788,7 +2788,7 @@ m4_define([AC_LIBSOURCE], [])
 # AC_LIBSOURCES([FILE-NAME1, ...])
 # -------------------------------
 # Announce we might need these files.
-m4_define([AC_LIBSOURCES],
+AC_DEFUN([AC_LIBSOURCES],
 [m4_foreach([_AC_FILE_NAME], [$1],
            [AC_LIBSOURCE(_AC_FILE_NAME)])])
 
@@ -2810,7 +2810,7 @@ esac
 # AC_LIBOBJ(FILE-NAME-NOEXT)
 # -------------------------
 # We need `FILE-NAME-NOEXT.o', save this into `LIBOBJS'.
-m4_define([AC_LIBOBJ],
+AC_DEFUN([AC_LIBOBJ],
 [_AC_LIBOBJ([$1],
            [AC_DIAGNOSE(syntax,
                         [$0($1): you should use literals])])dnl