From d572e6da3b81a280147f47a570b2fd1959b6c420 Mon Sep 17 00:00:00 2001 From: Olivier Thauvin Date: Fri, 18 May 2007 19:24:50 +0000 Subject: - disable libtoolize by default in configure - split libtoolize command into its own macro (__libtoolize_configure) --- macros.in | 6 ++++-- 1 file 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} \\\ -- cgit v1.2.1