From: Peter Kokot <peterkokot@gmail.com>
Date: Tue, 2 Jul 2019 20:29:54 +0000 (+0200)
Subject: Enable option checking on CI
X-Git-Tag: php-7.4.0alpha3~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a45192e183d456b3288e466b51137e7e2a5e2cf6;p=php

Enable option checking on CI

This adds the Autoconf's --enable-option-checking=fatal option so
when non existing option from the PHP's configure options is used
a fatal error happens.
---

diff --git a/azure/i386/job.yml b/azure/i386/job.yml
index 09bca0918e..1183906fce 100644
--- a/azure/i386/job.yml
+++ b/azure/i386/job.yml
@@ -15,6 +15,7 @@ jobs:
         export LDFLAGS=-L/usr/lib/i386-linux-gnu
         export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
         ./configure ${{ parameters.configurationParameters }} \
+            --enable-option-checking=fatal \
             --prefix=/usr \
             --enable-phpdbg \
             --enable-fpm \
diff --git a/azure/job.yml b/azure/job.yml
index 646faed755..994ccf0981 100644
--- a/azure/job.yml
+++ b/azure/job.yml
@@ -14,6 +14,7 @@ jobs:
     - script: |
         ./buildconf --force
         ./configure ${{ parameters.configurationParameters }} \
+            --enable-option-checking=fatal \
             --prefix=/usr \
             --enable-phpdbg \
             --enable-fpm \
diff --git a/azure/macos/job.yml b/azure/macos/job.yml
index a69a643e8a..2d656ec15c 100644
--- a/azure/macos/job.yml
+++ b/azure/macos/job.yml
@@ -19,6 +19,7 @@ jobs:
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
         ./buildconf --force
         ./configure ${{ parameters.configurationParameters }} \
+            --enable-option-checking=fatal \
             --prefix=/usr/local \
             --disable-phpdbg \
             --enable-fpm \
diff --git a/azure/msan_job.yml b/azure/msan_job.yml
index bae65e018e..28dcae3f88 100644
--- a/azure/msan_job.yml
+++ b/azure/msan_job.yml
@@ -20,6 +20,7 @@ jobs:
         # msan requires all used libraries to be instrumented,
         # so we should avoiding linking against anything but libc here
         ./configure ${{ parameters.configurationParameters }} \
+            --enable-option-checking=fatal \
             --prefix=/usr \
             --without-sqlite3 \
             --without-pdo-sqlite \
diff --git a/travis/compile.sh b/travis/compile.sh
index 4f5b88e386..b03336bdc8 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -5,7 +5,7 @@ else
 	TS="";
 fi
 if [[ "$ENABLE_DEBUG" == 1 ]]; then
-	DEBUG="--enable-debug --without-pcre-valgrind";
+	DEBUG="--enable-debug";
 else
 	DEBUG="";
 fi
@@ -27,6 +27,7 @@ MAKE_JOBS=${MAKE_JOBS:-2}
 
 ./buildconf --force
 ./configure \
+--enable-option-checking=fatal \
 --prefix="$HOME"/php-install \
 $CONFIG_QUIET \
 $DEBUG \
@@ -46,7 +47,7 @@ $TS \
 --with-freetype \
 --with-xpm \
 --enable-exif \
---enable-zip \
+--with-zip \
 --with-zlib \
 --with-zlib-dir=/usr \
 --enable-soap \