From 337ee6b38ea35823ab77a03b3841cf888904b336 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 18 May 2014 16:02:29 -0700 Subject: [PATCH] * 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. --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 53ac1d96fde..769618f31cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-05-18 Glenn Morris + + * configure.ac: Do not bother testing for png in non-graphical builds. + 2014-05-18 Paul Eggert Port ctags+etags build to Sun C 5.12. diff --git a/configure.ac b/configure.ac index 09500be9935..4cb29c1fbf2 100644 --- 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` || { -- 2.39.5