[apr] 01/02: check for libtoolize rather than libtool

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apr.

commit 609a3927ea06421018bbbebb111dfa05e0e71e23
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Sep 20 22:20:49 2014 +0200

    check for libtoolize rather than libtool
    
    patch by Helmut Grohne
---
 debian/changelog                      |  4 ++++
 debian/patches/libtoolize_check.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 42ce334..6a32d45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 apr (1.5.1-3) UNRELEASED; urgency=medium
 
+  [Helmut Grohne]
+  * Check for libtoolize rather than libtool. Closes: #761732
+
+  [ Stefan Fritsch ]
   * Update Vcs-Git URL in control file.
 
  -- Stefan Fritsch <sf at debian.org>  Tue, 22 Jul 2014 23:06:17 +0200
diff --git a/debian/patches/libtoolize_check.patch b/debian/patches/libtoolize_check.patch
new file mode 100644
index 0000000..e5356eb
--- /dev/null
+++ b/debian/patches/libtoolize_check.patch
@@ -0,0 +1,26 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: check for libtoolize rather than libtool
+Last-Update: 2014-09-19
+
+libtool is now in package libtool-bin, but apr only needs libtoolize.
+
+Index: apr-1.5.1/build/buildcheck.sh
+===================================================================
+--- apr-1.5.1.orig/build/buildcheck.sh	2009-11-13 01:27:16.000000000 +0100
++++ apr-1.5.1/build/buildcheck.sh	2014-09-19 12:33:14.000000000 +0200
+@@ -37,11 +37,11 @@
+ # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
+ # output is multiline from 1.5 onwards
+ 
+-# Require libtool 1.4 or newer
+-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'`
++# Require libtoolize 1.4 or newer
++libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
++lt_pversion=`$libtoolize --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."
++echo "buildconf: libtoolize not found."
+ echo "           You need libtool version 1.4 or newer installed"
+ echo "           to build APR from SVN."
+ exit 1
diff --git a/debian/patches/series b/debian/patches/series
index 5bf1e3d..2a43196 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ omit_extra_libs.patch
 hurd_shm_flock.patch
 dont_override_external_buildflags
 buildfix_r1589984
+libtoolize_check.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git