[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1590f88: Revert libpng /usr/local patch
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 1590f88: Revert libpng /usr/local patch |
Date: |
Mon, 12 Feb 2018 10:27:08 -0500 (EST) |
branch: master
commit 1590f8823d858b7bbad7f8a067fe356a19e1d5f8
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Revert libpng /usr/local patch
It broke builds on Arch, Debian, OpenSuSE; see thread containing:
https://lists.gnu.org/r/2018-02/msg00330.html
* configure.ac: Don't try pkg-config; just use libpng-config.
---
configure.ac | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index ec25e9b..f2a8332 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3612,11 +3612,7 @@ elif test "${with_png}" != no; then
if test "$opsys" = mingw32; then
AC_CHECK_HEADER([png.h], [HAVE_PNG=yes])
elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
- EMACS_CHECK_MODULES([PNG], [libpng >= 1.0.0])
- if test $HAVE_PNG = no; then
- # Test old way in case pkg-config doesn't have it (older machines).
- AC_MSG_CHECKING([for libpng not configured by pkg-config])
-
+ AC_MSG_CHECKING([for png])
png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` &&
png_ldflags=`(libpng-config --ldflags) 2>&AS_MESSAGE_LOG_FD` || {
# libpng-config does not work; configure by hand.
@@ -3649,7 +3645,6 @@ elif test "${with_png}" != no; then
CFLAGS=$SAVE_CFLAGS
LIBS=$SAVE_LIBS
AC_MSG_RESULT([$HAVE_PNG])
- fi
fi
fi
if test $HAVE_PNG = yes; then
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 1590f88: Revert libpng /usr/local patch,
Paul Eggert <=