Changeset 7b2a39b

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:

• configure.in (modified) (2 diffs)
• lib/Makefile.am (modified) (2 diffs)
• lib/trace.c (modified) (1 diff)

configure.in

@@ -54 +54 @@
 
 AC_CHECK_HEADERS(netinet/in.h)
+AC_CHECK_HEADER(netpacket/packet.h,
+                libtrace_netpacket_packet_h=true
+                AC_DEFINE(HAVE_NETPACKET_PACKET_H,1,[We have netpacket/packet.h]),
+                [libtrace_netpacket_packet_h=false])
 
 AC_CHECK_HEADER(net/if.h,
@@ -350 +354 @@
 AM_CONDITIONAL([HAVE_CXX], [test "$libtrace_cxx" = true])
 AM_CONDITIONAL([HAVE_ZLIB], [test "$libtrace_zlib" = true])
+AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
 AM_CONDITIONAL([LIBPACKETDUMP], [test "$libtrace_libpacketdump" = true])
 AM_CONDITIONAL([LIBTRACE_TOOLS], [test "$libtrace_tools" = true])

lib/Makefile.am

@@ -5 +5 @@
 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h \
                 format_erf.c format_pcap.c format_wag.c format_legacy.c \
-                format_rt.c format_helper.c format_helper.h format_linux.c \
-                format_pcapfile.c \
+                format_rt.c format_helper.c format_helper.h format_pcapfile.c \
                 parse_cmd.c parse_cmd.h libtrace_int.h lt_inttypes.h \
                 linktypes.c protocols.c 
+if HAVE_NETPACKET_PACKET_H
+libtrace_la_SOURCES+=format_linux.c
+endif
+
 if HAVE_ZLIB
 libtrace_la_SOURCES+=libtraceio-zlib.c
@@ -14 +17 @@
 libtrace_la_SOURCES+=libtraceio-stdio.c
 endif
-#libtrace_la_SOURCES+=libtraceio-bzlib.c
 
 if DAG2_4

lib/trace.c

@@ -212 +212 @@
                 erf_constructor();
                 legacy_constructor();
+#ifdef HAVE_NETPACKET_PACKET_H
                 linuxnative_constructor();
+#endif
 #ifdef HAVE_PCAP
                 pcap_constructor();