diff options
| author | Olivier Thauvin <nanardon@mandriva.org> | 2007-05-18 19:24:50 +0000 |
|---|---|---|
| committer | Olivier Thauvin <nanardon@mandriva.org> | 2007-05-18 19:24:50 +0000 |
| commit | d572e6da3b81a280147f47a570b2fd1959b6c420 (patch) | |
| tree | 8a28adbf7002c747610b0cb890e27383ef6b6797 | |
| parent | 1266015edb4d6e749a63400dc7683a3fe0619344 (diff) | |
| download | rpm-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)
| -rw-r--r-- | macros.in | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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} \\\ |