Changeset 24e9fed

Timestamp:

10/11/04 15:36:38 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

ff435b1

Parents:

6cd7c20

Message:

move to 2.1.0 again

Files:

• config.h (modified) (2 diffs)
• configure (modified) (9 diffs)
• configure.in (modified) (1 diff)
• lib/Makefile.am (modified) (1 diff)
• lib/Makefile.in (modified) (1 diff)

config.h

@@ -15 +15 @@
 
 /* Define to 1 if you have the <net/bpf.h> header file. */
-#define HAVE_NET_BPF_H 1
+/* #undef HAVE_NET_BPF_H */
 
 /* Define to 1 if you have the <pcap-bpf.h> header file. */
-/* #undef HAVE_PCAP_BPF_H */
+#define HAVE_PCAP_BPF_H 1
 
 /* Define to 1 if you have the <pcap.h> header file. */
@@ -99 +99 @@
 /* #undef const */
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 /* #undef inline */
+#endif
 
 /* Define to `unsigned' if <sys/types.h> does not define. */

configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libtrace 2.0.6.
+# Generated by GNU Autoconf 2.59 for libtrace 2.1.0.
 #
 # Report bugs to <libtrace@wand.net.nz>.
@@ -424 +424 @@
 PACKAGE_NAME='libtrace'
 PACKAGE_TARNAME='libtrace'
-PACKAGE_VERSION='2.0.6'
-PACKAGE_STRING='libtrace 2.0.6'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='libtrace 2.1.0'
 PACKAGE_BUGREPORT='libtrace@wand.net.nz'
 
@@ -955 +955 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libtrace 2.0.6 to adapt to many kinds of systems.
+\`configure' configures libtrace 2.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1021 +1021 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libtrace 2.0.6:";;
+     short | recursive ) echo "Configuration of libtrace 2.1.0:";;
    esac
   cat <<\_ACEOF
@@ -1165 +1165 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-libtrace configure 2.0.6
+libtrace configure 2.1.0
 generated by GNU Autoconf 2.59
 
@@ -1179 +1179 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libtrace $as_me 2.0.6, which was
+It was created by libtrace $as_me 2.1.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -1805 +1805 @@
 # Define the identity of the package.
 PACKAGE=libtrace
-VERSION=2.0.6
+VERSION=2.1.0
 
 cat >>confdefs.h <<_ACEOF
@@ -21033 +21033 @@
 cat >&5 <<_CSEOF
 
-This file was extended by libtrace $as_me 2.0.6, which was
+This file was extended by libtrace $as_me 2.1.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -21096 +21096 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libtrace config.status 2.0.6
+libtrace config.status 2.1.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

configure.in

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(libtrace,2.0.6,[libtrace@wand.net.nz],libtrace)
+AC_INIT(libtrace,2.1.0,[libtrace@wand.net.nz],libtrace)
 AC_CONFIG_SRCDIR(lib/trace.c)
-AM_INIT_AUTOMAKE(libtrace,2.0.6)
+AM_INIT_AUTOMAKE(libtrace,2.1.0)
 
 dnl GNU C library

lib/Makefile.am

@@ -3 +3 @@
 include_HEADERS = libtrace.h dagformat.h wag.h
 libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
-libtrace_la_LDFLAGS=-version-info 2:6:0 @LIBPCAP_PATH@ @LIBZ_PATH@
+libtrace_la_LDFLAGS=-version-info 3:0:1 @LIBPCAP_PATH@ @LIBZ_PATH@

lib/Makefile.in

@@ -95 +95 @@
 include_HEADERS = libtrace.h dagformat.h wag.h
 libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
-libtrace_la_LDFLAGS = -version-info 2:6:0 @LIBPCAP_PATH@ @LIBZ_PATH@
+libtrace_la_LDFLAGS = -version-info 3:0:1 @LIBPCAP_PATH@ @LIBZ_PATH@
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs