Re: another gnulib update

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 2/23/2007 10:05 AM:
> 
> Another gnulib update during my 2-week vacation got rid of exit.h.  At this 
> point, because of the number of extensive gnulib changes, I'm thinking of 
> releasing m4 1.4.8b to alpha.gnu.org, and soliciting build sanity checks prior 
> to formally releasing 1.4.9.

And ported to head.  This is a bit trickier, since my understanding is
that the eventual goal is to have m4 install several headers from gnulib
under $(prefix)/include/m4/gnu, so that a user can create modules by
compiling with -I$(prefix)/include/m4, then doing #include "m4module.h"
(which picks up the installed system.h, and thus any installed gnulib
headers).  And since config.h should not be installed, we must ensure that
m4module.h, system.h, and any gnulib headers that we install, work
independently without config.h.  We currently don't achieve this goal (for
example, I couldn't see anything in Makefile.am that would install
xalloc.h), but hopefully this patch doesn't make it any harder to reach
that point.

2007-02-25  Eric Blake  <[email protected]>

	* m4/system_.h (includes, EXIT_SUCCESS, EXIT_FAILURE): Adjust to
	latest gnulib.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             [email protected]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF4bEm84KuGfSFAYARAmXvAJ9yhuUyX4vLwy9NvoOeVDBO4Y2h9ACgh0BU
3RhTJoWSseRf4lmHbzv1++M=
=80Hj
-----END PGP SIGNATURE-----

_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches

Index: m4/system_.h
===================================================================
RCS file: /sources/m4/m4/m4/system_.h,v
retrieving revision 1.18
diff -u -p -r1.18 system_.h
--- m4/system_.h	25 Oct 2006 12:45:45 -0000	1.18
+++ m4/system_.h	25 Feb 2007 15:45:51 -0000
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2000, 2001, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2003, 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,7 +38,6 @@
 @INCLUDE_REGEX_H@
 @INCLUDE_STDBOOL_H@
 
-#include <gnu/exit.h>
 #include <gnu/xalloc.h>
 #include <gnu/xstrndup.h>
 
@@ -50,6 +49,16 @@
   (obstack_free (OBS, (char *)(OBJECT) + SIZE),         \
    (OBS)->object_base = (char *)(OBJECT))
 
+/* Some systems do not define EXIT_*, despite otherwise supporting
+   C89.  This definition is copied from gnulib's stdlib_.h, since we
+   don't always install gnulib's stdlib.h.  */
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
 /* In addition to EXIT_SUCCESS and EXIT_FAILURE, m4 can fail with version
    mismatch when trying to load a frozen file produced by a newer m4 than
    the version doing the reload.  */