Changeset 496 for trunk/configure.in

Timestamp:

11/03/05 17:17:41 (8 years ago)

Author:

dlawson

Message:

2.0.25

Fixes for builds under openbsd:

• pcap uses a struct bpf_filter, not struct timeval. fixed format_pcap to solve this
• #includes in libpacketdump - libpacketdump still not working properly
• rijndael.c and .h conflicted with a system function called 'encrypt' - renamed encrypt and decrypt to r_* within rijndael*
• UINT64_MAX not defined under freebsd

File:

• trunk/configure.in (modified) (5 diffs)

trunk/configure.in

@@ -3 +3 @@
 LIBTRACE_MAJOR=2
 LIBTRACE_MID=0
-LIBTRACE_MINOR=24
-
-AC_INIT(libtrace,2.0.24,[contact@wand.net.nz],libtrace)
+LIBTRACE_MINOR=25
+
+AC_INIT(libtrace,2.0.25,[contact@wand.net.nz],libtrace)
 AC_CONFIG_SRCDIR(lib/trace.c)
-AM_INIT_AUTOMAKE(libtrace,2.0.24)
+AM_INIT_AUTOMAKE(libtrace,2.0.25)
 
 AC_CONFIG_FILES([Makefile lib/Makefile docs/Makefile libpacketdump/Makefile tools/Makefile tools/traceanon/Makefile tools/tracedump/Makefile tools/tracemerge/Makefile tools/tracereport/Makefile tools/tracertstats/Makefile tools/tracesplit/Makefile  ])
@@ -37 +37 @@
 AC_CHECK_FUNCS(socket strdup)
 
+AC_CHECK_SIZEOF([long int])
+
+# Check for various broken functions
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+
+# *BSD doesn't have strndup. Currently provide our own.
+AC_REPLACE_FUNCS(strndup)
+
 # Checks for header files.
 AC_HEADER_STDC
@@ -50 +59 @@
 ])
 
+
+AC_CHECK_HEADER(netinet/ether.h,
+                AC_DEFINE(HAVE_NETINET_ETHER_H,1,[We have netinet/ether.h]
+), [],
+[
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
+])
 
 AC_CHECK_HEADER(netinet/if_ether.h,
@@ -96 +115 @@
              [AC_DEFINE(HAVE_GDC_H,0,[Conditional for building with libGDC support]) libtrace_gdc=false])
 
-# Check for various broken functions
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-
-# *BSD doesn't have strndup. Currently provide our own.
-AC_REPLACE_FUNCS(strndup)
 
 # Check to see if we have libpcap
@@ -354 +367 @@
 AC_OUTPUT
 
-function reportopt() {
+reportopt() {
         if test x"$2" = xtrue -o x"$2" = xyes; then
                 AC_MSG_NOTICE([$1: Yes])