Changeset df6ae1f

Timestamp:

10/06/05 11:11:43 (17 years ago)

Author:

Shane Alcock <salcock@…>

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:

f6879f3

Parents:

18478c1

Message:

During configuration / compilation libtrace will borrow the dagapi code if the user is compiling against dag2.4 libraries.

Files:

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

configure.in

@@ -180 +180 @@
                 AC_SUBST([DAG_TOOLS_DIR])
                 ac_cv_lbl_dag_api=yes
+                if test -r "$dag_lib_dir/libdag.so"; then
+                        dag2_4=false
+                else
+                        cp $dag_root/tools/dagopts.c lib/dagopts.c
+                        cp $dag_root/tools/dagapi.c lib/dagapi.c
+                        dag2_4=true
+                fi
+                AM_CONDITIONAL(DAG2_4, test x$dag2_4=xtrue)
         else
                 ac_cv_lbl_dag_api=no

lib/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libtrace.la
 include_HEADERS = libtrace.h dagformat.h wag.h 
+
+if DAG2_4
+libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h format_template.c format_erf.c format_pcap.c format_wag.c format_helper.c format_helper.h parse_cmd.c parse_cmd.h libtrace_int.h dagopts.c dagapi.c
+else
 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h format_template.c format_erf.c format_pcap.c format_wag.c format_helper.c format_helper.h parse_cmd.c parse_cmd.h libtrace_int.h
+endif
+
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@ @LTLIBOBJS@
 libtrace_la_LDFLAGS=-version-info 2:22:0 @ADD_LDFLAGS@
+#libtrace_la_DEPENDENCIES = @DAGSOURCES@
 
 #dagapi.c:
 #       cp @DAG_TOOLS_DIR@/dagapi.c .
-#
+
 #dagopts.c:
 #       cp @DAG_TOOLS_DIR@/dagopts.c .

lib/trace.c

@@ -272 +272 @@
 
         libtrace->uridata = strdup(uridata);
-
         // libtrace->format now contains the type of uri
         // libtrace->uridata contains the appropriate data for this