blob: be353de85a21de65e3d7c087fa8b0cfbceb8c55a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
$NetBSD: patch-al,v 1.3 2007/02/20 20:46:20 jdolecek Exp $
--- ext/gd/config.m4.orig 2007-02-20 21:14:31.000000000 +0100
+++ ext/gd/config.m4
@@ -48,18 +48,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"
@@ -68,7 +57,6 @@ AC_DEFUN([PHP_GD_ZLIB],[
PHP_ZLIB_INCDIR="$i/include"
fi
done
- fi
])
AC_DEFUN([PHP_GD_JPEG],[
|
