$NetBSD: patch-ext_gd_config.m4,v 1.2 2013/02/17 13:10:14 taca Exp $ --- ext/gd/config.m4.orig 2012-05-03 17:10:43.000000000 +0000 +++ ext/gd/config.m4 @@ -50,18 +50,7 @@ dnl Checks for the configure options dnl AC_DEFUN([PHP_GD_ZLIB],[ - if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then - if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then - PHP_ZLIB_DIR="$PHP_ZLIB_DIR" - PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" - elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then - PHP_ZLIB_DIR="$PHP_ZLIB_DIR" - PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" - else - AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"]) - fi - else - for i in /usr/local /usr; do + for i in "$PHP_ZLIB_DIR" /usr/local /usr; do if test -f "$i/include/zlib/zlib.h"; then PHP_ZLIB_DIR="$i" PHP_ZLIB_INCDIR="$i/include/zlib" @@ -70,7 +59,6 @@ AC_DEFUN([PHP_GD_ZLIB],[ PHP_ZLIB_INCDIR="$i/include" fi done - fi ]) AC_DEFUN([PHP_GD_VPX],[ @@ -139,13 +127,13 @@ AC_DEFUN([PHP_GD_PNG],[ AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=