diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 00:38:23 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 00:38:23 +0000 |
| commit | a71d87991e8816f88cde60bd988ada6fbb0c1c9f (patch) | |
| tree | 62df6fa1cabbbd380a33f29d0fe4a5825242e37c /build_tools | |
| parent | 516df7b8c18fd2be00a8cb47e80b9f74c301ab70 (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@157602 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_buildopts_h | 12 | ||||
| -rwxr-xr-x | build_tools/make_version | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index 8409f805f..5159688af 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -27,17 +27,7 @@ then 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}\"" diff --git a/build_tools/make_version b/build_tools/make_version index 73e9864fa..67231ff0c 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -30,7 +30,7 @@ elif [ -d .svn ]; then fi if [ ${BRANCH} != 0 ] ; then - if [ -z ${RESULT} ] ; then + if [ -z "${RESULT}" ] ; then RESULT="${PART}" else RESULT="${RESULT}-${PART}" @@ -39,7 +39,7 @@ elif [ -d .svn ]; then fi if [ ${TEAM} != 0 ] ; then - if [ -z ${RESULT} ] ; then + if [ -z "${RESULT}" ] ; then RESULT="${PART}" else RESULT="${RESULT}-${PART}" |