jlengrand/asdf-php
1
0
Fork 0
mirror of https://github.com/jlengrand/asdf-php.git synced 2026-03-10 08:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve curl on OSX. Remove unused dependency.

Browse Source
This commit is contained in:
Óscar de Arriba
2016-10-28 12:42:53 +02:00
parent d4309ab0ea
commit 627770d599
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/install
View File

@@ -41,7 +41,7 @@ install_php() {
construct_configure_options() {
local install_path=$1
global_config="--prefix=$install_path --sysconfdir=$install_path --with-config-file-path=$install_path --with-config-file-scan-dir=$install_path/conf.d --enable-bcmath --enable-calendar --enable-dba --enable-exif --enable-ftp --enable-gd-native-ttf --enable-intl --enable-mbregex --enable-mbstring --enable-shmop --enable-soap --enable-sockets --enable-sysvmsg --enable-sysvsem --enable-sysvshm --enable-wddx --enable-zip --with-gd --with-libedit --with-mhash --with-xmlrpc --without-gmp --without-snmp --with-mysql=mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd --enable-mysqlnd --enable-pcntl --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
global_config="--prefix=$install_path --sysconfdir=$install_path --with-config-file-path=$install_path --with-config-file-scan-dir=$install_path/conf.d --enable-bcmath --enable-calendar --enable-dba --enable-exif --enable-ftp --enable-gd-native-ttf --enable-intl --enable-mbregex --enable-mbstring --enable-shmop --enable-soap --enable-sockets --enable-sysvmsg --enable-sysvsem --enable-sysvshm --enable-wddx --enable-zip --with-gd --with-libedit --with-mhash --with-xmlrpc --with-curl --without-gmp --without-snmp --with-mysql=mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd --enable-mysqlnd --enable-pcntl --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data"
if [ "$PHP_CONFIGURE_OPTIONS" = "" ]; then
local configure_options="$(os_based_configure_options) $global_config"
@@ -86,7 +86,6 @@ os_based_configure_options() {
local jpeg_path=$(homebrew_package_path jpeg)
local libpng_path=$(homebrew_package_path libpng)
local openssl_path=$(homebrew_package_path openssl)
local curl_path=$(homebrew_package_path curl)
local libxml2_path=$(homebrew_package_path libxml2)
local zlib_path=$(homebrew_package_path zlib)
local readline_path=$(homebrew_package_path readline)
@@ -131,12 +130,6 @@ os_based_configure_options() {
configure_options="$configure_options --with-openssl=$openssl_path"
fi
if [ "$curl_path" = "" ]; then
export ASDF_PKG_MISSING="$ASDF_PKG_MISSING curl"
else
configure_options="$configure_options --with-curl=$curl_path"
fi
if [ "$libxml2_path" = "" ]; then
export ASDF_PKG_MISSING="$ASDF_PKG_MISSING libxml2"
else