summaryrefslogtreecommitdiff
path: root/gl/m4/include_next.m4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2010-09-21 15:00:28 +0200
committerSimon Josefsson <simon@josefsson.org>2010-09-21 15:00:28 +0200
commita52d2b3e2f135a563ed5a7299aef5d4a0397c50d (patch)
tree17051163de8e3f6c0c7ac8a6def83ef3677d1eec /gl/m4/include_next.m4
parent78819671f59cc4dea560b1ef3a21a04991e7822a (diff)
downloadlibtasn1-a52d2b3e2f135a563ed5a7299aef5d4a0397c50d.tar.gz
libtasn1-a52d2b3e2f135a563ed5a7299aef5d4a0397c50d.tar.bz2
libtasn1-a52d2b3e2f135a563ed5a7299aef5d4a0397c50d.zip
Update gnulib files.
Diffstat (limited to 'gl/m4/include_next.m4')
-rw-r--r--gl/m4/include_next.m411
1 files changed, 8 insertions, 3 deletions
diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4
index c7e0672..51a719b 100644
--- a/gl/m4/include_next.m4
+++ b/gl/m4/include_next.m4
@@ -1,4 +1,4 @@
-# include_next.m4 serial 14
+# include_next.m4 serial 15
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -68,10 +68,11 @@ EOF
EOF
gl_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
- AC_COMPILE_IFELSE([#include <conftest.h>],
+dnl We intentionally avoid using AC_LANG_SOURCE here.
+ AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
[gl_cv_have_include_next=yes],
[CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
- AC_COMPILE_IFELSE([#include <conftest.h>],
+ AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
[gl_cv_have_include_next=buggy],
[gl_cv_have_include_next=no])
])
@@ -185,3 +186,7 @@ AC_DEFUN([gl_CHECK_NEXT_HEADERS],
[$gl_next_as_first_directive])
AS_VAR_POPDEF([gl_next_header])])
])
+
+# Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE;
+# this fallback is safe for all earlier autoconf versions.
+m4_define_default([AC_LANG_DEFINES_PROVIDED])