diff options
| author | Paul Eggert | 2014-05-02 12:34:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-05-02 12:34:03 -0700 |
| commit | 6f074205d30c6922db52fdf9a63b9e0467fd82c1 (patch) | |
| tree | e739dc5474dbc555ff87c612bc4cc9b274890f1d /src/ChangeLog | |
| parent | cb9af965374fd1537b1b82705642c5c03d04c4d2 (diff) | |
| download | emacs-6f074205d30c6922db52fdf9a63b9e0467fd82c1.tar.gz emacs-6f074205d30c6922db52fdf9a63b9e0467fd82c1.zip | |
Consult libpng-config more consistently.
* configure.ac (edit_cflags): Move this up and to the top level,
so that PNG_CFLAGS can use it too.
(PNG_CFLAGS): New var.
(png_longjmp): Use PNG_CFLAGS when checking.
(LIBPNG): Be consistent about -lpng16 etc; e.g., don't use -lpng16
in some places and -lpng in others. Test libpng-config's exit
status. If it succeeds, use its output rather than appending -lz -lm.
* src/Makefile.in (PNG_CFLAGS): New var.
(ALL_CFLAGS): Use it.
* src/image.c [HAVE_PNG]: Don't worry about <libpng/png.h>, as
CFLAGS now handles this.
Fixes: debbugs:17339
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 12a0cd63dc0..29fb2dd1edf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-05-02 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Consult libpng-config more consistently (Bug#17339). | ||
| 4 | * Makefile.in (PNG_CFLAGS): New var. | ||
| 5 | (ALL_CFLAGS): Use it. | ||
| 6 | * image.c [HAVE_PNG]: Don't worry about <libpng/png.h>, as | ||
| 7 | CFLAGS now handles this. | ||
| 8 | |||
| 1 | 2014-05-01 Glenn Morris <rgm@gnu.org> | 9 | 2014-05-01 Glenn Morris <rgm@gnu.org> |
| 2 | 10 | ||
| 3 | * floatfns.c (Fisnan): | 11 | * floatfns.c (Fisnan): |