[Emacs-diffs] trunk r117123: * configure.ac: Do not bother testing for png in non-graphical builds.

[Glenn Morris]

------------------------------------------------------------
revno: 117123
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-05-18 16:02:29 -0700
message:
  * 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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-18 18:57:04 +0000
+++ b/ChangeLog 2014-05-18 23:02:29 +0000
@@ -1,3 +1,7 @@
+2014-05-18  Glenn Morris  <address@hidden>
+
+       * configure.ac: Do not bother testing for png in non-graphical builds.
+
 2014-05-18  Paul Eggert  <address@hidden>
 
        Port ctags+etags build to Sun C 5.12.

=== modified file 'configure.ac'
--- a/configure.ac      2014-05-18 05:50:17 +0000
+++ b/configure.ac      2014-05-18 23:02:29 +0000
@@ -3064,7 +3064,7 @@
   # 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` || {