Changeset 306f91c


Ignore:
Timestamp:
06/27/06 14:04:37 (15 years ago)
Author:
Perry Lorier <perry@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
1e52a3c
Parents:
496864e
Message:

Fix problems with zlib in the new build environment

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    re5c2bc4 r306f91c  
    1 if LIBPACKETDUMP
    21LIBPACKETDUMP_DIR = libpacketdump
    3 endif
    42TOOLS_DIR = tools
    53SUBDIRS = lib docs $(LIBPACKETDUMP_DIR) $(TOOLS_DIR)
  • configure.in

    re5c2bc4 r306f91c  
    211211AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
    212212AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag2_4" = true])
    213 AM_CONDITIONAL([HAVE_CXX], [test "$libtrace_cxx" = true])
    214 AM_CONDITIONAL([HAVE_ZLIB], [test "$libtrace_zlib" = true])
     213AM_CONDITIONAL([HAVE_ZLIB], [test "$ac_cv_lib_z_gzopen" = yes])
    215214AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
    216 AM_CONDITIONAL([LIBPACKETDUMP], [test "$libtrace_libpacketdump" = true])
    217 AM_CONDITIONAL([LIBGDC], [test "$libtrace_gdc" = true])
    218 
     215AM_CONDITIONAL([LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
    219216
    220217# Check for miscellaneous programs
     
    245242}
    246243
     244echo
    247245AC_MSG_NOTICE([Libtrace version $PACKAGE_VERSION])
    248 reportopt "Compiled with BPF filter support" $libtrace_bpf
    249 reportopt "Compiled with PCAP support" $libtrace_pcap
    250 reportopt "Compiled with compressed trace (zlib) support" $libtrace_zlib
     246reportopt "Compiled with PCAP support" $ac_cv_lib_pcap_pcap_open_live
     247reportopt "Compiled with compressed trace (zlib) support" $ac_cv_lib_z_gzopen
    251248if test x"$libtrace_dag" = xtrue; then
    252249        if test x"$libtrace_dag2_4"; then
     
    259256fi
    260257reportopt "Building man pages/documentation" $libtrace_doxygen
    261 reportopt "Building libpacketdump" $libtrace_libpacketdump
    262 
     258
  • lib/format_helper.c

    re5c2bc4 r306f91c  
    196196        assert(level<10);
    197197        assert(level>=0);
    198 #ifdef HAVE_ZLIB
     198#ifdef HAVE_LIBZ
    199199        sprintf(filemode,"wb%d",level);
    200200#else
  • lib/format_wag.c

    re5c2bc4 r306f91c  
    161161                void *value) {
    162162        switch(option) {
    163 #ifdef HAVE_ZLIB
     163#ifdef HAVE_LIBZ
    164164                case TRACE_OPTION_OUTPUT_COMPRESS:
    165165                        OPTIONS.zlib.level = *(int*)value;
  • lib/libtraceio.h

    re5c2bc4 r306f91c  
    55#define LIBTRACEIO_H 1
    66#include "config.h"
    7 #ifdef HAVE_ZLIB
    8 #include <zlib.h>
    9 #else
    10 #include <stdio.h>
    11 #endif
     7#include <inttypes.h>
    128
    139#include <unistd.h>
     
    5551 */
    5652ssize_t libtrace_io_write(libtrace_io_t *io, const void *buf, size_t len);
    57 off_t libtrace_io_seek(libtrace_io_t *io, off_t offset, int whence);
     53int64_t libtrace_io_seek(libtrace_io_t *io, int64_t offset, int whence);
    5854ssize_t libtrace_io_tell(libtrace_io_t *io);
    5955
  • test/Makefile

    r33fead9 r306f91c  
    88CFLAGS += $(INCLUDE)
    99libdir = $(PREFIX)/lib/.libs:$(PREFIX)/libpacketdump/.libs
    10 LDLIBS = -L$(PREFIX)/lib/.libs -L $(PREFIX)/libpacketdump/.libs -ltrace
     10LDLIBS = -L$(PREFIX)/lib/.libs -L $(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump
    1111
    1212BINS = test-pcap-bpf test-event test-time test-dir  #test-seek
     
    1717
    1818test: all test-format-all test-convert-all test-write-all test-programs
    19 
    20 test-decode: LDLIBS+=-lpacketdump
    2119
    2220test-programs: $(BINS)
  • tools/Makefile.am

    re5c2bc4 r306f91c  
    11# tracedump depends on libpacketdump
    2 if LIBPACKETDUMP
    32TRACEDUMP_DIR=tracedump
    4 endif
    53
    64SUBDIRS=traceanon tracemerge tracesplit $(TRACEDUMP_DIR) tracertstats tracestats
Note: See TracChangeset for help on using the changeset viewer.