summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <devnull@localhost>2015-05-28 21:15:21 +0000
committercorvid <devnull@localhost>2015-05-28 21:15:21 +0000
commit247c80aa5e68567c87f49e647ef8e496163d77d9 (patch)
tree0a0bddcce5dc8b3dca698b3b4ff2e1a4218e6faa
parent468bea9977fabc5ca544bb3f668b74a97e20ae28 (diff)
libpng 1.6 series works for me
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 8bc79e98..46c25263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,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 libpng14-config`
+ PNG_CONFIG=`which libpng16-config`
+ if test -z "$PNG_CONFIG"; then
+ PNG_CONFIG=`which libpng14-config`
+ fi
if test -z "$PNG_CONFIG"; then
PNG_CONFIG=`which libpng12-config`
fi
@@ -235,7 +238,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.[[024]].*) AC_MSG_RESULT([$png_version]) ;;
+ 1.[[0246]].*) AC_MSG_RESULT([$png_version]) ;;
*) AC_MSG_RESULT([$png_version (unrecognised version)]) ;;
esac