[Emacs-diffs] trunk r117112: Fix yet another configure error on OSX.

[Jan D.]

------------------------------------------------------------
revno: 117112
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2014-05-15 18:54:44 +0200
message:
  Fix yet another configure error on OSX.
  
  * configure.ac (LIBONG): Do not test for libpng if NS_IMPL_COCOA.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-13 14:18:54 +0000
+++ b/ChangeLog 2014-05-15 16:54:44 +0000
@@ -1,3 +1,7 @@
+2014-05-15  Jan Djärv  <address@hidden>
+
+       * configure.ac (LIBONG): Do not test for libpng if NS_IMPL_COCOA.
+
 2014-05-13  Dmitry Antipov  <address@hidden>
 
        * configure.ac (HAVE_XFIXES): Define if available.

=== modified file 'configure.ac'
--- a/configure.ac      2014-05-13 14:18:54 +0000
+++ b/configure.ac      2014-05-15 16:54:44 +0000
@@ -3070,7 +3070,9 @@
 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])