mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-16 21:37:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check headers first and let the CHECK_LIBRARY macro

Browse Source 
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.
This commit is contained in:
Rasmus Lerdorf 2011-05-12 08:19:37 +00:00
parent c6ea819db4
commit 155972b117
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/gd/config.m4
View File

@ -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)