Changeset 7b2a39b


Ignore:
Timestamp:
04/22/06 00:59:24 (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:
411f3c7
Parents:
2d96bf2
Message:

Make format_linux only compile if the machine we're compiling it on supports it.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    redb18ce r7b2a39b  
    5454
    5555AC_CHECK_HEADERS(netinet/in.h)
     56AC_CHECK_HEADER(netpacket/packet.h,
     57                libtrace_netpacket_packet_h=true
     58                AC_DEFINE(HAVE_NETPACKET_PACKET_H,1,[We have netpacket/packet.h]),
     59                [libtrace_netpacket_packet_h=false])
    5660
    5761AC_CHECK_HEADER(net/if.h,
     
    350354AM_CONDITIONAL([HAVE_CXX], [test "$libtrace_cxx" = true])
    351355AM_CONDITIONAL([HAVE_ZLIB], [test "$libtrace_zlib" = true])
     356AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
    352357AM_CONDITIONAL([LIBPACKETDUMP], [test "$libtrace_libpacketdump" = true])
    353358AM_CONDITIONAL([LIBTRACE_TOOLS], [test "$libtrace_tools" = true])
  • lib/Makefile.am

    rdd2eaee r7b2a39b  
    55libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h \
    66                format_erf.c format_pcap.c format_wag.c format_legacy.c \
    7                 format_rt.c format_helper.c format_helper.h format_linux.c \
    8                 format_pcapfile.c \
     7                format_rt.c format_helper.c format_helper.h format_pcapfile.c \
    98                parse_cmd.c parse_cmd.h libtrace_int.h lt_inttypes.h \
    109                linktypes.c protocols.c
     10if HAVE_NETPACKET_PACKET_H
     11libtrace_la_SOURCES+=format_linux.c
     12endif
     13
    1114if HAVE_ZLIB
    1215libtrace_la_SOURCES+=libtraceio-zlib.c
     
    1417libtrace_la_SOURCES+=libtraceio-stdio.c
    1518endif
    16 #libtrace_la_SOURCES+=libtraceio-bzlib.c
    1719
    1820if DAG2_4
  • lib/trace.c

    r114b8d6 r7b2a39b  
    212212                erf_constructor();
    213213                legacy_constructor();
     214#ifdef HAVE_NETPACKET_PACKET_H
    214215                linuxnative_constructor();
     216#endif
    215217#ifdef HAVE_PCAP
    216218                pcap_constructor();
Note: See TracChangeset for help on using the changeset viewer.