summaryrefslogtreecommitdiffstats
path: root/Utilities/cmtar
diff options
context:
space:
mode:
authorYogi Girdhar <yogi.girdhar@kitware.com>2006-01-05 18:25:16 (GMT)
committerYogi Girdhar <yogi.girdhar@kitware.com>2006-01-05 18:25:16 (GMT)
commit17c3a897974556572f0163d52da4fd4ef12b106a (patch)
treea30a3e731356398aae012a6ad1a2a76c6b373fdf /Utilities/cmtar
parent4a765181cc255cc0f39f3a021c4b4917200ec183 (diff)
downloadCMake-17c3a897974556572f0163d52da4fd4ef12b106a.zip
CMake-17c3a897974556572f0163d52da4fd4ef12b106a.tar.gz
CMake-17c3a897974556572f0163d52da4fd4ef12b106a.tar.bz2
BUG: libtar now compiles in VJ and works with vtkzlib
Diffstat (limited to 'Utilities/cmtar')
-rw-r--r--Utilities/cmtar/config.h.in3
-rw-r--r--Utilities/cmtar/libtar.c9
2 files changed, 12 insertions, 0 deletions
diff --git a/Utilities/cmtar/config.h.in b/Utilities/cmtar/config.h.in
index ce87858..948afde 100644
--- a/Utilities/cmtar/config.h.in
+++ b/Utilities/cmtar/config.h.in
@@ -39,6 +39,9 @@
/* Define to 1 if you have the `z' library (-lz). */
#cmakedefine HAVE_LIBZ @HAVE_LIBZ@
+/* Define to 1 if you have the VTK's `z' library */
+#cmakedefine HAVE_VTK_LIBZ @HAVE_VTK_LIBZ@
+
/* Define to 1 if the system has the type `major_t'. */
#cmakedefine HAVE_MAJOR_T @HAVE_MAJOR_T@
diff --git a/Utilities/cmtar/libtar.c b/Utilities/cmtar/libtar.c
index e470da5..9131512 100644
--- a/Utilities/cmtar/libtar.c
+++ b/Utilities/cmtar/libtar.c
@@ -36,8 +36,17 @@
#endif
#ifdef HAVE_LIBZ
+#ifdef HAVE_VTK_LIBZ
+# include <vtkzlib/zlib.h>
+# define cm_zlib_gzdopen gzdopen
+# define cm_zlib_gzclose gzclose
+# define cm_zlib_gzread gzread
+# define cm_zlib_gzwrite gzwrite
+
+#else
# include <cmzlib/zlib.h>
#endif
+#endif
#include <libtar/compat.h>