diff options
| author | Andreas Schwab | 2012-07-10 00:06:31 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-07-10 00:06:31 +0200 |
| commit | cda158b40db31dcd6b938ba7ccb6313861594b03 (patch) | |
| tree | fc89a432e2a9e45e7f0d39b03e7469c21ce820c8 | |
| parent | cbb319513e0da14e7de2e9be121d449b6bcc8d88 (diff) | |
| download | emacs-cda158b40db31dcd6b938ba7ccb6313861594b03.tar.gz emacs-cda158b40db31dcd6b938ba7ccb6313861594b03.zip | |
* configure.ac (PNG_DEPSTRUCT): Define this instead of
PNG_DEPRECATED.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 1 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-09 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * configure.ac (PNG_DEPSTRUCT): Define this instead of | ||
| 4 | PNG_DEPRECATED. | ||
| 5 | |||
| 1 | 2012-07-09 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-07-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Add GCC-style 'const' attribute to functions that can use it. | 8 | Add GCC-style 'const' attribute to functions that can use it. |
diff --git a/configure.ac b/configure.ac index 8db9652fc06..6f4b3d51c89 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -2461,7 +2461,7 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 2461 | 2461 | ||
| 2462 | AC_CHECK_DECL(png_longjmp, | 2462 | AC_CHECK_DECL(png_longjmp, |
| 2463 | [], | 2463 | [], |
| 2464 | [AC_DEFINE(PNG_DEPRECATED, [], | 2464 | [AC_DEFINE(PNG_DEPSTRUCT, [], |
| 2465 | [Define to empty to suppress deprecation warnings when building | 2465 | [Define to empty to suppress deprecation warnings when building |
| 2466 | with --enable-gcc-warnings and with libpng versions before 1.5, | 2466 | with --enable-gcc-warnings and with libpng versions before 1.5, |
| 2467 | which lack png_longjmp.])], | 2467 | which lack png_longjmp.])], |