summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm@src.gnome.org>2003-12-12 23:43:52 +0000
committerMalcolm Tredinnick <malcolm@src.gnome.org>2003-12-12 23:43:52 +0000
commitc6c875f031f3cfd4c2abc5af4f23f38bf5892884 (patch)
tree0d40704e1f99e94c7beba43233cea328df31d220
parent42806807b7d67bfe3f9585492128f4984dc31c87 (diff)
downloadgnome-common-c6c875f031f3cfd4c2abc5af4f23f38bf5892884.tar.gz
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
-rw-r--r--macros2/ChangeLog7
-rw-r--r--macros2/autogen.sh2
2 files changed, 8 insertions, 1 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index f8533ad..e938001 100644
--- 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
--- 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"