* modules/inttypes (Maintainer): Change from Derek Price to 'all'.

* m4/full-header-path.m4 (gl_FULL_HEADER_PATH): Move the include_next
test from here...
* m4/_inttypes_h.m4 (gl_INTTYPES_H): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 6d085bd..626a2c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * modules/inttypes (Maintainer): Change from Derek Price to 'all'.
+
 2006-04-25  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool: Make --update option actually work.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 74e3707..6056a23 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-02  Bruno Haible  <bruno@clisp.org>
+
+       * full-header-path.m4 (gl_FULL_HEADER_PATH): Move the include_next
+       test from here...
+       * _inttypes_h.m4 (gl_INTTYPES_H): ... to here.
+
 2006-04-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * unlink-busy.m4 (gl_FUNC_UNLINK_BUSY_TEXT): Use prototype

diff --git a/m4/_inttypes_h.m4 b/m4/_inttypes_h.m4
index 8cf2a9c..e8e3d3a 100644 (file)
--- a/m4/_inttypes_h.m4
+++ b/m4/_inttypes_h.m4
@@ -1,4 +1,4 @@
-# _inttypes_h.m4 serial 1
+# _inttypes_h.m4 serial 2
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,10 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Derek Price.
 
 AC_DEFUN([gl_INTTYPES_H],
-[AC_LIBSOURCES([inttypes.h])
-gl_FULL_HEADER_PATH([inttypes.h])
+[AC_REQUIRE([gl_INCLUDE_NEXT])dnl
+AC_LIBSOURCES([inttypes.h])
+if test $gl_cv_have_include_next = no; then
+  gl_FULL_HEADER_PATH([inttypes.h])
+fi
 AC_CHECK_DECLS_ONCE([strtoimax strtoumax])dnl
 ])

diff --git a/m4/full-header-path.m4 b/m4/full-header-path.m4
index b923215..b54e1b3 100644 (file)
--- a/m4/full-header-path.m4
+++ b/m4/full-header-path.m4
@@ -1,4 +1,4 @@
-# full-header-path.m4 serial 1
+# full-header-path.m4 serial 2
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,16 +8,13 @@ dnl From Derek Price.
 
 # gl_FULL_HEADER_PATH(HEADER1 HEADER2 ...)
 # ----------------------------------------
-# Find the full path to a header file, when the #include_next directive
-# doesn't work and the header exists in the first place.  If the header were
-# sys/inttypes.h (and it existed and #include_next didn't work), this macro
-# would define FULL_PATH_SYS_INTTYPES_H to the `<>' quoted full path to
-# sys/inttypes.h in config.h
+# Find the full path to a header file, assuming the header exists.
+# If the header were sys/inttypes.h, this macro would define
+# FULL_PATH_SYS_INTTYPES_H to the `<>' quoted full path to sys/inttypes.h
+# in config.h
 # (e.g. `#define FULL_PATH_SYS_INTTYPES_H </usr/include/sys/inttypes.h>').
 AC_DEFUN([gl_FULL_HEADER_PATH],
 [AC_LANG_PREPROC_REQUIRE()dnl
-AC_REQUIRE([gl_INCLUDE_NEXT])dnl
-if test $gl_cv_have_include_next = no; then
 AC_FOREACH([gl_HEADER_NAME], [$1],
   [AS_VAR_PUSHDEF([gl_full_header_path],
                   [gl_cv_full_path_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl
@@ -41,5 +38,4 @@ sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{s#.*"\(.*/]m4_quote(m4_defn([g
                      [Define this to the full path to <]m4_quote(m4_defn([gl_HEADER_NAME]))[>.])
   AS_VAR_POPDEF([gl_full_header_path])dnl
 ])dnl
-fi
 ])# gl_FULL_HEADER_PATH

diff --git a/modules/inttypes b/modules/inttypes
index fa542ab..ed6b8ee 100644 (file)
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -24,5 +24,4 @@ License:
 LGPL
 
 Maintainer:
-Derek Price
-
+all