diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 00:27:45 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 00:27:45 +0000 |
| commit | d5dcd2feb833a357cec7527ff1da4750a42c907a (patch) | |
| tree | b0ee467816e3bb82d1ffd85c5ba5acf98af93bff /build_tools | |
| parent | 7fe747fbe1da22f2a8307aa66ad31135b5715533 (diff) | |
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/trunk@157600 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_buildopts_h | 9 | ||||
| -rwxr-xr-x | build_tools/make_version | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index 93be6da7e..4f02896e4 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -26,13 +26,8 @@ then 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}\"" 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}" |