diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-08-07 16:06:03 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-08-07 16:06:03 +0200 |
| commit | 9339dc2e2aa975b896ab2911b76eae38777571ce (patch) | |
| tree | f562b6fd4893fbd9cf4eb4b3b72c24b54873603a /gl/m4 | |
| parent | 3ed8cd3f62d4de501003469dad50d08381b048e3 (diff) | |
| download | gnutls-9339dc2e2aa975b896ab2911b76eae38777571ce.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl/m4')
| -rw-r--r-- | gl/m4/gnulib-cache.m4 | 2 | ||||
| -rw-r--r-- | gl/m4/include_next.m4 | 28 |
2 files changed, 27 insertions, 3 deletions
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4 index 928df4471e..5d0831b692 100644 --- a/gl/m4/gnulib-cache.m4 +++ b/gl/m4/gnulib-cache.m4 @@ -23,9 +23,11 @@ gl_MODULES([arpa_inet error fdl gendocs getaddrinfo getline gpl-2.0 inet_ntop in gl_AVOID([snprintf vasnprintf]) gl_SOURCE_BASE([gl]) gl_M4_BASE([gl/m4]) +gl_PO_BASE([]) gl_DOC_BASE([doc]) gl_TESTS_BASE([gl/tests]) gl_LIB([libgnu]) gl_MAKEFILE_NAME([gnulib.mk]) gl_LIBTOOL gl_MACRO_PREFIX([gl]) +gl_PO_DOMAIN([]) diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4 index 4dc84c958c..7ce472bc0a 100644 --- a/gl/m4/include_next.m4 +++ b/gl/m4/include_next.m4 @@ -1,4 +1,4 @@ -# include_next.m4 serial 3 +# include_next.m4 serial 4 dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,9 +11,31 @@ AC_DEFUN([gl_INCLUDE_NEXT], AC_LANG_PREPROC_REQUIRE() AC_CACHE_CHECK([whether the preprocessor supports include_next], [gl_cv_have_include_next], - [AC_PREPROC_IFELSE([#include_next <stddef.h>], + [rm -rf conftestd1 conftestd2 + mkdir conftestd1 conftestd2 + cat <<EOF > conftestd1/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include_next <conftest.h> +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat <<EOF > conftestd2/conftest.h +#ifndef DEFINED_IN_CONFTESTD1 +#error "include_next test doesn't work" +#endif +#define DEFINED_IN_CONFTESTD2 +EOF + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2" + AC_COMPILE_IFELSE([#include <conftest.h>], [gl_cv_have_include_next=yes], - [gl_cv_have_include_next=no])]) + [gl_cv_have_include_next=no]) + CPPFLAGS="$save_CPPFLAGS" + rm -rf conftestd1 conftestd2 + ]) if test $gl_cv_have_include_next = yes; then dnl FIXME: Remove HAVE_INCLUDE_NEXT and update everything that uses it |