* configure.ac: Do not bother testing for png in non-graphical builds.

This seems to have been lost in the changes from the current emacs-24
branch version.

diff --git a/ChangeLog b/ChangeLog
index 53ac1d96fdec1c8bee3b2753ed8809c58fe46dbc..769618f31cbccb00c475e25ffe892a24bd1e40d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-18  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac: Do not bother testing for png in non-graphical builds.
+
 2014-05-18  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port ctags+etags build to Sun C 5.12.

diff --git a/configure.ac b/configure.ac
index 09500be99355e866e2005b5557e3c39d221b1993..4cb29c1fbf23fa9bb1ddde48feda91f6920ef7c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3064,7 +3064,7 @@ elif test "${with_png}" != no; then
   # mingw32 loads the library dynamically.
   if test "$opsys" = mingw32; then
     AC_CHECK_HEADER([png.h], [HAVE_PNG=yes])
-  else
+  elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
     AC_MSG_CHECKING([for png])
     png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` &&
     png_libs=`(libpng-config --libs) 2>&AS_MESSAGE_LOG_FD` || {