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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
$NetBSD: patch-ac,v 1.2 2010/06/13 22:44:51 wiz Exp $
--- ext/gd/config.m4.orig 2009-05-27 08:18:24.000000000 +0000
+++ ext/gd/config.m4
@@ -45,18 +45,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"
@@ -65,7 +54,6 @@ AC_DEFUN([PHP_GD_ZLIB],[
PHP_ZLIB_INCDIR="$i/include"
fi
done
- fi
])
AC_DEFUN([PHP_GD_JPEG],[
@@ -97,11 +85,11 @@ AC_DEFUN([PHP_GD_PNG],[
if test "$PHP_PNG_DIR" != "no"; then
for i in $PHP_PNG_DIR /usr/local /usr; do
- test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
+ test -f $i/$PHP_LIBDIR/libpng14.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng14.a && GD_PNG_DIR=$i && break
done
if test -z "$GD_PNG_DIR"; then
- AC_MSG_ERROR([libpng.(a|so) not found.])
+ AC_MSG_ERROR([libpng14.(a|so) not found.])
fi
if test "$PHP_ZLIB_DIR" = "no"; then
@@ -112,13 +100,13 @@ AC_DEFUN([PHP_GD_PNG],[
AC_MSG_ERROR([png.h not found.])
fi
- PHP_CHECK_LIBRARY(png,png_write_image,
+ PHP_CHECK_LIBRARY(png14,png_write_image,
[
PHP_ADD_INCLUDE($GD_PNG_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(png14, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
],[
- AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
+ AC_MSG_ERROR([Problem with libpng14.(a|so) or libz.(a|so). Please check config.log for more information.])
],[
-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
])
|
