[redhat-rpm-config] - Allow opting out of config.{guess, sub} replacement hack (#991613)

[Panu Matilainen]

commit 43629272a88b1d2c0ea0bd35e28bab0b922ed41a
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Tue Apr 8 13:30:58 2014 +0300

    - Allow opting out of config.{guess,sub} replacement hack (#991613)

 macros                 |    3 ++-
 redhat-rpm-config.spec |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/macros b/macros
index 5bc6e5c..c44018b 100644
--- a/macros
+++ b/macros
@@ -29,6 +29,7 @@
 #==============================================================================
 # ---- configure and makeinstall.
 #
+%_configure_gnuconfig_hack	1
 %_configure_libtool_hardening_hack	1
 %_configure ./configure
 %configure \
@@ -37,7 +38,7 @@
   FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
   FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" ; export FCFLAGS ; \
   LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
-  for i in $(find . -name config.guess -o -name config.sub) ; do \
+  [ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find . -name config.guess -o -name config.sub) ; do \
       [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
   done ; \
   [ "%_configure_libtool_hardening_hack" = 1 ] && [ x != "x%{_hardened_ldflags}" ] && \
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 19232d3..050e47c 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -141,6 +141,7 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
 %changelog
 * Tue Apr 08 2014  Panu Matilainen <pmatilai at redhat.com> - 14-1
 - Add Mono path macros (#1070936)
+- Allow opting out of config.{guess,sub} replacement hack (#991613)
 
 * Tue Apr 08 2014  Panu Matilainen <pmatilai at redhat.com> - 13-1
 - Move the remaining dependency generator stuff to the kmp macro package