Changeset 898

Timestamp:

06/27/06 14:04:37 (7 years ago)

Author:

perry

Message:

Fix problems with zlib in the new build environment

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (3 diffs)
• lib/format_helper.c (modified) (1 diff)
• lib/format_wag.c (modified) (1 diff)
• lib/libtraceio.h (modified) (2 diffs)
• test/Makefile (modified) (2 diffs)
• tools/Makefile.am (modified) (1 diff)

trunk/Makefile.am

@@ -1 @@
-if LIBPACKETDUMP
 LIBPACKETDUMP_DIR = libpacketdump
-endif
 TOOLS_DIR = tools
 SUBDIRS = lib docs $(LIBPACKETDUMP_DIR) $(TOOLS_DIR)

trunk/configure.in

@@ -211 +211 @@
 AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
 AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag2_4" = true])
-AM_CONDITIONAL([HAVE_CXX], [test "$libtrace_cxx" = true])
-AM_CONDITIONAL([HAVE_ZLIB], [test "$libtrace_zlib" = true])
+AM_CONDITIONAL([HAVE_ZLIB], [test "$ac_cv_lib_z_gzopen" = yes])
 AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
-AM_CONDITIONAL([LIBPACKETDUMP], [test "$libtrace_libpacketdump" = true])
-AM_CONDITIONAL([LIBGDC], [test "$libtrace_gdc" = true])
-
+AM_CONDITIONAL([LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
 
 # Check for miscellaneous programs
@@ -245 +242 @@
 }
 
+echo
 AC_MSG_NOTICE([Libtrace version $PACKAGE_VERSION])
-reportopt "Compiled with BPF filter support" $libtrace_bpf 
-reportopt "Compiled with PCAP support" $libtrace_pcap
-reportopt "Compiled with compressed trace (zlib) support" $libtrace_zlib
+reportopt "Compiled with PCAP support" $ac_cv_lib_pcap_pcap_open_live
+reportopt "Compiled with compressed trace (zlib) support" $ac_cv_lib_z_gzopen
 if test x"$libtrace_dag" = xtrue; then
         if test x"$libtrace_dag2_4"; then
@@ -259 +256 @@
 fi
 reportopt "Building man pages/documentation" $libtrace_doxygen
-reportopt "Building libpacketdump" $libtrace_libpacketdump
-
+

trunk/lib/format_helper.c

@@ -196 +196 @@
         assert(level<10);
         assert(level>=0);
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
         sprintf(filemode,"wb%d",level);
 #else

trunk/lib/format_wag.c

@@ -161 +161 @@
                 void *value) {
         switch(option) {
-#ifdef HAVE_ZLIB
+#ifdef HAVE_LIBZ
                 case TRACE_OPTION_OUTPUT_COMPRESS:
                         OPTIONS.zlib.level = *(int*)value;

trunk/lib/libtraceio.h

@@ -5 +5 @@
 #define LIBTRACEIO_H 1
 #include "config.h"
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#else
-#include <stdio.h>
-#endif
+#include <inttypes.h>
 
 #include <unistd.h>
@@ -55 +51 @@
  */
 ssize_t libtrace_io_write(libtrace_io_t *io, const void *buf, size_t len);
-off_t libtrace_io_seek(libtrace_io_t *io, off_t offset, int whence);
+int64_t libtrace_io_seek(libtrace_io_t *io, int64_t offset, int whence);
 ssize_t libtrace_io_tell(libtrace_io_t *io);
 

trunk/test/Makefile

@@ -8 +8 @@
 CFLAGS += $(INCLUDE)
 libdir = $(PREFIX)/lib/.libs:$(PREFIX)/libpacketdump/.libs
-LDLIBS = -L$(PREFIX)/lib/.libs -L $(PREFIX)/libpacketdump/.libs -ltrace
+LDLIBS = -L$(PREFIX)/lib/.libs -L $(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump
 
 BINS = test-pcap-bpf test-event test-time test-dir  #test-seek 
@@ -17 +17 @@
 
 test: all test-format-all test-convert-all test-write-all test-programs
-
-test-decode: LDLIBS+=-lpacketdump
 
 test-programs: $(BINS)

trunk/tools/Makefile.am

@@ -1 +1 @@
 # tracedump depends on libpacketdump
-if LIBPACKETDUMP
 TRACEDUMP_DIR=tracedump
-endif
 
 SUBDIRS=traceanon tracemerge tracesplit $(TRACEDUMP_DIR) tracertstats tracestats