From: glennrp <glennrp@git.imagemagick.org>
Date: Thu, 10 Jan 2013 01:52:32 +0000 (+0000)
Subject: Look for libpng16 and libpng17 when configuring PNG support.
X-Git-Tag: 7.0.1-0~4451
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fc1c21dc4269abed7b9a3b442cd0e43bbe5512e;p=imagemagick

Look for libpng16 and libpng17 when configuring PNG support.
---

diff --git a/configure b/configure
index 235a68482..f484375d0 100755
--- a/configure
+++ b/configure
@@ -30705,7 +30705,7 @@ fi
 
 
   if test $passed -gt 0; then
-    for var in 5 4 2 '' ; do
+    for var in 7 6 5 4 2 '' ; do
       if test "$have_png" = 'no' ; then
         if test "x${var}" = 'x' ; then
           pnglib='png'
diff --git a/configure.ac b/configure.ac
index 2c8a6cb2e..c99e3dc3f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1139,7 +1139,7 @@ AC_SEARCH_LIBS(clock_gettime, rt,
        [[clockid_t clockType = CLOCK_REALTIME;]])],
       [
         AC_MSG_RESULT(yes)
-      	AC_DEFINE([HAVE_CLOCK_REALTIME],[1],
+        AC_DEFINE([HAVE_CLOCK_REALTIME],[1],
           [Define to 1 if clock_gettime supports CLOCK_REALTIME.])
       ],
       AC_MSG_RESULT(no)
@@ -2448,9 +2448,9 @@ dnl ===========================================================================
 
 # Disable LZMA (lzma library)
 AC_ARG_WITH(lzma,
-	      [  --without-lzma          disable LZMA support],
-	      [with_lzma=$withval],
-	      [with_lzma='yes'])
+            [  --without-lzma          disable LZMA support],
+            [with_lzma=$withval],
+            [with_lzma='yes'])
 if test "$with_lzma" != 'yes' ; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lzma=$with_lzma "
 fi
@@ -2584,7 +2584,7 @@ if test "$with_png" != 'no' -a  "$have_zlib" != 'no' ; then
      failed=`expr $failed + 1`,)
 
   if test $passed -gt 0; then
-    for var in 5 4 2 '' ; do
+    for var in 7 6 5 4 2 '' ; do
       if test "$have_png" = 'no' ; then
         if test "x${var}" = 'x' ; then
           pnglib='png'