[asterisk-commits] seanbright: trunk r157600 - in /trunk: ./ build_tools/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Nov 18 18:27:45 2008
New Revision: 157600

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157600
Log:
Fix a few build problems on Solaris (and check for an md5 utility in
configure instead of the icky loop I was doing before).

(closes issue #13842)
Reported by: snuffy
Patches:
      bug13842_20081106.diff uploaded by snuffy (license 35)
      13842.diff uploaded by seanbright (license 71)
Tested by: snuffy

Modified:
    trunk/Makefile
    trunk/build_tools/make_buildopts_h
    trunk/build_tools/make_version
    trunk/configure
    trunk/configure.ac
    trunk/makeopts.in

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=157600&r1=157599&r2=157600
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Nov 18 18:27:45 2008
@@ -92,6 +92,7 @@
 export AWK
 export GREP
 export ID
+export MD5
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't

Modified: trunk/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_buildopts_h?view=diff&rev=157600&r1=157599&r2=157600
==============================================================================
--- trunk/build_tools/make_buildopts_h (original)
+++ trunk/build_tools/make_buildopts_h Tue Nov 18 18:27:45 2008
@@ -26,13 +26,8 @@
 	echo "#define AST_DEVMODE 1"
 	TMP="${TMP} AST_DEVMODE"
 fi
-for x in md5 digest md5sum gmd5sum; do
-	BUILDSUM=`echo ${TMP} | $x 2> /dev/null`
-	if [ $? = 0 ]; then
-		BUILDSUM=`echo ${BUILDSUM} | cut -c1-32`
-		break;
-	fi
-done
+
+BUILDSUM=`echo ${TMP} | ${MD5} | cut -c1-32`
 
 echo "#define AST_BUILDOPT_SUM \"${BUILDSUM}\""
 echo "#define AST_BUILDOPTS \"${BUILDOPTS}\""

Modified: trunk/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_version?view=diff&rev=157600&r1=157599&r2=157600
==============================================================================
--- trunk/build_tools/make_version (original)
+++ trunk/build_tools/make_version Tue Nov 18 18:27:45 2008
@@ -30,7 +30,7 @@
       fi
 
       if [ ${BRANCH} != 0 ] ; then
-	  if [ -z ${RESULT} ] ; then
+	  if [ -z "${RESULT}" ] ; then
 	    RESULT="${PART}"
 	  else
 	    RESULT="${RESULT}-${PART}"
@@ -39,7 +39,7 @@
       fi
 
       if [ ${TEAM} != 0 ] ; then
-	  if [ -z ${RESULT} ] ; then
+	  if [ -z "${RESULT}" ] ; then
 	    RESULT="${PART}"
 	  else
 	    RESULT="${RESULT}-${PART}"

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=157600&r1=157599&r2=157600
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Nov 18 18:27:45 2008
@@ -188,6 +188,12 @@
 AC_CHECK_TOOL([SOXMIX], [soxmix], [:])
 if test "${SOXMIX}" != ":" ; then
 	AC_DEFINE([HAVE_SOXMIX], 1, [Define to 1 if your system has soxmix application.])
+fi
+
+AC_CHECK_PROGS([MD5], [md5 md5sum gmd5sum digest])
+
+if test "${MD5}" = "digest" ; then
+   MD5="${MD5} -a md5"   
 fi
 
 ACX_PTHREAD

Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/asterisk/trunk/makeopts.in?view=diff&rev=157600&r1=157599&r2=157600
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Tue Nov 18 18:27:45 2008
@@ -25,6 +25,7 @@
 RUBBER=@RUBBER@
 KPATHSEA=@KPATHSEA@
 XMLSTARLET=@XMLSTARLET@
+MD5=@MD5@
 
 BUILD_PLATFORM=@BUILD_PLATFORM@
 BUILD_CPU=@BUILD_CPU@