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

Merge pull request #13 from salzig/feat/detect_iconv

Browse Source 
feat: detect iconv on MacOS
This commit is contained in:
Óscar de Arriba
2019-01-30 12:37:09 +01:00
committed by GitHub
parent ea62fdcebb d9bfe26af1
commit a732ca8951
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/install
View File

@@ -93,6 +93,7 @@ os_based_configure_options() {
local libxml2_path=$(homebrew_package_path libxml2)
local zlib_path=$(homebrew_package_path zlib)
local readline_path=$(homebrew_package_path readline)
local iconv_path=$(homebrew_package_path libiconv)
if [ "$freetype_path" = "" ]; then
export ASDF_PKG_MISSING="freetype"
@@ -149,6 +150,12 @@ os_based_configure_options() {
if [ "$readline_path" != "" ]; then
configure_options="$configure_options --with-readline=$readline_path"
fi
if [ "$iconv_path" != "" ]; then
configure_options="$configure_options --with-iconv=$iconv_path"
else
configure_options="$configure_options --without-iconv"
fi
else
local jpeg_path=$(locate libjpeg.so | head -n 1)
local libpng_path=$(locate libpng.so | head -n 1)