Use "+=" consistently for appending to $my_conf.

[mjo-overlay.git] / dev-lang / php / php-5.6.4-r1.ebuild

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index d3a34aa13f1f5a093ed73102a8d8cabd61825086..f7a181aae946f88a7da6ff584ed3fd785d03d02c 100644 (file)
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -438,7 +438,7 @@ src_configure() {
        # DBA support
        if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
                || use qdbm ; then
-               my_conf="${my_conf} --enable-dba${shared}"
+               my_conf+=" --enable-dba${shared}"
        fi
 
        # DBA drivers support
@@ -481,10 +481,9 @@ src_configure() {
        my_conf+=" $(use_with pdo-mysql pdo-mysql ${mysqllib})"
 
        # If MySQL is enabled in any way, pass --with-mysql-sock to ./configure.
-       local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-       my_conf+=" $(use_with mysql mysql-sock $mysqlsock)"
-       my_conf+=" $(use_with mysqli mysql-sock $mysqlsock)"
-       my_conf+=" $(use_with pdo-mysql mysql-sock $mysqlsock)"
+       if use mysql || use mysqli || use pdo-mysql ; then
+               my_conf+=" --with-mysql-sock=${EPREFIX}/var/run/mysqld/mysqld.sock"
+       fi
 
        # Session support
        if use session ; then
@@ -496,12 +495,12 @@ src_configure() {
        fi
 
        # Use pic for shared modules such as apache2's mod_php
-       my_conf="${my_conf} --with-pic"
+       my_conf+=" --with-pic"
 
        # we use the system copy of pcre
        # --with-pcre-regex affects ext/pcre
        # --with-pcre-dir affects ext/filter and ext/zip
-       my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+       my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
 
        # Catch CFLAGS problems
        # Fixes bug #14067.
@@ -509,7 +508,7 @@ src_configure() {
        replace-cpu-flags "k6*" "i586"
 
        # Support user-passed configuration parameters
-       my_conf="${my_conf} ${EXTRA_ECONF:-}"
+       my_conf+=" ${EXTRA_ECONF:-}"
 
        # Support the Apache2 extras, they must be set globally for all
        # SAPIs to work correctly, especially for external PHP extensions