[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
PATCH: find correct headers in m4/system.h
From: |
Eric Blake |
Subject: |
PATCH: find correct headers in m4/system.h |
Date: |
Thu, 23 Dec 2004 21:24:41 -0700 |
User-agent: |
Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax) |
When trying to compile m4 CVS HEAD on cygwin, I had to apply the following
patch to account for Gary's patch on Sept 23, which moved headers out of m4/
and into gnu/. I also noticed that when I edited m4/system_.h but not
configure.ac, then reran make, that the makefile did not have a dependency
to rebuild m4/system.h; I had to manually run ``config.status m4/system.h''
to pick up my edits. Is that a bug inherited from automake, or is it a bug
in m4/Makefile.am?
2004-12-23 Eric Blake <address@hidden>
* configure.ac (INCLUDE_STDBOOL_H): Account for gnulib's move
to the gnu subdirectory.
* acm4/m4-error.m4 (INCLUDE_ERROR_H): Likewise.
* acm4/m4-obstack.m4 (INCLUDE_OBSTACK_H): Likewise.
* acm4/m4-regex.m4 (INCLUDE_REGEX_H): Likewise.
* m4/system_h: Likewise, in non-configured includes.
--
Someday, I might put a cute statement here.
Eric Blake address@hidden
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.35
diff -u -p -r1.35 configure.ac
--- configure.ac 23 Sep 2004 16:29:33 -0000 1.35
+++ configure.ac 24 Dec 2004 04:09:12 -0000
@@ -178,7 +178,7 @@ AC_CHECK_HEADERS(limits.h locale.h memor
if test $ac_cv_header_stdbool_h = yes; then
INCLUDE_STDBOOL_H='#include <stdbool.h>'
else
- INCLUDE_STDBOOL_H='#include <m4/stdbool.h>'
+ INCLUDE_STDBOOL_H='#include <gnu/stdbool.h>'
fi
AC_SUBST([INCLUDE_STDBOOL_H])
Index: acm4/m4-error.m4
===================================================================
RCS file: /cvsroot/m4/m4/acm4/m4-error.m4,v
retrieving revision 1.2
diff -u -p -r1.2 m4-error.m4
--- acm4/m4-error.m4 23 Sep 2004 16:29:33 -0000 1.2
+++ acm4/m4-error.m4 24 Dec 2004 04:09:12 -0000
@@ -34,7 +34,7 @@ AC_SUBST(ERROR_H)
if test $ac_cv_header_error_h = yes; then
INCLUDE_ERROR_H='#include <error.h>'
else
- INCLUDE_ERROR_H='#include <m4/error.h>'
+ INCLUDE_ERROR_H='#include <gnu/error.h>'
fi
AC_SUBST([INCLUDE_ERROR_H])
])# m4_ERROR
Index: acm4/m4-obstack.m4
===================================================================
RCS file: /cvsroot/m4/m4/acm4/m4-obstack.m4,v
retrieving revision 1.2
diff -u -p -r1.2 m4-obstack.m4
--- acm4/m4-obstack.m4 23 Sep 2004 16:29:33 -0000 1.2
+++ acm4/m4-obstack.m4 24 Dec 2004 04:09:12 -0000
@@ -46,9 +46,9 @@ else
# to build without it. Unfortunately we can't leave an obstack.h
# file around anywhere in the include path if the system also
# provides an implementation: So we ship gnulib/lib/obstack.h, and link
- # it to m4/obstack.h at Make time (to substitute the missing system
- # supplied version). Hence, `#include <m4/obstack.h>' will work.
- INCLUDE_OBSTACK_H='#include <m4/obstack.h>'
+ # it to gnu/obstack.h at Make time (to substitute the missing system
+ # supplied version). Hence, `#include <gnu/obstack.h>' will work.
+ INCLUDE_OBSTACK_H='#include <gnu/obstack.h>'
OBSTACK_H=obstack.h
fi
AC_SUBST(OBSTACK_H)
Index: acm4/m4-regex.m4
===================================================================
RCS file: /cvsroot/m4/m4/acm4/m4-regex.m4,v
retrieving revision 1.3
diff -u -p -r1.3 m4-regex.m4
--- acm4/m4-regex.m4 23 Sep 2004 16:29:33 -0000 1.3
+++ acm4/m4-regex.m4 24 Dec 2004 04:09:12 -0000
@@ -35,9 +35,9 @@ else
# to build without it. Unfortunately we can't leave an regex.h
# file around anywhere in the include path if the system also
# provides an implementation: So we ship regex_.h, and link it to
- # m4/regex.h at Make time (to substitute the missing system supplied
- # version). Hence, `#include <m4/regex.h>' will work.
- INCLUDE_REGEX_H='#include <m4/regex.h>'
+ # gnu/regex.h at Make time (to substitute the missing system supplied
+ # version). Hence, `#include <gnu/regex.h>' will work.
+ INCLUDE_REGEX_H='#include <gnu/regex.h>'
REGEX_H=regex.h
fi
AC_SUBST(REGEX_H)
Index: m4/system_.h
===================================================================
RCS file: /cvsroot/m4/m4/m4/system_.h,v
retrieving revision 1.10
diff -u -p -r1.10 system_.h
--- m4/system_.h 15 Jul 2004 13:04:39 -0000 1.10
+++ m4/system_.h 24 Dec 2004 04:09:12 -0000
@@ -42,9 +42,9 @@
#undef true
@INCLUDE_STDBOOL_H@
-#include <m4/exit.h>
-#include <m4/xalloc.h>
-#include <m4/xstrndup.h>
+#include <gnu/exit.h>
+#include <gnu/xalloc.h>
+#include <gnu/xstrndup.h>
/* This is okay in an installed file, because it will not change the
behaviour of the including program whether ENABLE_NLS is defined
- PATCH: find correct headers in m4/system.h,
Eric Blake <=