From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Symonds Subject: [REPLACEMENT PATCH] Improve accuracy of check for presence of deflateBound. Date: Wed, 7 Nov 2007 14:24:28 +1100 Message-ID: <11944058682845-git-send-email-dsymonds@gmail.com> Cc: git@vger.kernel.org, David Symonds To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Nov 07 04:28:12 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IpbaN-0007Lg-8R for gcvg-git-2@gmane.org; Wed, 07 Nov 2007 04:28:11 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755419AbXKGD1y (ORCPT ); Tue, 6 Nov 2007 22:27:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755353AbXKGD1y (ORCPT ); Tue, 6 Nov 2007 22:27:54 -0500 Received: from ipmail02.adl2.internode.on.net ([203.16.214.141]:61177 "EHLO ipmail02.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755153AbXKGD1y (ORCPT ); Tue, 6 Nov 2007 22:27:54 -0500 X-IronPort-AV: E=Sophos;i="4.21,381,1188743400"; d="scan'208";a="222794686" Received: from ppp121-44-17-138.lns10.syd7.internode.on.net (HELO localhost.localdomain) ([121.44.17.138]) by ipmail02.adl2.internode.on.net with ESMTP; 07 Nov 2007 13:54:29 +1030 X-Mailer: git-send-email 1.5.3.1 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: ZLIB_VERNUM isn't defined in some zlib versions, so this patch does a proper linking test in autoconf to see whether deflateBound exists in zlib. Also, setting NO_DEFLATE_BOUND will also work for folk not using autoconf. Signed-off-by: David Symonds --- This resend keeps the ZLIB_VERNUM test in place for people who don't use autoconf (thanks spearce). Makefile | 6 ++++++ cache.h | 2 +- config.mak.in | 1 + configure.ac | 20 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 1a81ef1..c8bcd1d 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,8 @@ all:: # Define OLD_ICONV if your library has an old iconv(), where the second # (input buffer pointer) parameter is declared with type (const char **). # +# Define NO_DEFLATE_BOUND if your zlib does not have deflateBound. +# # Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib" # that tells runtime paths to dynamic libraries; # "-Wl,-rpath=/path/lib" is used instead. @@ -663,6 +665,10 @@ ifdef OLD_ICONV BASIC_CFLAGS += -DOLD_ICONV endif +ifdef NO_DEFLATE_BOUND + BASIC_CFLAGS += -DNO_DEFLATE_BOUND +endif + ifdef PPC_SHA1 SHA1_HEADER = "ppc/sha1.h" LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o diff --git a/cache.h b/cache.h index 830d2e0..ae66de1 100644 --- a/cache.h +++ b/cache.h @@ -7,7 +7,7 @@ #include SHA1_HEADER #include -#if ZLIB_VERNUM < 0x1200 +#if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200 #define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11) #endif diff --git a/config.mak.in b/config.mak.in index a3032e3..776b805 100644 --- a/config.mak.in +++ b/config.mak.in @@ -38,3 +38,4 @@ NO_STRCASESTR=@NO_STRCASESTR@ NO_STRLCPY=@NO_STRLCPY@ NO_SETENV=@NO_SETENV@ NO_ICONV=@NO_ICONV@ +NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@ diff --git a/configure.ac b/configure.ac index ed7cc89..ab516db 100644 --- a/configure.ac +++ b/configure.ac @@ -182,6 +182,26 @@ AC_SUBST(NEEDS_LIBICONV) AC_SUBST(NO_ICONV) test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv" # +# Define NO_DEFLATE_BOUND if deflateBound is missing from zlib. +AC_DEFUN([ZLIBTEST_SRC], [ +#include + +int main(void) +{ + deflateBound(0, 0); + return 0; +} +]) +AC_MSG_CHECKING([for deflateBound in -lz]) +old_LIBS="$LIBS" +LIBS="$LIBS -lz" +AC_LINK_IFELSE(ZLIBTEST_SRC, + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + NO_DEFLATE_BOUND=yes]) +LIBS="$old_LIBS" +AC_SUBST(NO_DEFLATE_BOUND) +# # Define NEEDS_SOCKET if linking with libc is not enough (SunOS, # Patrick Mauritz). AC_CHECK_LIB([c], [socket], -- 1.5.3.1