improvement to how options are added to default_configure_options

Author: joshk

.travis.yml

@@ -92,6 +92,7 @@ install:
   fi
 - ./bin/install-icu
 - export PKG_CONFIG_PATH=$ICU_INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
+- touch custom_configure_options
 - ./bin/install-libzip
 - ./bin/install-libsodium
 - ./bin/install-password-argon2
@@ -101,6 +102,7 @@ install:
   else
     cp default_configure_options.$RELEASE $HOME/.php-build/share/php-build/default_configure_options
   fi
+- cat custom_configure_options >> $HOME/.php-build/share/php-build/default_configure_options
 - | # disable xdebug on master
   if [[ $VERSION = master && $RELEASE != xenial ]]; then
     sed -i -e '/install_xdebug_master/d' $HOME/.php-build/share/php-build/definitions/$VERSION

bin/install-icu

@@ -22,5 +22,5 @@ popd
 
 # PHP >= 7.4 exclusively uses pkg-config for ICU
 if [[ $VERSION =~ ^5 || $VERSION =~ 7\.[0123] ]]; then
-    echo "--with-icu-dir=$ICU_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+    echo "--with-icu-dir=$ICU_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
 fi

bin/install-libsodium

@@ -20,5 +20,5 @@ make check
 make install
 popd
 
-# add the option in default_configure_options
-echo "--with-sodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+# add the option in custom_configure_options
+echo "--with-sodium=$LIBSODIUM_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options

bin/install-libzip

@@ -36,5 +36,5 @@ make
 make install
 popd
 
-# add the option in default_configure_options
-echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+# add the option in custom_configure_options
+echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options

bin/install-password-argon2

@@ -19,5 +19,5 @@ make test
 make install PREFIX=$LIBARGON2_INSTALL_DIR
 popd
 
-# add the option in default_configure_options
-echo "--with-password-argon2=$LIBARGON2_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/default_configure_options.${RELEASE}
+# add the option in custom_configure_options
+echo "--with-password-argon2=$LIBARGON2_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options