Change the use of head to be 'head -n -1', since the GNU version of head

	* autogen.sh: Change the use of head to be 'head -n -1', since
	the GNU version of head appears to have changed behaviour
	between version 5.0 and 5.0.9 somewhere. This should be portable
	across all versions now. Fixed bug #128867.

svn path=/trunk/; revision=3433

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index f8533ad..e938001 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-13  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+       * autogen.sh: Change the use of head to be 'head -n -1', since
+       the GNU version of head appears to have changed behaviour
+       between version 5.0 and 5.0.9 somewhere. This should be portable
+       across all versions now. Fixed bug #128867.
+
 2003-12-08  Rodney Dawes  <dobey@free.fr>
 
        * autogen.sh: Update automake checks to check incremental

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index bdde708..103c98f 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -91,7 +91,7 @@ version_check() {
     for vc_checkprog in $vc_checkprogs; do
        echo $ECHO_N "  testing $vc_checkprog... "
        if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
-           vc_actual_version=`$vc_checkprog --version | head -1 | \
+           vc_actual_version=`$vc_checkprog --version | head -n 1 | \
                                sed 's/^.*[     ]\([0-9.]*[a-z]*\).*$/\1/'`
            if compare_versions $vc_min_version $vc_actual_version; then
                echo "found $vc_actual_version"