From cd8d159568b2b1401ffc7c786bf9ff6c67f3f859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= <kasal@fedoraproject.org>
Date: Tue, 24 Nov 2009 16:32:03 +0000
Subject: [PATCH] - add back upstream AH_CHECK_HEADERS, backported from
 upstream fixes some     build failures

---
 autoconf.spec                  | 11 ++++++++-
 autoconf_ah_check_header.patch | 42 ++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 autoconf_ah_check_header.patch

diff --git a/autoconf.spec b/autoconf.spec
index 09847c0..d838118 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,7 +1,7 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.64
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz
@@ -17,6 +17,10 @@ Requires(preun):    /sbin/install-info
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Bring back an undocumented macro, some projects do use it.
+# Committed to Autoconf it soon after 2.64.
+Patch1: autoconf_ah_check_header.patch
+
 # filter out bogus perl(Autom4te*) dependencies
 %define _use_internal_dependency_generator 0
 %define __find_provides %{SOURCE1}
@@ -40,6 +44,7 @@ their use.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure
@@ -83,6 +88,10 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Tue Nov 24 2009 Stepan Kasal <skasal@redhat.com> - 2.64-2
+- add back upstream AH_CHECK_HEADERS, backported from upstream
+  fixes some build failures
+
 * Fri Oct 30 2009 Stepan Kasal <skasal@redhat.com> - 2.64-1
 - new upstream version
 - skip failing test
diff --git a/autoconf_ah_check_header.patch b/autoconf_ah_check_header.patch
new file mode 100644
index 0000000..60d352d
--- /dev/null
+++ b/autoconf_ah_check_header.patch
@@ -0,0 +1,42 @@
+2009-07-30  Paolo Bonzini  <bonzini@gnu.org>
+
+	Add back AH_CHECK_HEADERS.
+	* lib/autoconf/general.m4 (AH_CHECK_HEADERS): New.
+	* NEWS: Create new section.
+
+diff --git a/NEWS b/NEWS
+index fc5730f..7e8a522 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,5 +1,14 @@
+ GNU Autoconf NEWS - User visible changes.
+ 
++* Major changes in Autoconf 2.64a (????-??-??) [experimental]
++  Released by ???? ????
++
++** The following undocumented autoconf macros, removed in Autoconf 2.64,
++   have been reinstated:
++   AH_CHECK_HEADERS
++
++   These macros are present only for backwards compatibility purposes.
++
+ * Major changes in Autoconf 2.64 (2009-07-26) [stable]
+   Released by Eric Blake, based on git versions 2.63b.*.
+ 
+diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
+index 21b512c..36c1899 100644
+--- a/lib/autoconf/headers.m4
++++ b/lib/autoconf/headers.m4
+@@ -253,6 +253,12 @@ m4_define([_AH_CHECK_HEADER],
+   [Define to 1 if you have the <$1> header file.])])
+ 
+ 
++# AH_CHECK_HEADERS(HEADER-FILE...)
++# --------------------------------
++m4_define([AH_CHECK_HEADERS],
++[m4_foreach_w([AC_Header], [$1], [_AH_CHECK_HEADER(m4_defn([AC_Header]))])])
++
++
+ # AC_CHECK_HEADERS(HEADER-FILE...,
+ #		   [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+ #		   [INCLUDES])