]> granicus.if.org Git - imagemagick/commitdiff
Look for libpng16 and libpng17 when configuring PNG support.
authorglennrp <glennrp@git.imagemagick.org>
Thu, 10 Jan 2013 01:52:32 +0000 (01:52 +0000)
committerglennrp <glennrp@git.imagemagick.org>
Thu, 10 Jan 2013 01:52:32 +0000 (01:52 +0000)
configure
configure.ac

index 235a68482fa1f57848331a88030b40b8ac62d583..f484375d0a478a196757736fef13973f335f4e3e 100755 (executable)
--- 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'
index 2c8a6cb2e4c495627948e554fd509210927d198f..c99e3dc3f2defe909ab0ed07877a2f06b7b2c5d7 100755 (executable)
@@ -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'