[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.26-3-gd91db67

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  d91db67e5180fcbda2f3fb7667ffd1b99cac51c6 (commit)
      from  c45b9819e8f4b35681c91ffb67abdc38dcc32a2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d91db67e5180fcbda2f3fb7667ffd1b99cac51c6
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 26 16:13:21 2014 +0200

    build: Print an error message if zlib is not installed.
    
    * configure.ac (missing_zlib): New.

diff --git a/configure.ac b/configure.ac
index c5f9bb6..5da6ea5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1208,6 +1208,7 @@ AM_CONDITIONAL(DISABLE_REGEX, test x"$use_regex" != xyes)
 # when compiling a conftest (due to the "-lz" from LIBS).
 # Note that we combine zlib and bzlib2 in ZLIBS.
 #
+missing_zlib=yes
 _cppflags="${CPPFLAGS}"
 _ldflags="${LDFLAGS}"
 AC_ARG_WITH(zlib,
@@ -1220,7 +1221,10 @@ AC_ARG_WITH(zlib,
 
 AC_CHECK_HEADER(zlib.h,
       AC_CHECK_LIB(z, deflateInit2_,
-       ZLIBS="-lz",
+       [
+       ZLIBS="-lz"
+       missing_zlib=no
+       ],
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
 
@@ -1529,6 +1533,16 @@ if test "$missing_pth" = "yes"; then
 ***]])
    die=yes
 fi
+if test "$missing_zlib" = "yes"; then
+    AC_MSG_NOTICE([[
+***
+*** The zlib compression library is required.
+*** Please install a suitable development package
+*** (e.g. Debian package zlib1g-dev) or download
+*** it from http://zlib.net and build yourself.
+***]])
+   die=yes
+fi
 if test "$missing_iconv" = "yes"; then
     AC_MSG_NOTICE([[
 ***

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org