Re: problem with odf driver

[Ben Pfaff]

John Darrington <address@hidden> writes:

> The fix seems to work for me.  But I wonder if "if test
> $HAVE_ZLIB = yes; then" is sufficient?  There are other
> libraries which use crc32, notably libpng - our gui loads a lot
> of png files.

You are right.

Does this look like an appropriate fix to you?

--8<--------------------------cut here-------------------------->8--

>From c46ed75ddc47e79189b616d173fad98113a27357 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <address@hidden>
Date: Fri, 26 Feb 2010 09:09:45 -0800
Subject: [PATCH] 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.
---
 configure.ac |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 97dbbcf..8f4ca63 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
-- 
1.6.5


-- 
"In the PARTIES partition there is a small section called the BEER.
 Prior to turning control over to the PARTIES partition,
 the BIOS must measure the BEER area into PCR[5]."
--TCPA PC Specific Implementation Specification