Changeset df6ae1f


Ignore:
Timestamp:
10/06/05 11:11:43 (15 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:
3 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r1e66c64 rdf6ae1f  
    180180                AC_SUBST([DAG_TOOLS_DIR])
    181181                ac_cv_lbl_dag_api=yes
     182                if test -r "$dag_lib_dir/libdag.so"; then
     183                        dag2_4=false
     184                else
     185                        cp $dag_root/tools/dagopts.c lib/dagopts.c
     186                        cp $dag_root/tools/dagapi.c lib/dagapi.c
     187                        dag2_4=true
     188                fi
     189                AM_CONDITIONAL(DAG2_4, test x$dag2_4=xtrue)
    182190        else
    183191                ac_cv_lbl_dag_api=no
  • lib/Makefile.am

    rb69afb1 rdf6ae1f  
    11lib_LTLIBRARIES = libtrace.la
    22include_HEADERS = libtrace.h dagformat.h wag.h
     3
     4if DAG2_4
     5libtrace_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
     6else
    37libtrace_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
     8endif
     9
    410libtrace_la_CFLAGS = @ADD_INCLS@
    511libtrace_la_LIBADD = @ADD_LIBS@ @LTLIBOBJS@
    612libtrace_la_LDFLAGS=-version-info 2:22:0 @ADD_LDFLAGS@
     13#libtrace_la_DEPENDENCIES = @DAGSOURCES@
    714
    815#dagapi.c:
    916#       cp @DAG_TOOLS_DIR@/dagapi.c .
    10 #
     17
    1118#dagopts.c:
    1219#       cp @DAG_TOOLS_DIR@/dagopts.c .
  • lib/trace.c

    rae8196e rdf6ae1f  
    272272
    273273        libtrace->uridata = strdup(uridata);
    274 
    275274        // libtrace->format now contains the type of uri
    276275        // libtrace->uridata contains the appropriate data for this
Note: See TracChangeset for help on using the changeset viewer.