From: Jan Djärv <jan.h.d@swipnet.se>
Date: Thu, 15 May 2014 16:54:44 +0000 (+0200)
Subject: Fix yet another configure error on OSX.
X-Git-Tag: emacs-25.0.90~2640^2~96
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=440cef5fc5147af9d49396b8828721676e312658;p=emacs.git

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 072871cc821..86bbaac2740 100644
--- 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 bb1bdd84b29..5e30c49f2d2 100644
--- 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])