diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2011-05-12 08:19:37 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2011-05-12 08:19:37 +0000 |
| commit | 155972b11725ff29317f6e3ed12c65e02ee8f5c4 (patch) | |
| tree | a6119996efaf2bb3eff73f4489caee00720b2dcb | |
| parent | c6ea819db485a30a2b50e7c85a0b54d38137d166 (diff) | |
| download | php-git-155972b11725ff29317f6e3ed12c65e02ee8f5c4.tar.gz | |
Check headers first and let the CHECK_LIBRARY macro
handle checking for the library. This makes it
correctly handle non-standard system paths as long
as gcc knows about them. Should fix the build on
Ubuntu natty.
| -rw-r--r-- | ext/gd/config.m4 | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index f68f5dd06c..79a74e1408 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -77,11 +77,11 @@ AC_DEFUN([PHP_GD_VPX],[ if test "$PHP_VPX_DIR" != "no"; then for i in $PHP_VPX_DIR /usr/local /usr; do - test -f $i/$PHP_VPX_DIR/libvpx.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libvpx.a && GD_VPX_DIR=$i && break + test -f $i/include/vpx_codec.h || test -f $i/include/vpx/vpx_codec.h && GD_VPX_DIR=$i && break done if test -z "$GD_VPX_DIR"; then - AC_MSG_ERROR([libvpx.(a|so) not found.]) + AC_MSG_ERROR([vpx_codec.h not found.]) fi PHP_CHECK_LIBRARY(vpx,vpx_codec_destroy, @@ -103,11 +103,11 @@ AC_DEFUN([PHP_GD_JPEG],[ if test "$PHP_JPEG_DIR" != "no"; then for i in $PHP_JPEG_DIR /usr/local /usr; do - test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break + test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break done if test -z "$GD_JPEG_DIR"; then - AC_MSG_ERROR([libjpeg.(a|so) not found.]) + AC_MSG_ERROR([jpeglib.h not found.]) fi PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, @@ -128,21 +128,17 @@ 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/include/png.h && GD_PNG_DIR=$i && break done if test -z "$GD_PNG_DIR"; then - AC_MSG_ERROR([libpng.(a|so) not found.]) + AC_MSG_ERROR([png.h not found.]) fi if test "$PHP_ZLIB_DIR" = "no"; then AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>]) fi - if test ! -f $GD_PNG_DIR/include/png.h; then - AC_MSG_ERROR([png.h not found.]) - fi - PHP_CHECK_LIBRARY(png,png_write_image, [ PHP_ADD_INCLUDE($GD_PNG_DIR/include) |