diff --git a/mod_php_install.sh b/mod_php_install.sh index 8b7eb5f..918ac5f 100755 --- a/mod_php_install.sh +++ b/mod_php_install.sh @@ -170,13 +170,12 @@ _required_base_packages="$_required_base_packages libmcrypt-dev mcrypt libpq-dev postgresql-client libreadline-dev libncurses-dev - libdb5.3 libdb5.3++ libdb5.3++-dev libdb5.3-dev libxslt1-dev libpcre3-dev libc-client2007e-dev libc-client-dev libicu-dev libtidy-dev libmm-dev libgmp-dev libkrb5-dev libldap-dev - libmhash-dev libgd-dev + libmhash-dev libapr1-dev libaprutil1-dev liblua5.1-0 liblua5.1-0-dev libsctp-dev @@ -197,6 +196,16 @@ else fi fi +if [[ "$os_dist" = "debian" ]] && [[ $os_version -eq 7 ]] ; then + _required_base_packages="$_required_base_packages + libgd2-xpm-dev + libdb5.1 libdb5.1++ libdb5.1++-dev libdb5.1-dev" +else + _required_base_packages="$_required_base_packages + libgd-dev + libdb5.3 libdb5.3++ libdb5.3++-dev libdb5.3-dev" +fi + if $SYSTEMD_EXISTS ; then _required_base_packages="$_required_base_packages libsystemd-dev" @@ -971,7 +980,7 @@ cd $_srcdir echononl "\tGet source php-$VERSION.tar.bz2.." if [ ! -f ${_srcdir}/php-$VERSION.tar.bz2 ]; then - wget http://de.php.net/distributions/php-$VERSION.tar.bz2 >> ${_logdir}/main.log 2>&1 + wget http://de2.php.net/distributions/php-$VERSION.tar.bz2 >> ${_logdir}/main.log 2>&1 if [ "$?" = "0" ]; then echo_ok else @@ -2214,7 +2223,7 @@ fi echononl "\tInstall memcached via pecl.." if [[ $MAIN_VERSION -lt 7 ]] ; then - printf "\n" | ${PREFIX_PHP}/bin/pecl install memcached-2.2.0 > /dev/null 2>&1 + printf "no --disable-memcached-sasl\n" | ${PREFIX_PHP}/bin/pecl install memcached-2.2.0 > /dev/null 2>&1 else printf "\n" | ${PREFIX_PHP}/bin/pecl install memcached > /dev/null 2>&1 fi