Merge pull request #40 from sminnee/fix-74-again

Fix 7.4 (and 7.2) builds

Author: BanzaiMan

.travis.yml

@@ -85,9 +85,10 @@ install:
 - ./bin/install-libsodium
 - ./bin/install-password-argon2
 - . ./bin/install-onig # sourced to export ONIG_LIBS
+- MINOR_VERSION=`echo $VERSION | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/'` # Rewrites 7.2, 7.2snapshot, 7.2.13 => '7.2'. Leaves 'master' as-is
 - |
-  if [[ -f default_configure_options.$RELEASE-${VERSION%*.*} ]]; then
-    cp default_configure_options.$RELEASE-${VERSION%*.*} $HOME/.php-build/share/php-build/default_configure_options
+  if [[ -f default_configure_options.$RELEASE-$MINOR_VERSION ]]; then
+    cp default_configure_options.$RELEASE-$MINOR_VERSION $HOME/.php-build/share/php-build/default_configure_options
   else
     cp default_configure_options.$RELEASE $HOME/.php-build/share/php-build/default_configure_options
   fi

default_configure_options.trusty-7.4snapshot renamed to default_configure_options.trusty-7.4

@@ -5,7 +5,7 @@
 --with-jpeg
 --with-freetype
 --enable-exif
---enable-zip
+--with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-pdo-sqlite

default_configure_options.trusty-master

@@ -5,7 +5,7 @@
 --with-jpeg
 --with-freetype
 --enable-exif
---enable-zip
+--with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-pdo-sqlite

default_configure_options.xenial-7.4snapshot renamed to default_configure_options.xenial-7.4

@@ -5,7 +5,7 @@
 --with-jpeg
 --with-freetype
 --enable-exif
---enable-zip
+--with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-pdo-sqlite

default_configure_options.xenial-master

@@ -5,7 +5,7 @@
 --with-jpeg
 --with-freetype
 --enable-exif
---enable-zip
+--with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-pdo-sqlite