aboutsummaryrefslogtreecommitdiffstats
path: root/macros.in
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2007-05-18 19:24:50 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2007-05-18 19:24:50 +0000
commitd572e6da3b81a280147f47a570b2fd1959b6c420 (patch)
tree8a28adbf7002c747610b0cb890e27383ef6b6797 /macros.in
parent1266015edb4d6e749a63400dc7683a3fe0619344 (diff)
downloadrpm-setup-d572e6da3b81a280147f47a570b2fd1959b6c420.tar
rpm-setup-d572e6da3b81a280147f47a570b2fd1959b6c420.tar.gz
rpm-setup-d572e6da3b81a280147f47a570b2fd1959b6c420.tar.bz2
rpm-setup-d572e6da3b81a280147f47a570b2fd1959b6c420.tar.xz
rpm-setup-d572e6da3b81a280147f47a570b2fd1959b6c420.zip
- disable libtoolize by default in configure
- split libtoolize command into its own macro (__libtoolize_configure)
Diffstat (limited to 'macros.in')
-rw-r--r--macros.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/macros.in b/macros.in
index 5278203..c42a396 100644
--- a/macros.in
+++ b/macros.in
@@ -429,6 +429,8 @@ then %{_scrollkeeper_bin} -q || true ; fi \
%serverbuild export CFLAGS="%optflags -fno-omit-frame-pointer"; export CXXFLAGS="%optflags -fno-omit-frame-pointer"; export RPM_OPT_FLAGS="%optflags -fno-omit-frame-pointer" \
%{nil}
+%__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)}
+
# This is an improved version of %configure (from PLD team).
%configure \
CONFIGURE_TOP="${CONFIGURE_TOP:-.}"; \
@@ -436,7 +438,7 @@ then %{_scrollkeeper_bin} -q || true ; fi \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
%{?__cputoolize:%{__cputoolize} -c $CONFIGURE_TOP} ; \
- %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)} ; \
+ %{?_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} \\\
@@ -462,7 +464,7 @@ then %{_scrollkeeper_bin} -q || true ; fi \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
%{?__cputoolize:%{__cputoolize} -c $CONFIGURE_TOP} ; \
- %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)} ; \
+ %{?_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} \\\