Changeset caa8f99

Timestamp:

11/24/04 16:15:46 (16 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:

6ce4ea9

Parents:

3937eae

Message:

changes to pull in dagapi.c and dagopts.c from dag source tree

Files:

• Makefile.in (modified) (1 diff)
• config.h (modified) (4 diffs)
• configure (modified) (11 diffs)
• configure.in (modified) (1 diff)

Makefile.in

@@ -65 +65 @@
 AWK = @AWK@
 CC = @CC@
+DAG_TOOLS_DIR = @DAG_TOOLS_DIR@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@

config.h

@@ -6 +6 @@
 
 /* define if you have a DAG API */
-/* #undef HAVE_DAG_API */
+#define HAVE_DAG_API 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
@@ -75 +75 @@
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libtrace 2.0.9"
+#define PACKAGE_STRING "libtrace 2.0.10"
 
 /* Define to the one symbol short name of this package. */
@@ -81 +81 @@
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.9"
+#define PACKAGE_VERSION "2.0.10"
 
 /* Define to 1 if you have the ANSI C header files. */
@@ -90 +90 @@
 
 /* Version number of package */
-#define VERSION "2.0.9"
+#define VERSION "2.0.10"
 
 /* Define to 1 if your processor stores words with the most significant byte

configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for libtrace 2.0.9.
+# Generated by GNU Autoconf 2.53 for libtrace 2.0.10.
 #
 # Report bugs to <libtrace@wand.net.nz>.
@@ -416 +416 @@
 PACKAGE_NAME='libtrace'
 PACKAGE_TARNAME='libtrace'
-PACKAGE_VERSION='2.0.9'
-PACKAGE_STRING='libtrace 2.0.9'
+PACKAGE_VERSION='2.0.10'
+PACKAGE_STRING='libtrace 2.0.10'
 PACKAGE_BUGREPORT='libtrace@wand.net.nz'
 
@@ -922 +922 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libtrace 2.0.9 to adapt to many kinds of systems.
+\`configure' configures libtrace 2.0.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -988 +988 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libtrace 2.0.9:";;
+     short | recursive ) echo "Configuration of libtrace 2.0.10:";;
    esac
   cat <<\_ACEOF
@@ -1090 +1090 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-libtrace configure 2.0.9
+libtrace configure 2.0.10
 generated by GNU Autoconf 2.53
 
@@ -1105 +1105 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libtrace $as_me 2.0.9, which was
+It was created by libtrace $as_me 2.0.10, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
@@ -1671 +1671 @@
 # Define the identity of the package.
 PACKAGE=libtrace
-VERSION=2.0.9
+VERSION=2.0.10
 
 cat >>confdefs.h <<_ACEOF
@@ -8887 +8887 @@
                 ADD_LIBS="$ADD_LIBS -ldag"
                 ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
+                DAG_TOOLS_DIR=$dag_tools_dir
+
                 #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
                 #ADD_SOURCES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
@@ -9343 +9345 @@
 cat >&5 <<_CSEOF
 
-This file was extended by libtrace $as_me 2.0.9, which was
+This file was extended by libtrace $as_me 2.0.10, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
@@ -9405 +9407 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libtrace config.status 2.0.9
+libtrace config.status 2.0.10
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -9631 +9633 @@
 s,@CPP@,$CPP,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@DAG_TOOLS_DIR@,$DAG_TOOLS_DIR,;t t
 s,@HAVE_DAG_TRUE@,$HAVE_DAG_TRUE,;t t
 s,@HAVE_DAG_FALSE@,$HAVE_DAG_FALSE,;t t

configure.in

@@ -102 +102 @@
                 ADD_LIBS="$ADD_LIBS -ldag"
                 ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
+                DAG_TOOLS_DIR=$dag_tools_dir
+                AC_SUBST([DAG_TOOLS_DIR])
                 #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
                 #ADD_SOURCES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"