[asterisk-commits] qwell: trunk r262299 - /trunk/bootstrap.sh

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue May 11 11:43:07 2010
New Revision: 262299

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262299
Log:
Allow bootstrap script to work on Solaris.

As usual, the way they do things is different, so we need to account for that.
automake is versioned ala BSD/Linux, but autoconf is not.  We don't actually
need to specify a version there, since AC_PREREQ will cover it for us.  Things
will fail pretty loudly if AC_PREREQ isn't met.

(closes issue #16341)
Reported by: bklang
Patches: 
      opensolaris_bootstrap.sh uploaded by bklang (license 919)

Modified:
    trunk/bootstrap.sh

Modified: trunk/bootstrap.sh
URL: http://svnview.digium.com/svn/asterisk/trunk/bootstrap.sh?view=diff&rev=262299&r1=262298&r2=262299
==============================================================================
--- trunk/bootstrap.sh (original)
+++ trunk/bootstrap.sh Tue May 11 11:43:07 2010
@@ -10,28 +10,30 @@
 }
 
 # On FreeBSD and OpenBSD, multiple autoconf/automake versions have different names.
-# On linux, envitonment variables tell which one to use.
+# On Linux, environment variables tell which one to use.
 
-uname -s | grep -q BSD
-if [ $? = 0 ] ; then	# BSD case
-	case `uname -sr` in
-		'FreeBSD 4'*)	# FreeBSD 4.x has a different naming
-			MY_AC_VER=259
-			MY_AM_VER=19
-			;;
-		*)
-			MY_AC_VER=-2.62
-			MY_AM_VER=-1.9
-			;;
-	esac
-else	# linux case
-	MY_AC_VER=
-	MY_AM_VER=
-	AUTOCONF_VERSION=2.60
-	AUTOMAKE_VERSION=1.9
-	export AUTOCONF_VERSION
-	export AUTOMAKE_VERSION
-fi
+case `uname -sr` in
+	'FreeBSD 4'*)	# FreeBSD 4.x has a different naming
+		MY_AC_VER=259
+		MY_AM_VER=19
+		;;
+	*'BSD'*)
+		MY_AC_VER=-2.62
+		MY_AM_VER=-1.9
+		;;
+	*'SunOS '*)
+		MY_AC_VER=
+		MY_AM_VER=-1.9
+		;;
+	*)
+		MY_AC_VER=
+		MY_AM_VER=
+		AUTOCONF_VERSION=2.60
+		AUTOMAKE_VERSION=1.9
+		export AUTOCONF_VERSION
+		export AUTOMAKE_VERSION
+		;;
+esac
 
 check_for_app autoconf${MY_AC_VER}
 check_for_app autoheader${MY_AC_VER}