From c4bbcc83b60f5945e7dc3973209140179e49407e Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 6 Jun 2005 21:19:04 +0000
Subject: [PATCH] Tupone Alfredo's fixes:

1) findtool does look per tool in PATH and think ./perl is the perl
executable, while is just a local directory (I have . in the PATH)

2) I got several warning for head -1 deprecated in favour of head -n 1

3) ares directory is missing some file (missing is missing :-) ) because
automake and friends is not run.

(Let's hope number 2 doesn't break somewhere "out there", if so we can always
search/replace that back.)
---
 CHANGES                  |  3 +++
 buildconf                | 18 ++++++++++++------
 docs/libcurl/Makefile.am |  3 ++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index dfd9f4421..b1e31ecd7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@
 
 
 Daniel (3 June 2005)
+- Added docs/libcurl/getinfo-times, based on feedback from 'Edi':
+  http://curl.haxx.se/feedback/display.cgi?id=11178325798299&support=yes
+
 - Andres Garcia provided yet another text mode patch for several test cases so
   that they do text comparisions better on Windows (newline-wise).
 
diff --git a/buildconf b/buildconf
index 52f96439a..7a3a86dc0 100755
--- a/buildconf
+++ b/buildconf
@@ -13,7 +13,7 @@ findtool(){
   IFS=":"
   for path in $PATH
   do
-    if test -r "$path/$file"; then
+    if test \( -x "$path/$file" \) -a \( ! \( -d "$path/$file" \) \) ; then
       echo "$path/$file"
       return
     fi
@@ -24,7 +24,7 @@ findtool(){
 # autoconf 2.57 or newer
 #
 need_autoconf="2.57"
-ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|head -1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
+ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|head -n 1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
   echo "buildconf: autoconf not found."
   echo "            You need autoconf version $need_autoconf or newer installed."
@@ -45,7 +45,7 @@ echo "buildconf: autoconf version $ac_version (ok)"
 #--------------------------------------------------------------------------
 # autoheader 2.50 or newer
 #
-ah_version=`${AUTOHEADER:-autoheader} --version 2>/dev/null|head -1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
+ah_version=`${AUTOHEADER:-autoheader} --version 2>/dev/null|head -n 1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ah_version"; then
   echo "buildconf: autoheader not found."
   echo "            You need autoheader version 2.50 or newer installed."
@@ -67,7 +67,7 @@ echo "buildconf: autoheader version $ah_version (ok)"
 # automake 1.7 or newer
 #
 need_automake="1.7"
-am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//' -e 's/\(.*\)\(-p.*\)/\1/'`
+am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -n 1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//' -e 's/\(.*\)\(-p.*\)/\1/'`
 if test -z "$am_version"; then
   echo "buildconf: automake not found."
   echo "            You need automake version $need_automake or newer installed."
@@ -113,7 +113,7 @@ fi
 # set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found
 LIBTOOLIZE="${libtool}ize"
 
-lt_pversion=`$libtool --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
+lt_pversion=`$libtool --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//g' -e 's/[- ].*//'`
 if test -z "$lt_pversion"; then
   echo "buildconf: libtool not found."
   echo "            You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
@@ -160,7 +160,7 @@ fi
 #--------------------------------------------------------------------------
 # m4 check
 #
-m4=`${M4:-m4} --version 2>/dev/null|head -1`;
+m4=`${M4:-m4} --version 2>/dev/null|head -n 1`;
 m4_version=`echo $m4 | sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`
 
 if { echo $m4 | grep "GNU" >/dev/null 2>&1; } then
@@ -199,10 +199,16 @@ ${AUTOCONF:-autoconf}     || die "The autoconf command failed"
 
 if test -d ares; then
   cd ares
+  echo "buildconf: running libtoolize in the ares directory"
+  ${LIBTOOLIZE:-libtoolize} --copy --automake --force || die "The ares libtool command failed"
+  echo "buildconf: running autoheader in the ares directory"
+  ${AUTOHEADER:-autoheader} || die "The ares autoheader command failed"
   echo "buildconf: running aclocal in the ares directory"
   ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The ares aclocal command failed"
   echo "buildconf: running autoconf in the ares directory"
   ${AUTOCONF:-autoconf}     || die "The ares autoconf command failed"
+  echo "buildconf: running automake in the ares directory"
+  ${AUTOMAKE:-automake} -a  || die "The ares automake command failed"
   cd ..
 fi
 
diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am
index caea9b9aa..de7fd95dd 100644
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -52,7 +52,8 @@ PDFPAGES = curl_easy_cleanup.pdf curl_easy_getinfo.pdf			\
 
 CLEANFILES = $(HTMLPAGES) $(PDFPAGES)
 
-EXTRA_DIST = $(man_MANS) $(HTMLPAGES) index.html $(PDFPAGES) libcurl.m4
+EXTRA_DIST = $(man_MANS) $(HTMLPAGES) index.html $(PDFPAGES) libcurl.m4 \
+ getinfo-times
 
 MAN2HTML= roffit --mandir=. < $< >$@