From f8280d3cd69710d5f6e5bf80bb44900a8ebe46de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org>
Date: Thu, 16 Jan 2020 19:13:15 +0200
Subject: build.macros: sync configure macro with rpm upstream

---
 NEWS            |  1 +
 build.macros.in | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 8c14108..d75de4d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - build.macros: replace configure2_5x with configure macro
+    - sync configure macro with rpm upstream
 - build.macros: drop legacy libtoolize calls from configure macros
 - build.macros: drop legacy --x-includes= and --x-libraries= from configure macros
 - build.macros: drop deprecated and unused macros
diff --git a/build.macros.in b/build.macros.in
index 3256813..3981550 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -222,12 +222,13 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
   %{__fix_libtool_from_moving_options_after_libs} $CONFIGURE_TOP ; \
   %{__fix_dlsearch_path_in_libtool_for_multilib} $CONFIGURE_TOP %{_lib}
 
-# This is an improved version of %configure (from PLD team).
+# This is an improved version of %configure (originally from PLD team).
+%_configure $CONFIGURE_TOP/configure
 %configure \
-  %before_configure ; \
-  $CONFIGURE_TOP/configure --build=%{_build} \\\
-	%{?_program_prefix:--program-prefix=%{_program_prefix}} \\\
-	--prefix=%{_prefix} \\\
+  %{before_configure}; \
+  %{_configure} --host=%{_host} --build=%{_build}
+	--program-prefix=%{?_program_prefix} \\\
+        --disable-dependency-tracking \\\
 	--exec-prefix=%{_exec_prefix} \\\
 	--bindir=%{_bindir} \\\
 	--sbindir=%{_sbindir} \\\
-- 
cgit v1.2.1