RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 27-Dec-2007 17:49:03
Branch: HEAD Handle: 2007122716490300
Modified files:
rpm configure.ac devtool.conf macros.in
Log:
detect name of libtoolize, instead of hacking it
Summary:
Revision Changes Path
2.268 +3 -0 rpm/configure.ac
2.152 +0 -1 rpm/devtool.conf
1.223 +2 -2 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.267 -r2.268 configure.ac
--- rpm/configure.ac 27 Dec 2007 16:44:13 -0000 2.267
+++ rpm/configure.ac 27 Dec 2007 16:49:03 -0000 2.268
@@ -475,6 +475,9 @@
AC_PATH_PROG(__OBJDUMP, objdump, %{_bindir}/objdump, $MYPATH)
AC_PATH_PROG(__STRIP, strip, %{_bindir}/strip, $MYPATH)
+AC_CHECK_PROGS(LIBTOOLIZE, libtoolize glibtoolize, libtoolize)
+AC_SUBST(LIBTOOLIZE)
+
dnl # check for id -u
AC_MSG_CHECKING(whether id supports -u)
if ${__ID} -u 2>&1 > /dev/null; then
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.151 -r2.152 devtool.conf
--- rpm/devtool.conf 27 Dec 2007 10:14:36 -0000 2.151
+++ rpm/devtool.conf 27 Dec 2007 16:49:03 -0000 2.152
@@ -1860,7 +1860,6 @@
# setup default (undetected) configuration, for Mac OS X
sed -i -e "s,${UNIVERSAL_CPP},gcc -E,"
/tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e "s,${UNIVERSAL_CC},gcc," /tmp/rpm-root/usr/local/lib/rpm/macros
- sed -i -e 's,libtoolize$,glibtoolize,'
/tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,%{_usr}/doc,%{_usr}/share/doc,'
/tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,%{_prefix}/etc,/etc,' /tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,%{_prefix}/var,/var/local,'
/tmp/rpm-root/usr/local/lib/rpm/macros
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.222 -r1.223 macros.in
--- rpm/macros.in 27 Dec 2007 16:44:13 -0000 1.222
+++ rpm/macros.in 27 Dec 2007 16:49:03 -0000 1.223
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.222 2007/12/27 16:44:13 afb Exp $
+# $Id: macros.in,v 1.223 2007/12/27 16:49:03 afb Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -111,7 +111,7 @@
%__strip @__STRIP@
# XXX avoid failures if tools are not installed when rpm is built.
-%__libtoolize libtoolize
+%__libtoolize @LIBTOOLIZE@
%__aclocal aclocal
%__autoheader autoheader
%__automake automake
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
