You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2009/02/24 04:37:19 UTC
svn commit: r747267 - in /apr/apr/branches/1.3.x: ./ CHANGES
build/buildcheck.sh buildconf
Author: bojan
Date: Tue Feb 24 03:37:18 2009
New Revision: 747267
URL: http://svn.apache.org/viewvc?rev=747267&view=rev
Log:
Backport r742752 from the trunk.
With the release if libtool 2.x, most port managers now install
as glibtool1... so prefer that.
Modified:
apr/apr/branches/1.3.x/ (props changed)
apr/apr/branches/1.3.x/CHANGES
apr/apr/branches/1.3.x/build/buildcheck.sh
apr/apr/branches/1.3.x/buildconf
Propchange: apr/apr/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 03:37:18 2009
@@ -1 +1 @@
-/apr/apr/trunk:712674,733052
+/apr/apr/trunk:712674,733052,742752
Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=747267&r1=747266&r2=747267&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Tue Feb 24 03:37:18 2009
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes for APR 1.3.4
+ *) Prefer glibtool1/glibtoolize1. [Jim Jagielski]
+
*) Fix buildconf with libtool 2.2. [Joe Orton]
*) Fix a bug with the APR_DELONCLOSE flag. Child processes were (also)
Modified: apr/apr/branches/1.3.x/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/build/buildcheck.sh?rev=747267&r1=747266&r2=747267&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/build/buildcheck.sh (original)
+++ apr/apr/branches/1.3.x/build/buildcheck.sh Tue Feb 24 03:37:18 2009
@@ -38,7 +38,7 @@
# output is multiline from 1.5 onwards
# Require libtool 1.4 or newer
-libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
+libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
if test -z "$lt_pversion"; then
echo "buildconf: libtool not found."
Modified: apr/apr/branches/1.3.x/buildconf
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/buildconf?rev=747267&r1=747266&r2=747267&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/buildconf (original)
+++ apr/apr/branches/1.3.x/buildconf Tue Feb 24 03:37:18 2009
@@ -23,7 +23,7 @@
#
build/buildcheck.sh || exit 1
-libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`
+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
if [ "x$libtoolize" = "x" ]; then
echo "libtoolize not found in path"
exit 1