svn commit: r1702214 - /serf/tools/buildbot/macosx/serfbuild.sh

[br...@apache.org]

Author: brane
Date: Thu Sep 10 10:54:51 2015
New Revision: 1702214

URL: http://svn.apache.org/r1702214
Log:
* tools/buildbot/macosx/serfbuild.sh: Simplify conditions.

Modified:
    serf/tools/buildbot/macosx/serfbuild.sh

Modified: serf/tools/buildbot/macosx/serfbuild.sh
URL: http://svn.apache.org/viewvc/serf/tools/buildbot/macosx/serfbuild.sh?rev=1702214&r1=1702213&r2=1702214&view=diff
==============================================================================
--- serf/tools/buildbot/macosx/serfbuild.sh (original)
+++ serf/tools/buildbot/macosx/serfbuild.sh Thu Sep 10 10:54:51 2015
@@ -29,18 +29,13 @@ ${scripts}/mkramdisk.sh ${volume_name} $
 # An optional parameter tells build scripts which version of APR to use
 if [ ! -z "$1" ]; then
     aprdir=$(eval 'echo $SERFBB_'"$1")
-fi
-if [ ! -z "${aprdir}" -a  -d "${aprdir}" ]; then
     aprconfig="APR=${aprdir}"
     apuconfig="APU=${aprdir}"
 fi
 
 # Another optional parameter tells build scripts to use a different OpenSSL
 if [ ! -z "$2" ]; then
-    openssldir=$(eval 'echo $SERFBB_'"$2")
-fi
-if [ ! -z "${openssldir}" ]; then
-    opensslconfig="OPENSSL=${openssldir}"
+    opensslconfig="OPENSSL=$(eval 'echo $SERFBB_'"$2")"
 else
     opensslconfig="OPENSSL=${SERFBB_OPENSSL}"
 fi