[cig-commits] r8017 - in mc/3D/CitcomS/trunk: . lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-09-24 14:29:24 -0700 (Mon, 24 Sep 2007)
New Revision: 8017

Modified:
   mc/3D/CitcomS/trunk/configure.ac
   mc/3D/CitcomS/trunk/lib/Output_gzdir.c
Log:
Detect the presence of libz and enable ascii-gz at configure time

Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2007-09-24 21:28:26 UTC (rev 8016)
+++ mc/3D/CitcomS/trunk/configure.ac	2007-09-24 21:29:24 UTC (rev 8017)
@@ -144,6 +144,12 @@
 fi
 AM_CONDITIONAL([COND_HDF5], [test "$want_hdf5" = yes])
 AM_CONDITIONAL([COND_EXCHANGER], [test "$want_exchanger" = yes])
+AC_SEARCH_LIBS([gzopen], [z], [
+		CPPFLAGS="-DUSE_GZDIR $CPPFLAGS"
+		LDFLAGS="-lz $LDFLAGS"
+		], [
+    AC_MSG_WARN([GZip library not found; disabling gzip support; try setting LDFLAGS to enable it])
+])
 
 AC_CONFIG_FILES([Makefile
                  bin/Makefile

Modified: mc/3D/CitcomS/trunk/lib/Output_gzdir.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_gzdir.c	2007-09-24 21:28:26 UTC (rev 8016)
+++ mc/3D/CitcomS/trunk/lib/Output_gzdir.c	2007-09-24 21:29:24 UTC (rev 8017)
@@ -68,7 +68,9 @@
 #include "output.h"
 /* Big endian crap */
 #include <string.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 void be_flipit(void *, void *, size_t );
 void be_flip_byte_order(void *, size_t );