[hivex] Include autoconf generated changes.

[Richard W.M. Jones]

commit 03c8b9bf043e0fef16ee84ca36824dc09a0ee8ec
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Oct 24 18:26:08 2011 +0100

    Include autoconf generated changes.

 ...onditional-test-for-HAVE_HIVEXSH-autoconf.patch |   36 ++++++++++++++++++++
 hivex.spec                                         |    7 +++-
 2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-conditional-test-for-HAVE_HIVEXSH-autoconf.patch b/0001-Fix-conditional-test-for-HAVE_HIVEXSH-autoconf.patch
new file mode 100644
index 0000000..90b363d
--- /dev/null
+++ b/0001-Fix-conditional-test-for-HAVE_HIVEXSH-autoconf.patch
@@ -0,0 +1,36 @@
+Only in hivex-1.3.2: autom4te.cache
+diff -ur hivex-1.3.2.old/configure hivex-1.3.2/configure
+--- hivex-1.3.2.old/configure	2011-10-24 17:22:58.000000000 +0100
++++ hivex-1.3.2/configure	2011-10-24 18:24:55.328126051 +0100
+@@ -21859,13 +21859,12 @@
+ 
+ 
+ 
+-for ac_func in bindtextdomain open_memstream
++for ac_func in bindtextdomain
+ do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++  ac_fn_c_check_func "$LINENO" "bindtextdomain" "ac_cv_func_bindtextdomain"
++if test "x$ac_cv_func_bindtextdomain" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BINDTEXTDOMAIN 1
+ _ACEOF
+ 
+ fi
+@@ -24131,7 +24130,12 @@
+ 
+ 
+ 
+- if test "x$HAVE_OPEN_MEMSTREAM" = "xyes"; then
++ac_fn_c_check_func "$LINENO" "open_memstream" "ac_cv_func_open_memstream"
++if test "x$ac_cv_func_open_memstream" = xyes; then :
++
++fi
++
++ if test "x$ac_cv_func_open_memstream" = "xyes"; then
+   HAVE_HIVEXSH_TRUE=
+   HAVE_HIVEXSH_FALSE='#'
+ else
diff --git a/hivex.spec b/hivex.spec
index 3ec64e3..b10bf84 100644
--- a/hivex.spec
+++ b/hivex.spec
@@ -7,7 +7,7 @@
 
 Name:           hivex
 Version:        1.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 Group:          Development/Libraries
@@ -41,7 +41,9 @@ Conflicts:      libguestfs <= 1:1.0.84
 Patch0:         %{name}-1.2.3-dirs.patch
 
 # Upstream patch to fix building hivexsh, hivexget commands.
+# Second patch is autoconf generated changes.
 Patch1:         0001-Fix-conditional-test-for-HAVE_HIVEXSH.patch
+Patch2:         0001-Fix-conditional-test-for-HAVE_HIVEXSH-autoconf.patch
 
 
 %description
@@ -167,6 +169,7 @@ ruby-%{name} contains Ruby bindings for %{name}.
 
 %patch0 -p1 -b .dirs
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -279,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 24 2011 Richard W.M. Jones <rjones at redhat.com> - 1.3.2-2
+* Mon Oct 24 2011 Richard W.M. Jones <rjones at redhat.com> - 1.3.2-3
 - New upstream version 1.3.2.
 - Add upstream patch to fix building of hivexsh, hivexget.