aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--build.macros.in30
2 files changed, 7 insertions, 25 deletions
diff --git a/NEWS b/NEWS
index 797b56f..809635a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- Unify %configure macros into a single %configure macro
+
Version 2.21 - 26 July 2017, by Thierry Vignaud
- support split debugsources in our macros
diff --git a/build.macros.in b/build.macros.in
index 65b17f9..fdd6f29 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -236,33 +236,13 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
# This is an improved version of %configure (from PLD team).
%configure \
%before_configure ; \
- %{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
+ %{?_legacy_autotools:%{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
+ %{!?_legacy_autotools:%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
[ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
- $CONFIGURE_TOP/configure %{_target_platform} \\\
- --program-prefix=%{?_program_prefix} \\\
- --prefix=%{_prefix} \\\
- --exec-prefix=%{_exec_prefix} \\\
- --bindir=%{_bindir} \\\
- --sbindir=%{_sbindir} \\\
- --sysconfdir=%{_sysconfdir} \\\
- --datadir=%{_datadir} \\\
- --includedir=%{_includedir} \\\
- --libdir=%{_libdir} \\\
- --libexecdir=%{_libexecdir} \\\
- --localstatedir=%{_localstatedir} \\\
- --sharedstatedir=%{_sharedstatedir} \\\
- --mandir=%{_mandir} \\\
- --infodir=%{_infodir} \\\
- $CONFIGURE_XPATH
-
-%configure2_5x \
- %before_configure ; \
- %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
- [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
- CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
- $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
- --prefix=%{_prefix} \\\
+ $CONFIGURE_TOP/configure %{!?_legacy_autotools:--build=}%{_target_platform} \\\
+ %{?_program_prefix:--program-prefix=%{_program_prefix}} \\\
+ --prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\
--bindir=%{_bindir} \\\
--sbindir=%{_sbindir} \\\