diff options
| author | Glenn Morris | 2014-05-18 16:02:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-18 16:02:29 -0700 |
| commit | 337ee6b38ea35823ab77a03b3841cf888904b336 (patch) | |
| tree | 5c7e08ea0a4eb99ab33da8ebbf88538cbf95e010 | |
| parent | 3c8d9107437aca614516e8e6555c02b77ae9313c (diff) | |
| download | emacs-337ee6b38ea35823ab77a03b3841cf888904b336.tar.gz emacs-337ee6b38ea35823ab77a03b3841cf888904b336.zip | |
* 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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 1 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-05-18 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * configure.ac: Do not bother testing for png in non-graphical builds. | ||
| 4 | |||
| 1 | 2014-05-18 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-05-18 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Port ctags+etags build to Sun C 5.12. | 7 | 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 | |||
| 3064 | # mingw32 loads the library dynamically. | 3064 | # mingw32 loads the library dynamically. |
| 3065 | if test "$opsys" = mingw32; then | 3065 | if test "$opsys" = mingw32; then |
| 3066 | AC_CHECK_HEADER([png.h], [HAVE_PNG=yes]) | 3066 | AC_CHECK_HEADER([png.h], [HAVE_PNG=yes]) |
| 3067 | else | 3067 | elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then |
| 3068 | AC_MSG_CHECKING([for png]) | 3068 | AC_MSG_CHECKING([for png]) |
| 3069 | png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` && | 3069 | png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` && |
| 3070 | png_libs=`(libpng-config --libs) 2>&AS_MESSAGE_LOG_FD` || { | 3070 | png_libs=`(libpng-config --libs) 2>&AS_MESSAGE_LOG_FD` || { |