[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117058: Revert recent libpng changes.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-24 r117058: Revert recent libpng changes. |
Date: |
Sun, 04 May 2014 18:51:37 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117058
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17339
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-05-04 11:51:32 -0700
message:
Revert recent libpng changes.
They fix only bugs that aren't being reported, so it may be better
to do them on the trunk.
* configure.ac (PNG_CFLAGS): Remove. All uses removed.
(LIBPNG): Don't be consistent about -lpng16 versus -lpng.
Ignore libpng-config's exit status. Always append -lz -lm.
* src/Makefile.in (PNG_CFLAGS): Remove; all uses removed.
* src/image.c [HAVE_LIBPNG_PNG_H]: Include <libpng/png.h>, not <png.h>.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-631
src/image.c image.c-20091113204419-o5vbwnq5f7feedwu-2969
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-04 06:34:04 +0000
+++ b/ChangeLog 2014-05-04 18:51:32 +0000
@@ -1,5 +1,12 @@
2014-05-04 Paul Eggert <address@hidden>
+ Revert recent libpng changes (Bug#17339).
+ They fix only bugs that aren't being reported, so it may be better
+ to do them on the trunk.
+ * configure.ac (PNG_CFLAGS): Remove. All uses removed.
+ (LIBPNG): Don't be consistent about -lpng16 versus -lpng.
+ Ignore libpng-config's exit status. Always append -lz -lm.
+
* configure.ac (LIBPNG): Add -lz -lm on platforms where they're needed
but libpng-config --libs omits them. Problem reported by Glenn
Morris.
=== modified file 'configure.ac'
--- a/configure.ac 2014-05-04 06:34:04 +0000
+++ b/configure.ac 2014-05-04 18:51:32 +0000
@@ -3068,70 +3068,62 @@
### mingw32 doesn't use -lpng, since it loads the library dynamically.
HAVE_PNG=no
LIBPNG=
-PNG_CFLAGS=
if test "${opsys}" = "mingw32"; then
if test "${with_png}" != "no"; then
- AC_CHECK_HEADER([png.h], [HAVE_PNG=yes])
+ AC_CHECK_HEADER(png.h, HAVE_PNG=yes, HAVE_PNG=no)
+ fi
+ if test "${HAVE_PNG}" = "yes"; then
+ AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).])
+
+ AC_CHECK_DECL(png_longjmp,
+ [],
+ [AC_DEFINE(PNG_DEPSTRUCT, [],
+ [Define to empty to suppress deprecation warnings when building
+ with --enable-gcc-warnings and with libpng versions before 1.5,
+ which lack png_longjmp.])],
+ [[#ifdef HAVE_LIBPNG_PNG_H
+ # include <libpng/png.h>
+ #else
+ # include <png.h>
+ #endif
+ ]])
fi
elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
if test "${with_png}" != "no"; then
-
- dnl NetBSD 6 provides libpng16, not libpng.
- if png_cflags=`(libpng-config --cflags) 2>&AS_MESSAGE_LOG_FD` &&
- png_libs=`(libpng-config --libs) 2>&AS_MESSAGE_LOG_FD`
- then
- # On some platforms, LIBPNG must also contain -lz -lm.
- SAVE_CFLAGS=$CFLAGS
- SAVE_LIBS=$LIBS
- CFLAGS="$CFLAGS $png_cflags"
- for png_libextras in '' ' -lz -lm'; do
- LIBS="$png_libs$png_libextras $SAVE_LIBS"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <png.h>
- ]],
- [[return png_get_channels (0, 0);]])],
- [HAVE_PNG=yes
- PNG_CFLAGS=`AS_ECHO(["$png_cflags"]) | sed -e "$edit_cflags"`
- LIBPNG=$png_libs$png_libextras])
- test $HAVE_PNG = yes && break
- done
- CFLAGS=$SAVE_CFLAGS
- LIBS=$SAVE_LIBS
- fi
- if test $HAVE_PNG != yes; then
- # libpng-config does not work; configure it by hand.
- # Debian unstable as of July 2003 has multiple libpngs, and puts png.h
- # in /usr/include/libpng.
- AC_CHECK_HEADERS([png.h libpng/png.h],
- [AC_CHECK_LIB([png], [png_get_channels],
- [HAVE_PNG=yes
- LIBPNG='-lpng -lz -lm'
- if test "$ac_cv_header_libpng_png_h" = yes; then
- PNG_CFLAGS=-I/usr/include/libpng
- fi],
- [],
- [-lz -lm])
- break])
- fi
- fi
-fi
-if test $HAVE_PNG = yes; then
- AC_DEFINE([HAVE_PNG], [1], [Define to 1 if you have the png library.])
-
- SAVE_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $PNG_CFLAGS"
- AC_CHECK_DECL([png_longjmp],
- [],
- [AC_DEFINE([PNG_DEPSTRUCT], [],
- [Define to empty to suppress deprecation warnings when building
- with --enable-gcc-warnings and with libpng versions before 1.5,
- which lack png_longjmp.])],
- [[#include <png.h>
- ]])
- CFLAGS=$SAVE_CFLAGS
+ # Debian unstable as of July 2003 has multiple libpngs, and puts png.h
+ # in /usr/include/libpng.
+ AC_CHECK_HEADERS(png.h libpng/png.h, break)
+ if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" =
yes ; then
+ AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm)
+ fi
+ fi
+
+ if test "${HAVE_PNG}" = "yes"; then
+ AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library.])
+
+ dnl Some systems, eg NetBSD 6, only provide eg "libpng16", not "libpng".
+ lpng=`libpng-config --libs 2> /dev/null`
+ case $lpng in
+ -l*) : ;;
+ *) lpng="-lpng" ;;
+ esac
+ LIBPNG="$lpng -lz -lm"
+
+ AC_CHECK_DECL(png_longjmp,
+ [],
+ [AC_DEFINE(PNG_DEPSTRUCT, [],
+ [Define to empty to suppress deprecation warnings when building
+ with --enable-gcc-warnings and with libpng versions before 1.5,
+ which lack png_longjmp.])],
+ [[#ifdef HAVE_LIBPNG_PNG_H
+ # include <libpng/png.h>
+ #else
+ # include <png.h>
+ #endif
+ ]])
+ fi
fi
AC_SUBST(LIBPNG)
-AC_SUBST(PNG_CFLAGS)
HAVE_ZLIB=no
LIBZ=
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-03 20:13:10 +0000
+++ b/src/ChangeLog 2014-05-04 18:51:32 +0000
@@ -1,3 +1,9 @@
+2014-05-04 Paul Eggert <address@hidden>
+
+ Revert recent libpng changes (Bug#17339).
+ * Makefile.in (PNG_CFLAGS): Remove; all uses removed.
+ * image.c [HAVE_LIBPNG_PNG_H]: Include <libpng/png.h>, not <png.h>.
+
2014-05-03 Paul Eggert <address@hidden>
Handle systems without WCONTINUED consistently. (Bug#15110, 17339)
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2014-05-02 19:34:03 +0000
+++ b/src/Makefile.in 2014-05-04 18:51:32 +0000
@@ -77,7 +77,6 @@
address@hidden@
address@hidden@
address@hidden@
## Define C_SWITCH_X_SITE to contain any special flags your compiler
## may need to deal with X Windows. For instance, if you've defined
@@ -326,7 +325,6 @@
-I$(lib) -I$(srcdir)/../lib \
$(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
$(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
- $(PNG_CFLAGS) \
$(LIBXML2_CFLAGS) $(DBUS_CFLAGS) $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) \
$(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
$(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
=== modified file 'src/image.c'
--- a/src/image.c 2014-05-02 19:34:03 +0000
+++ b/src/image.c 2014-05-04 18:51:32 +0000
@@ -22,8 +22,12 @@
#include <unistd.h>
#ifdef HAVE_PNG
+#if defined HAVE_LIBPNG_PNG_H
+# include <libpng/png.h>
+#else
# include <png.h>
#endif
+#endif
#include <setjmp.h>
#include <c-ctype.h>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117058: Revert recent libpng changes.,
Paul Eggert <=