procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor zlib configuration tweaks.

Browse source 
* configure.ac (HAVE_ZLIB): Don't assume zlib is linked if PNG is.
* src/decompress.c (fn_inflateInit2) [!WINDOWSNT]:
Don't assume presence of fn_inflateInit2_ zlib internal function.
This commit is contained in:
Paul Eggert 2013-08-12 09:05:58 -07:00
parent 01f1a9ab4f
commit 1d238bc75a
4 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-12 Paul Eggert <eggert@cs.ucla.edu>
Minor zlib configuration tweaks.
* configure.ac (HAVE_ZLIB): Don't assume zlib is linked if PNG is.
2013-08-12 Eli Zaretskii <eliz@gnu.org>
* configure.ac (LIBZ): Comment on w32 peculiarities regarding LIBZ.

21
configure.ac
View file

@ -2946,21 +2946,12 @@ AC_SUBST(LIBPNG)
HAVE_ZLIB=no
LIBZ=
if test "${with_zlib}" != "no"; then
if test "${HAVE_PNG}" = "yes"; then
### PNG depends on zlib, so if we have PNG, we have zlib.
### Note: w32 does not link against libpng, but instead loads it
### dynamically, but it also does the same with zlib. So it is OK
### not to have -lz in LIBZ on w32.
HAVE_ZLIB=yes
else
### No PNG, so check zlib ourselves.
OLIBS=$LIBS
AC_SEARCH_LIBS([inflateEnd], [z], [HAVE_ZLIB=yes])
LIBS=$OLIBS
case $ac_cv_search_inflateEnd in
-*) LIBZ=$ac_cv_search_inflateEnd ;;
esac
fi
OLIBS=$LIBS
AC_SEARCH_LIBS([inflateEnd], [z], [HAVE_ZLIB=yes])
LIBS=$OLIBS
case $ac_cv_search_inflateEnd in
-*) LIBZ=$ac_cv_search_inflateEnd ;;
esac
fi
if test "${HAVE_ZLIB}" = "yes"; then
AC_DEFINE([HAVE_ZLIB], 1, [Define to 1 if you have the zlib library (-lz).])

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2013-08-12 Paul Eggert <eggert@cs.ucla.edu>
Minor zlib configuration tweaks.
* decompress.c (fn_inflateInit2) [!WINDOWSNT]:
Don't assume presence of fn_inflateInit2_ zlib internal function.
2013-08-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
* decompress.c (Fzlib_decompress_gzipped_region): Rename to

8
src/decompress.c
View file

@ -67,17 +67,17 @@ init_zlib_functions (void)
return 1;
}
#define fn_inflateInit2(strm, windowBits) \
fn_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
#else /* !WINDOWSNT */
#define fn_inflateInit2_ inflateInit2_
#define fn_inflateInit2 inflateInit2
#define fn_inflate inflate
#define fn_inflateEnd inflateEnd
#endif /* WINDOWSNT */
#define fn_inflateInit2(strm, windowBits) \
fn_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
struct decompress_unwind_data
{