regenerated from configure.in

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index ab230b8d6cd185341f11c57831223639e682a743..eeddf9f4dd8cc84f0f570e67882fec77f63b13da 100755 (executable)
--- a/configure
+++ b/configure
@@ -11613,7 +11613,7 @@ if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then
 #define wxUSE_LIBPNG 1
 EOF
 
 #define wxUSE_LIBPNG 1
 EOF
 

-      if test "$wxUSE_ZLIB" != "sys" ; then
+      if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then

     echo "configure: warning: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" 1>&2
     wxUSE_LIBPNG=yes
   fi
     echo "configure: warning: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" 1>&2
     wxUSE_LIBPNG=yes
   fi