From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 26 Feb 2010 17:09:45 +0000 (-0800)
Subject: configure: Always apply zlib crc32() rename fix.
X-Git-Tag: v0.7.5~128
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c46ed75ddc47e79189b616d173fad98113a27357;p=pspp-builds.git

configure: Always apply zlib crc32() rename fix.

PSPP can link against zlib indirectly even if it doesn't link directly, so
it is simplest to always rename gnulib's crc32() to gl_crc32().

Reported by John Darrington.
---

diff --git a/configure.ac b/configure.ac
index 97dbbcf4..8f4ca63b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,12 +150,12 @@ dnl crc32() function, which have different signatures.  PSPP calls
 dnl only gnulib's crc32() directly, but it calls zlib's crc32()
 dnl indirectly through other zlib calls.  If we don't rename gnulib's
 dnl crc32(), then zlib will call gnulib's version instead of its own,
-dnl causing failures.
-if test $HAVE_ZLIB = yes; then
-  AC_DEFINE(
-    [crc32], [gl_crc32],
-    [Avoid making zlib call gnulib's crc32() instead of its own.])
-fi
+dnl causing failures.  (This can happen even if zlib isn't detected
+dnl directly, because other libraries that PSPP uses, e.g. libpng,
+dnl sometimes use zlib themselves.)
+AC_DEFINE(
+  [crc32], [gl_crc32],
+  [Avoid making zlib call gnulib's crc32() instead of its own.])
 
 dnl Gnumeric support requires libxml2 and zlib.
 if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then