diff options
| author | Eric Blake <ebb9@byu.net> | 2008-10-24 12:09:48 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-10-24 12:09:48 -0600 |
| commit | 6369d61222cbc8f1c930d4ed79cbdd2745178d55 (patch) | |
| tree | 7d0b11ade87cb1c54ebe57f33d2745494ae980d3 | |
| parent | b4bb9caba25dbbbc8576fa907be9ed1dff05652d (diff) | |
| download | autoconf-6369d61222cbc8f1c930d4ed79cbdd2745178d55.tar.gz | |
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>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/autoconf/general.m4 | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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 4f13b58e..299facd0 100644 --- 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 |