Re: m4-1.4q on Tru64Unix

[Gary V. Vaughan]

Martin MOKREJŠ wrote:
> On Thu, 9 Oct 2003, Akim Demaille wrote:
>
>
> > > Martin MOKREJ? wrote:
> > >> configure.ac:241: warning: gl_CHECK_HEADER_wcar_ is m4_require'd but isnot 
> > m4_defun'd
> >
> > > comes from gnulib/acm4/regex.m4:
> >
> > Nope: read better: gl_CHECK_HEADER_wcar_ says m4.  GNU M4 1.4's
> > translit is buggy.  Use this better GNU M4 1.4 instead:
> >
> >         http://www.lrde.epita.fr/~akim/download/m4-1.4.tar.gz
>
>
> OK, I installed this and resynced cvs, built latest m4
>
> I get get around the problem below only with gcc. Can you change the code
> somehow?

Does this patch work for you?  I have no regressions on linux or darwin.

Cheers,
        Gary.
--
  ())_.  Gary V. Vaughan    gary@(lilith.warpmail.net|gnu.org)
  ( '/   Research Scientist http://www.oranda.demon.co.uk       ,_())____
  / )=   GNU Hacker         http://www.gnu.org/software/libtool  \'      `&
`(_~)_   Tech' Author       http://sources.redhat.com/autobook   =`---d__/

Index: m4/m4private.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/m4private.h,v
retrieving revision 1.39
diff -u -p -u -r1.39 m4private.h
--- m4/m4private.h 8 Oct 2003 14:46:12 -0000 1.39
+++ m4/m4private.h 9 Oct 2003 15:05:24 -0000
@@ -312,6 +312,13 @@ struct m4__search_path_info {
          putc ('\n', m4_get_debug_file (C));                           \
        }                                               } M4_STMT_END
 
+
+
+
+/* Convenience macro to zero a variable after freeing it.  */
+#define DELETE(Expr)   ((Expr) = (free (Expr), (void *) 0))
+
+
 #if DEBUG
 # define DEBUG_INPUT
 # define DEBUG_MACRO
Index: m4/system_.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/system_.h,v
retrieving revision 1.8
diff -u -p -u -r1.8 system_.h
--- m4/system_.h 7 Oct 2003 14:10:14 -0000 1.8
+++ m4/system_.h 9 Oct 2003 15:05:24 -0000
@@ -18,7 +18,7 @@
 */
 
 /**
- * @configure_generated@
+ * @configure_output@
  *
  * This file is installed, so cannot rely on the contents of config.h.
  * It works best if included _after_ system headers.
@@ -33,7 +33,14 @@
 @INCLUDE_ERROR_H@
 @INCLUDE_OBSTACK_H@
 @INCLUDE_REGEX_H@
+
+/* These are not in m4's namespace so for safety undefine any errant
+   definitions before including stdbool.h.  */
+#undef bool
+#undef false
+#undef true
 @INCLUDE_STDBOOL_H@
+
 #include <m4/exit.h>
 #include <m4/xalloc.h>
 #include <m4/xstrndup.h>
@@ -146,10 +153,6 @@ BEGIN_C_DECLS
 #  define _CONC(a, b)  a##b
 #  define CONC(a, b)   _CONC(a, b)
 #endif
-
-
-
-#define DELETE(Expr)   ((Expr) = (free (Expr), (void *) 0))
 
 END_C_DECLS
 
Index: modules/perl.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/perl.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 perl.c
--- modules/perl.c 27 Aug 2003 17:10:12 -0000 1.12
+++ modules/perl.c 9 Oct 2003 15:05:24 -0000
@@ -23,6 +23,7 @@
 #undef PACKAGE
 
 #include "perlxsi.c"                   /* Perl stuff */
+#undef try
 #undef _
 
 #include <m4module.h>