1 files changed, 77 insertions, 0 deletions
diff --git a/09_libtoolize_check.patch b/09_libtoolize_check.patch
new file mode 100644
index 000000000000..6600c86dd7b3
--- /dev/null
+++ b/09_libtoolize_check.patch
@@ -0,0 +1,77 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Subject: check for libtoolize rather than libtool
+Last-Modified: 2014-09-19
+
+libtool is now in package libtool-bin, but curl really only uses libtoolize.
+
+--- a/buildconf
++++ b/buildconf
+@@ -190,31 +190,35 @@
+ fi
+ 
+ #--------------------------------------------------------------------------
+-# GNU libtool preliminary check
++# GNU libtoolize check
+ #
+ want_lt_major=1
+ want_lt_minor=4
+ want_lt_patch=2
+ want_lt_version=1.4.2
+ 
+-# This approach that tries 'glibtool' first is intended for systems that
+-# have GNU libtool named as 'glibtool' and libtool not being GNU's.
++# This approach that tries 'glibtoolize' first is intended for systems that
++# have GNU libtool named as 'glibtoolize' and libtoolize not being GNU's.
+ 
+-libtool=`findtool glibtool 2>/dev/null`
+-if test ! -x "$libtool"; then
+-  libtool=`findtool ${LIBTOOL:-libtool}`
++if test -z "$LIBTOOLIZE"; then
++  libtoolize=`findtool glibtoolize 2>/dev/null`
++  if test ! -x "$libtoolize"; then
++    libtoolize=`findtool libtoolize 2>/dev/null`
++  fi
++else
++  libtoolize=`findtool $LIBTOOLIZE`
+ fi
+-if test -z "$libtool"; then
+-  echo "buildconf: libtool not found."
+-  echo "            You need GNU libtool $want_lt_version or newer installed."
++if test ! -f "$libtoolize"; then
++  echo "buildconf: libtoolize not found."
++  echo "            You need GNU libtoolize $want_lt_version or newer installed."
+   exit 1
+ fi
+ 
+-lt_pver=`$libtool --version 2>/dev/null|head -n 1`
++lt_pver=`$libtoolize --version 2>/dev/null|head -n 1`
+ lt_qver=`echo $lt_pver|sed -e "s/([^)]*)//g" -e "s/^[^0-9]*//g"`
+ lt_version=`echo $lt_qver|sed -e "s/[- ].*//" -e "s/\([a-z]*\)$//"`
+ if test -z "$lt_version"; then
+-  echo "buildconf: libtool not found."
++  echo "buildconf: libtoolize not found."
+   echo "            You need GNU libtool $want_lt_version or newer installed."
+   exit 1
+ fi
+@@ -253,21 +257,6 @@
+ echo "buildconf: libtool version $lt_version (ok)"
+ 
+ #--------------------------------------------------------------------------
+-# GNU libtoolize check
+-#
+-if test -z "$LIBTOOLIZE"; then
+-  # use (g)libtoolize from same location as (g)libtool
+-  libtoolize="${libtool}ize"
+-else
+-  libtoolize=`findtool $LIBTOOLIZE`
+-fi
+-if test ! -f "$libtoolize"; then
+-  echo "buildconf: libtoolize not found."
+-  echo "            You need GNU libtoolize $want_lt_version or newer installed."
+-  exit 1
+-fi
+-
+-#--------------------------------------------------------------------------
+ # m4 check
+ #
+ m4=`(${M4:-m4} --version || ${M4:-gm4} --version) 2>/dev/null | head -n 1`;