Move zip config option logic to bin/install-libzip

BanzaiMan · BanzaiMan · commit 6e5d8c85f32d · 2019-12-06T17:28:34.000-05:00
diff --git a/bin/install-libzip b/bin/install-libzip
@@ -38,4 +38,8 @@ make install
 popd
 
 # add the option in custom_configure_options
-echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+if [[ "$(printf "7.3\n$VERSION" | sort -V | head -n1)" < "7.4" ]]; then
+	echo "--with-libzip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+else
+	echo "--with-zip=$LIBZIP_INSTALL_DIR" >> $TRAVIS_BUILD_DIR/custom_configure_options
+fi
diff --git a/default_configure_options.bionic-7.4 b/default_configure_options.bionic-7.4
@@ -5,7 +5,6 @@
 --with-jpeg=/usr
 --with-freetype=/usr
 --enable-exif
---with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-mcrypt=/usr
diff --git a/default_configure_options.trusty-7.4 b/default_configure_options.trusty-7.4
@@ -5,7 +5,6 @@
 --with-jpeg=/usr
 --with-freetype=/usr
 --enable-exif
---with-zip
 --with-mcrypt=/usr
 --with-pdo-sqlite
 --enable-soap
diff --git a/default_configure_options.xenial-7.4 b/default_configure_options.xenial-7.4
@@ -5,7 +5,6 @@
 --with-jpeg=/usr
 --with-freetype=/usr
 --enable-exif
---with-zip
 --with-zlib
 --with-zlib-dir=/usr
 --with-mcrypt=/usr
