[asterisk-commits] seanbright: branch 1.6.1 r157602 - in /branches/1.6.1: ./ build_tools/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Nov 18 18:38:23 2008
New Revision: 157602

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157602
Log:
Merged revisions 157600 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157600 | seanbright | 2008-11-18 19:27:45 -0500 (Tue, 18 Nov 2008) | 10 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile
    branches/1.6.1/build_tools/make_buildopts_h
    branches/1.6.1/build_tools/make_version
    branches/1.6.1/configure
    branches/1.6.1/configure.ac
    branches/1.6.1/makeopts.in

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/Makefile?view=diff&rev=157602&r1=157601&r2=157602
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Tue Nov 18 18:38:23 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: branches/1.6.1/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/build_tools/make_buildopts_h?view=diff&rev=157602&r1=157601&r2=157602
==============================================================================
--- branches/1.6.1/build_tools/make_buildopts_h (original)
+++ branches/1.6.1/build_tools/make_buildopts_h Tue Nov 18 18:38:23 2008
@@ -27,17 +27,7 @@
 	TMP="${TMP} AST_DEVMODE"
 fi
 
-case ${OSARCH} in	# actually we should check build_os
-*BSD|mingw|darwin*)
-	BUILDSUM=`echo ${TMP} | md5 | cut -c1-32`
-	;;
-SunOS)
-	BUILDSUM=`echo ${TMP} | digest -a md5 | cut -c1-32`
-	;;
-*)
-	BUILDSUM=`echo ${TMP} | md5sum | cut -c1-32`
-	;;
-esac
+BUILDSUM=`echo ${TMP} | ${MD5} | cut -c1-32`
 
 echo "#define AST_BUILDOPT_SUM \"${BUILDSUM}\""
 

Modified: branches/1.6.1/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/build_tools/make_version?view=diff&rev=157602&r1=157601&r2=157602
==============================================================================
--- branches/1.6.1/build_tools/make_version (original)
+++ branches/1.6.1/build_tools/make_version Tue Nov 18 18:38:23 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: branches/1.6.1/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=157602&r1=157601&r2=157602
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Tue Nov 18 18:38:23 2008
@@ -175,6 +175,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: branches/1.6.1/makeopts.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/makeopts.in?view=diff&rev=157602&r1=157601&r2=157602
==============================================================================
--- branches/1.6.1/makeopts.in (original)
+++ branches/1.6.1/makeopts.in Tue Nov 18 18:38:23 2008
@@ -24,6 +24,7 @@
 DOWNLOAD=@DOWNLOAD@
 RUBBER=@RUBBER@
 KPATHSEA=@KPATHSEA@
+MD5=@MD5@
 
 BUILD_PLATFORM=@BUILD_PLATFORM@
 BUILD_CPU=@BUILD_CPU@