X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=97dbbcf4f0d62ba31442569bbbc581a241b941aa;hb=2ded0a895302a1863baa275544b44e04298c0d2d;hp=4d6cab7c2229b656041ae4668db9d9bf83402391;hpb=9530bce28d817a0d106d34144289ba2b12d04c19;p=pspp

diff --git a/configure.ac b/configure.ac
index 4d6cab7c22..97dbbcf4f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,18 @@ AC_CHECK_HEADERS(
   [HAVE_ZLIB=no
    PSPP_OPTIONAL_PREREQ([zlib])])
 
+dnl Avoid interference between zlib's crc32() function and gnulib's
+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 Gnumeric support requires libxml2 and zlib.
 if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
   GNM_SUPPORT=yes