diff options
| author | corvid <corvid@lavabit.com> | 2010-02-19 21:31:12 +0000 |
|---|---|---|
| committer | corvid <corvid@lavabit.com> | 2010-02-19 21:31:12 +0000 |
| commit | 51f21341d90dce9dc9bf90bbdea9434b0f783a3a (patch) | |
| tree | b1b284f9c382c847de0cd5300606ff90dfe5c3aa /configure.in | |
| parent | 0df75e6a18ef70fcd87f819e0c022b2cd9b381aa (diff) | |
(cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 6 insertions, 2 deletions
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 |