# HG changeset patch # User Paul Eggert # Date 1151995029 0 # Node ID db00828296375df31a4ee05d5e633ff5cca66f44 # Parent 85faf7df624eb41c1ef3fd75518c41b82832d498 * m4/absolute-header.m4: Renamed from full-header-path.m4. This is to keep the terminology clean; POSIX talks about "absolute pathnames", not "full pathnames", but the GNU Coding Standards say to use "path" for something else; so use "absolute" to keep both sides happy. (gl_ABSOLUTE_HEADER): Renamed from gl_FULL_HEADER_PATH. Set gl_absolute_header, not gl_full_header_path. Set gl_cv_absolute_
, not gl_full_path_
. Define ABSOLUTE_
, not FULL_PATH_
. All uses changed. diff --git a/lib/inttypes.h b/lib/inttypes.h --- a/lib/inttypes.h +++ b/lib/inttypes.h @@ -33,7 +33,7 @@ # if HAVE_INCLUDE_NEXT # include_next # else -# include FULL_PATH_INTTYPES_H +# include ABSOLUTE_INTTYPES_H # endif #endif #include diff --git a/lib/stat_.h b/lib/stat_.h --- a/lib/stat_.h +++ b/lib/stat_.h @@ -22,7 +22,7 @@ /* This file is supposed to be used on platforms where is incomplete. It is intended to provide definitions and prototypes needed by an application. Start with what the system provides. */ -#include @FULL_PATH_SYS_STAT_H@ +#include @ABSOLUTE_SYS_STAT_H@ /* mingw does not support symlinks, therefore it does not have lstat. But without links, stat does just fine. */ diff --git a/lib/stdint_.h b/lib/stdint_.h --- a/lib/stdint_.h +++ b/lib/stdint_.h @@ -43,14 +43,14 @@ Include it before , since any "#include " in would reinclude us, skipping our contents because _GL_STDINT_H is defined. */ -# include @FULL_PATH_STDINT_H@ +# include @ABSOLUTE_STDINT_H@ #endif /* defines some of the stdint.h types as well, on glibc, IRIX 6.5, and OpenBSD 3.8 (via ). MacOS X 10.4.6 includes (which is us), but relies on the system definitions, so include - after @FULL_PATH_STDINT_H@. */ + after @ABSOLUTE_STDINT_H@. */ #if @HAVE_SYS_TYPES_H@ # include #endif diff --git a/m4/ChangeLog b/m4/ChangeLog --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,16 @@ 2006-07-03 Paul Eggert + * absolute-header.m4: Renamed from full-header-path.m4. + This is to keep the terminology clean; POSIX talks about + "absolute pathnames", not "full pathnames", but the GNU + Coding Standards say to use "path" for something else; + so use "absolute" to keep both sides happy. + (gl_ABSOLUTE_HEADER): Renamed from gl_FULL_HEADER_PATH. + Set gl_absolute_header, not gl_full_header_path. + Set gl_cv_absolute_
, not gl_full_path_
. + Define ABSOLUTE_
, not FULL_PATH_
. + All uses changed. + Merge from coreutils. 2006-06-30 Paul Eggert diff --git a/m4/_inttypes_h.m4 b/m4/_inttypes_h.m4 --- a/m4/_inttypes_h.m4 +++ b/m4/_inttypes_h.m4 @@ -1,4 +1,4 @@ -# _inttypes_h.m4 serial 2 +# _inttypes_h.m4 serial 3 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, @@ -10,7 +10,7 @@ [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]) + gl_ABSOLUTE_HEADER([inttypes.h]) fi AC_CHECK_DECLS_ONCE([strtoimax strtoumax])dnl ]) diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 new file mode 100644 --- /dev/null +++ b/m4/absolute-header.m4 @@ -0,0 +1,41 @@ +# absolute-header.m4 serial 3 +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, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Derek Price. + +# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...) +# --------------------------------------- +# Find the absolute name of a header file, assuming the header exists. +# If the header were sys/inttypes.h, this macro would define +# ABSOLUTE_SYS_INTTYPES_H to the `<>' quoted absolute name of sys/inttypes.h +# in config.h +# (e.g. `#define ABSOLUTE_SYS_INTTYPES_H '). +AC_DEFUN([gl_ABSOLUTE_HEADER], +[AC_LANG_PREPROC_REQUIRE()dnl +AC_FOREACH([gl_HEADER_NAME], [$1], + [AS_VAR_PUSHDEF([gl_absolute_header], + [gl_cv_absolute_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl + AC_CACHE_CHECK([absolute name of <]m4_quote(m4_defn([gl_HEADER_NAME]))[>], + m4_quote(m4_defn([gl_absolute_header])), + [AS_VAR_PUSHDEF([ac_header_exists], + [ac_cv_header_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl + AC_CHECK_HEADERS_ONCE(m4_quote(m4_defn([gl_HEADER_NAME])))dnl + if test AS_VAR_GET(ac_header_exists) = yes; then + AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]])]) +dnl eval is necessary to expand ac_cpp. +dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell. + AS_VAR_SET(gl_absolute_header, +[`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | +sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#;p;q;}'`]) + fi + AS_VAR_POPDEF([ac_header_exists])dnl + ])dnl + AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_quote(m4_defn([gl_HEADER_NAME]))), + [], + [Define this to the absolute name of <]m4_quote(m4_defn([gl_HEADER_NAME]))[>.]) + AS_VAR_POPDEF([gl_absolute_header])dnl +])dnl +])# gl_ABSOLUTE_HEADER diff --git a/m4/full-header-path.m4 b/m4/full-header-path.m4 deleted file mode 100644 --- a/m4/full-header-path.m4 +++ /dev/null @@ -1,41 +0,0 @@ -# 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, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Derek Price. - -# gl_FULL_HEADER_PATH(HEADER1 HEADER2 ...) -# ---------------------------------------- -# 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 '). -AC_DEFUN([gl_FULL_HEADER_PATH], -[AC_LANG_PREPROC_REQUIRE()dnl -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 - AC_CACHE_CHECK([full path to <]m4_quote(m4_defn([gl_HEADER_NAME]))[>], - m4_quote(m4_defn([gl_full_header_path])), - [AS_VAR_PUSHDEF([ac_header_exists], - [ac_cv_header_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl - AC_CHECK_HEADERS_ONCE(m4_quote(m4_defn([gl_HEADER_NAME])))dnl - if test AS_VAR_GET(ac_header_exists) = yes; then - AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]])]) -dnl eval is necessary to expand ac_cpp. -dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell. - AS_VAR_SET(gl_full_header_path, -[`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | -sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1#;p;q;}'`]) - fi - AS_VAR_POPDEF([ac_header_exists])dnl - ])dnl - AC_DEFINE_UNQUOTED(AS_TR_CPP([FULL_PATH_]m4_quote(m4_defn([gl_HEADER_NAME]))), - [], - [Define this to the full path to <]m4_quote(m4_defn([gl_HEADER_NAME]))[>.]) - AS_VAR_POPDEF([gl_full_header_path])dnl -])dnl -])# gl_FULL_HEADER_PATH diff --git a/m4/stdint.m4 b/m4/stdint.m4 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 13 +# stdint.m4 serial 14 dnl Copyright (C) 2001-2002, 2004-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, @@ -49,9 +49,9 @@ dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_stdint_h. if test $ac_cv_header_stdint_h = yes; then - gl_FULL_HEADER_PATH([stdint.h]) - FULL_PATH_STDINT_H="<$gl_cv_full_path_stdint_h>" - AC_SUBST([FULL_PATH_STDINT_H]) + gl_ABSOLUTE_HEADER([stdint.h]) + ABSOLUTE_STDINT_H="<$gl_cv_absolute_stdint_h>" + AC_SUBST([ABSOLUTE_STDINT_H]) HAVE_STDINT_H=1 else HAVE_STDINT_H=0 @@ -59,7 +59,7 @@ AC_SUBST([HAVE_STDINT_H]) dnl Now see whether we need a substitute . Use - dnl FULL_PATH_STDINT_H, not , so that it also works during + dnl ABSOLUTE_STDINT_H, not , so that it also works during dnl a "config.status --recheck" if a stdint.h has been dnl created in the build directory. if test $ac_cv_header_stdint_h = yes; then @@ -70,7 +70,7 @@ AC_LANG_PROGRAM([[ #include #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ -#include FULL_PATH_STDINT_H +#include ABSOLUTE_STDINT_H #ifdef INT8_MAX int8_t a1 = INT8_MAX; #endif diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 1 -*- Autoconf -*- +# sys_stat_h.m4 serial 2 -*- Autoconf -*- 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, @@ -19,11 +19,11 @@ SYS_STAT_H= if test $ac_cv_func_lstat:$ac_cv_have_decl_mkdir != yes:yes ; then - gl_FULL_HEADER_PATH([sys/stat.h]) - FULL_PATH_SYS_STAT_H='<'$gl_cv_full_path_sys_stat_h'>' + gl_ABSOLUTE_HEADER([sys/stat.h]) + ABSOLUTE_SYS_STAT_H="<$gl_cv_absolute_sys_stat_h>" AC_CHECK_HEADERS([io.h]) AC_REQUIRE([AC_C_INLINE]) - AC_SUBST([FULL_PATH_SYS_STAT_H]) + AC_SUBST([ABSOLUTE_SYS_STAT_H]) SYS_STAT_H='sys/stat.h' fi AC_SUBST([SYS_STAT_H]) diff --git a/modules/inttypes b/modules/inttypes --- a/modules/inttypes +++ b/modules/inttypes @@ -6,7 +6,7 @@ Files: lib/inttypes.h m4/include_next.m4 -m4/full-header-path.m4 +m4/absolute-header.m4 m4/_inttypes_h.m4 Depends-on: diff --git a/modules/stdint b/modules/stdint --- a/modules/stdint +++ b/modules/stdint @@ -9,7 +9,7 @@ Files: lib/stdint_.h m4/stdint.m4 -m4/full-header-path.m4 +m4/absolute-header.m4 m4/longlong.m4 Depends-on: @@ -27,7 +27,7 @@ sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ - -e 's|@''FULL_PATH_STDINT_H''@|$(FULL_PATH_STDINT_H)|g' \ + -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ diff --git a/modules/sys_stat b/modules/sys_stat --- a/modules/sys_stat +++ b/modules/sys_stat @@ -3,7 +3,7 @@ Files: lib/stat_.h -m4/full-header-path.m4 +m4/absolute-header.m4 m4/sys_stat_h.m4 Depends-on: @@ -19,7 +19,7 @@ # has one that is incomplete. sys/stat.h: stat_.h test -d sys || mkdir sys - sed -e 's|@''FULL_PATH_SYS_STAT_H''@|$(FULL_PATH_SYS_STAT_H)|g' \ + sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \ < $(srcdir)/stat_.h > $@-t mv $@-t $@ MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t