Strip the parameter list before passing the macro name to AH_TEMPLATE.

diff --git a/ChangeLog b/ChangeLog
index 45a31cb10db51f23b9d33c7a5602385173ec7c02..26a1bf51d820c69c3c2fba69732581cd54808d4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
 
 2005-08-23  Stepan Kasal  <kasal@ucw.cz>
 
+       * lib/autoconf/general.m4 (_AC_DEFINE_Q): Strip the parameter list
+       before passing the macro name to AH_TEMPLATE.
+
        * Makefile.maint: Revert the change from 2005-08-12.
 
 2005-08-22  Stepan Kasal  <kasal@ucw.cz>

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 636f61f43e6d4dda3722d60fb4eeacd62ff9fb46..d7d8cdfbf2522bc404e32d65524a6c35b3184d42 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1938,7 +1938,7 @@ m4_define([AC_DEFINE_UNQUOTED], [_AC_DEFINE_Q([], $@)])
 # -----------------------------------------------------
 m4_define([_AC_DEFINE_Q],
 [AC_DEFINE_TRACE([$2])dnl
-m4_ifval([$4], [AH_TEMPLATE([$2], [$4])])dnl
+m4_ifval([$4], [AH_TEMPLATE(m4_bpatsubst([[$2]], [(.*)]), [$4])])dnl
 cat >>confdefs.h <<$1_ACEOF
 [@%:@define] $2 m4_if($#, 2, 1, [$3])
 _ACEOF