diff --git a/bin/install b/bin/install index ed05558..8f3a471 100644 --- a/bin/install +++ b/bin/install @@ -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-openssl --with-curl --with-mhash --with-xmlrpc --without-gmp --without-snmp --with-mysql=mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd --enable-mysqlnd" + 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" if [ "$PHP_CONFIGURE_OPTIONS" = "" ]; then local configure_options="$(os_based_configure_options) $global_config" @@ -86,6 +86,8 @@ 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) @@ -126,7 +128,19 @@ os_based_configure_options() { if [ "$openssl_path" = "" ]; then export ASDF_PKG_MISSING="$ASDF_PKG_MISSING openssl" else - configure_options="$configure_options --with-openssl=$openssl_path" + configure_options="$configure_options --with-openssl-dir=$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 + configure_options="$configure_options --with-libxml-dir=$libxml2_path" fi if [ "$zlib_path" = "" ]; then @@ -136,8 +150,10 @@ os_based_configure_options() { fi if [ "$readline_path" != "" ]; then - configure_options="$configure_options --with-readline-dir=$readline_path" + configure_options="$configure_options --with-readline=$readline_path" fi + else + configure_options="--with-openssl --with-curl --with-zlib --with-readline --with-gettext" fi echo $configure_options