Fix yet another configure error on OSX.

* configure.ac (LIBONG): Do not test for libpng if NS_IMPL_COCOA.

diff --git a/ChangeLog b/ChangeLog
index 072871cc82104fe8d39f858bb36c58ee7556690f..86bbaac27406b814c551583bcfedb0c63fbef34e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-15  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.ac (LIBONG): Do not test for libpng if NS_IMPL_COCOA.
+
 2014-05-13  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * configure.ac (HAVE_XFIXES): Define if available.

diff --git a/configure.ac b/configure.ac
index bb1bdd84b292922bafa186b1a3e0a04d8280a8f7..5e30c49f2d23dc24ebb828c7a15df3e24160cb9f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3070,7 +3070,9 @@ AC_SUBST(LIBZ)
 HAVE_PNG=no
 LIBPNG=
 PNG_CFLAGS=
-if test "${with_png}" != no; then
+if test "${NS_IMPL_COCOA}" = yes; then
+  : # Nothing to do
+elif test "${with_png}" != no; then
   # mingw32 loads the library dynamically.
   if test "$opsys" = mingw32; then
     AC_CHECK_HEADER([png.h], [HAVE_PNG=yes])