diff options
| author | Jorge Arellano Cid <jcid@dillo.org> | 2010-02-20 16:12:18 -0300 |
|---|---|---|
| committer | Jorge Arellano Cid <jcid@dillo.org> | 2010-02-20 16:12:18 -0300 |
| commit | 39b197ee628ea986198e75ddb052f84a0bce967e (patch) | |
| tree | 1d961e7c4ab16daa6205cf12a7d786e55b637cea | |
| parent | 21efa573bd44d1e7cf0b33a48a4bda99fea37c87 (diff) | |
| parent | 51f21341d90dce9dc9bf90bbdea9434b0f783a3a (diff) | |
merge
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 7 insertions, 3 deletions
@@ -9,7 +9,7 @@ dillo-2.2.1 [not released yet] +- Configurable User-Agent HTTP header. Patch: Alexander Voigt, corvid +- Include Accept header in HTTP queries. - - Don't use obsolete png_check_sig(). + - Work with libpng-1.4. - Handle zero-width space. - Fix segfault closing window from WM. Patches: corvid diff --git a/configure.in b/configure.in index 6703f476..a7fef723 100644 --- a/configure.in +++ b/configure.in @@ -213,7 +213,10 @@ if test "x$enable_png" = "xyes"; then dnl Check if the user hasn't set the variable $PNG_CONFIG if test -z "$PNG_CONFIG"; then - PNG_CONFIG=`which libpng12-config` + PNG_CONFIG=`which libpng14-config` + if test -z "$PNG_CONFIG"; then + PNG_CONFIG=`which libpng12-config` + fi if test -z "$PNG_CONFIG"; then PNG_CONFIG=`which libpng-config` fi @@ -236,6 +239,7 @@ dnl For debugging and to be user friendly AC_MSG_CHECKING([for libpng version]) png_version=`$PNG_CONFIG --version` case $png_version in + 1.4.*) AC_MSG_RESULT([$png_version (newer version)]) ;; 1.2.*) AC_MSG_RESULT([$png_version (newer version)]) ;; 1.0.*) AC_MSG_RESULT([$png_version (older version)]) ;; *) AC_MSG_RESULT([ERROR]) ;; @@ -253,7 +257,7 @@ dnl Try to find libpng even though libpng-config wasn't found if test "x$png_ok" = "xyes"; then old_libs="$LIBS" - AC_CHECK_LIB(png, png_check_sig, png_ok=yes, png_ok=no, $LIBZ_LIBS -lm) + AC_CHECK_LIB(png, png_sig_cmp, png_ok=yes, png_ok=no, $LIBZ_LIBS -lm) LIBS="$old_libs" if test "x$png_ok" = "xyes"; then |