Merge remote-tracking branch 'origin/master' into for-steve

[sxemacs] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5bd7a2e..4b2ee13 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,7 +26,7 @@
 # BSD's m4 probably isn't gonna cut it, use gm4 if it is available
 type gm4 >/dev/null 2>&1 && M4=gm4 || M4=m4
 
-M4_VERSION=$($M4 --version | head -1 | sed -e 's/^\(m4 \)\?(\?GNU M4)\? *//g' ) 
+M4_VERSION=$($M4 --version | head -n1 | sed -e 's/^\(m4 \)\?(\?GNU M4)\? *//g' )
 GOOD_M4=$( echo $M4_VERSION | awk -F. '{if( ($1>1) || ( ($1==1) && ($2>4) ) || ( ($1==1) && ($2==4) && ($3>=6) )) print 1 }')
 
 if [ "$GOOD_M4" != "1" ]; then
@@ -36,7 +36,8 @@ fi
 
 # To cater for Solaris
 if test -d "/usr/xpg4/bin"; then
-    PATH=/usr/xpg4/bin:$PATH
+    # don't add xpg4 dir to PATH if on OpenIndiana
+    grep -q OpenIndiana /etc/release 2>/dev/null||PATH=/usr/xpg4/bin:$PATH
     export PATH
 fi
 
@@ -50,12 +51,12 @@ EXPECTED_TREE_VERSION="22.1.14"
 emacs_is_beta=t
 if test -n "$GIT" -a -n "$($GIT symbolic-ref HEAD 2>/dev/null)"; then
        TREE_VERSION="$($GIT tag|tail -n1|tr -d v)"
-       GIT_VERSION="$($GIT describe)"
+       GIT_VERSION="$($GIT describe | head -n1)"
        IN_GIT="1"
 fi
 if test -z "$TREE_VERSION"; then
-        TREE_VERSION="$EXPECTED_TREE_VERSION"
-        if test -n "$IN_GIT"; then
+       TREE_VERSION="$EXPECTED_TREE_VERSION"
+       if test -n "$IN_GIT"; then
            echo "If you cloned this branch into your own you should issue:"
            echo "\tgit tag -s v${TREE_VERSION}.<your branch_name>"
            echo "\tgit push --tag"
@@ -86,7 +87,7 @@ if test "$emacs_full_version" != "$EXPECTED_TREE_VERSION"; then
     git describe --long
     git config -l
     set +x
-    echo "*******************************************" 
+    echo "*******************************************"
 fi
 
 autoconf_ver=$(autoconf --version 2>/dev/null | head -n1)