Changeset 0afc0d7

Timestamp:

10/06/04 14:21:00 (18 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:

b007afc

Parents:

cd6034c

Message:

poink

Files:

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

aclocal.m4

@@ -2334 +2334 @@
     AC_MSG_WARN([output file `$ofile' does not exist])
   fi
-  if test -z `grep -e 'shared_ext.*shrext' $ofile`; then
+  if test -z "`grep -e 'shared_ext.*shrext' $ofile`"; then
     # Make sure $shared_ext gets set to $shrext
     if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then

configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libtrace 2.0.3.
+# Generated by GNU Autoconf 2.59 for libtrace 2.0.4.
 #
 # Report bugs to <libtrace@wand.net.nz>.
@@ -424 +424 @@
 PACKAGE_NAME='libtrace'
 PACKAGE_TARNAME='libtrace'
-PACKAGE_VERSION='2.0.3'
-PACKAGE_STRING='libtrace 2.0.3'
+PACKAGE_VERSION='2.0.4'
+PACKAGE_STRING='libtrace 2.0.4'
 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.3 to adapt to many kinds of systems.
+\`configure' configures libtrace 2.0.4 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.3:";;
+     short | recursive ) echo "Configuration of libtrace 2.0.4:";;
    esac
   cat <<\_ACEOF
@@ -1165 +1165 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-libtrace configure 2.0.3
+libtrace configure 2.0.4
 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.3, which was
+It was created by libtrace $as_me 2.0.4, 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.3
+VERSION=2.0.4
 
 cat >>confdefs.h <<_ACEOF
@@ -19152 +19152 @@
 echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
-  if test -z `grep -e 'shared_ext.*shrext' $ofile`; then
+  if test -z "`grep -e 'shared_ext.*shrext' $ofile`"; then
     # Make sure $shared_ext gets set to $shrext
     if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then
@@ -21033 +21033 @@
 cat >&5 <<_CSEOF
 
-This file was extended by libtrace $as_me 2.0.3, which was
+This file was extended by libtrace $as_me 2.0.4, 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.3
+libtrace config.status 2.0.4
 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.3,[libtrace@wand.net.nz],libtrace)
+AC_INIT(libtrace,2.0.4,[libtrace@wand.net.nz],libtrace)
 AC_CONFIG_SRCDIR(lib/trace.c)
-AM_INIT_AUTOMAKE(libtrace,2.0.3)
+AM_INIT_AUTOMAKE(libtrace,2.0.4)
 
 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:3:0 @LIBPCAP_PATH@ @LIBZ_PATH@
+libtrace_la_LDFLAGS=-version-info 2:4:0 @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:2:0 @LIBPCAP_PATH@ @LIBZ_PATH@
+libtrace_la_LDFLAGS = -version-info 2:4:0 @LIBPCAP_PATH@ @LIBZ_PATH@
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

lib/trace.c

@@ -1229 +1229 @@
         if (SERVER(source) && CLIENT(dest)) {
                 return USE_SOURCE;
-        } else if (SERVER(dest) && CLIENT(SOURCE)) {
+        } else if (SERVER(dest) && CLIENT(source)) {
                 return USE_DEST;
         } else if (ROOT_SERVER(source) && !ROOT_SERVER(dest)) {