update

plugins/php/versions/55/install.sh

@@ -7,15 +7,9 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
-
+sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-# echo $curPath
-# echo ${1}
-# echo ${serverPath}
-# echo ${install_tmp}
-
-
 Install_php()
 {
 #------------------------ install start ------------------------------------#
@@ -31,6 +25,13 @@ if [ ! -d $sourcePath/php/php-5.5.38 ];then
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-5.5.38.tar.xz
 fi
 
+OPTIONS=''
+if [ $sysName == 'Darwin' ]; then
+	OPTIONS='--without-iconv'
+else
+	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
+fi
+
 
 cd $sourcePath/php/php-5.5.38 && ./configure \
 --prefix=$serverPath/php/55 \
@@ -38,7 +39,6 @@ cd $sourcePath/php/php-5.5.38 && ./configure \
 --with-config-file-path=$serverPath/php/55/etc \
 --with-zlib-dir=$serverPath/lib/zlib \
 --enable-mysqlnd \
---without-iconv \
 --enable-zip \
 --enable-intl \
 --enable-mbstring \
@@ -50,6 +50,7 @@ cd $sourcePath/php/php-5.5.38 && ./configure \
 --enable-sysvmsg \
 --enable-sysvsem \
 --enable-sysvshm \
+$OPTIONS \
 --enable-fpm \
 && make && make install && make clean