mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-17 03:08:58 +00:00
Code Issues Projects Releases Wiki Activity

OpenSSL is now not enforced compile.sh

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-02-17 01:46:28 +01:00
parent 6b2bca10a3
commit 98c50f9a9c
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/build/compile.sh
View File

@ -224,7 +224,9 @@ cd ..
rm -r -f ./zlib
echo " done!"
if [ "$2" == "openssl" ]; then
#OpenSSL
WITH_OPENSSL="--with-ssl=$DIR/install_data/php/ext/openssl"
echo -n "[OpenSSL] downloading $OPENSSL_VERSION..."
download_file "http://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1
mv openssl-$OPENSSL_VERSION openssl
@ -249,6 +251,9 @@ echo -n " cleaning..."
cd ..
rm -r -f ./openssh
echo " done!"
else
WITH_OPENSSL="--with-ssl"
fi
if [ "$(uname -s)" == "Darwin" ] && [ "$1" != "crosscompile" ] && [ "$2" != "curl" ]; then
HAVE_CURL="shared,/usr"
@ -280,7 +285,7 @@ else
--disable-ldaps \
--without-libidn \
--with-zlib="$DIR/install_data/php/ext/zlib" \
--with-ssl="static,$DIR/install_data/php/ext/openssl" \
$WITH_OPENSSL \
--enable-threaded-resolver \
--prefix="$DIR/install_data/php/ext/curl" \
--disable-shared \