FREQUENCIES: Use newer hmap library instead of older hsh_table library.

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index 97dbbcf4f0d62ba31442569bbbc581a241b941aa..a3a07a87e07816848ffd8f9c8416e20a8d9913ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,12 @@ AM_CONDITIONAL([HAVE_GUI],
 if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12], [],
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.12 or later (or use --without-gui)])])
+
+  AC_ARG_VAR([GLIB_GENMARSHAL])
+  AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
+  if test "x$GLIB_GENMARSHAL" = x; then
+    PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
+  fi
 fi
 
 dnl Checks needed for psql reader
@@ -150,12 +156,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