Changeset 6c7e292


Ignore:
Timestamp:
11/11/04 17:36:35 (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:
7b82f21
Parents:
35902e3
Message:

added AM_CONDITIONAL test for dag

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • config.h

    ra48d246 r6c7e292  
    66
    77/* define if you have a DAG API */
    8 #define HAVE_DAG_API 1
     8/* #undef HAVE_DAG_API */
    99
    1010/* Define to 1 if you have the <dlfcn.h> header file. */
  • configure

    ra48d246 r6c7e292  
    88888888                ADD_LIBS="$ADD_LIBS -ldag"
    88898889                ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
     8890
     8891
     8892if ; then
     8893  HAVE_DAG_TRUE=
     8894  HAVE_DAG_FALSE='#'
     8895else
     8896  HAVE_DAG_TRUE='#'
     8897  HAVE_DAG_FALSE=
     8898fi;
    88908899                #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
    88918900                #ADD_SOURCEES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
     
    96199628s,@CPP@,$CPP,;t t
    96209629s,@LIBTOOL@,$LIBTOOL,;t t
     9630s,@HAVE_DAG_TRUE@,$HAVE_DAG_TRUE,;t t
     9631s,@HAVE_DAG_FALSE@,$HAVE_DAG_FALSE,;t t
    96219632s,@ADD_LIBS@,$ADD_LIBS,;t t
    96229633s,@ADD_LDFLAGS@,$ADD_LDFLAGS,;t t
  • configure.in

    r3ee7864 r6c7e292  
    102102                ADD_LIBS="$ADD_LIBS -ldag"
    103103                ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
    104                 DAG_SOURCES="dagapi.c dagopts.c"
     104                AM_CONDITIONAL(HAVE_DAG);
    105105                #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
    106106                #ADD_SOURCEES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
     
    174174AC_SUBST([ADD_LDFLAGS])
    175175AC_SUBST([ADD_INCLS])
    176 AC_SUBST([DAG_SOURCES])
    177176
    178177dnl and finally, output our Makefiles
  • lib/Makefile.am

    r3ee7864 r6c7e292  
    11lib_LTLIBRARIES = libtrace.la
    22include_HEADERS = libtrace.h dagformat.h wag.h
    3 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h @DAG_SOURCES@
    4 #dagapi.c dagopts.c
     3if HAVE_DAG
     4libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
     5else
     6libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
     7endif
    58libtrace_la_CFLAGS = @ADD_INCLS@
    69libtrace_la_LIBADD = @ADD_LIBS@
  • lib/Makefile.in

    ra48d246 r6c7e292  
    8484lib_LTLIBRARIES = libtrace.la
    8585include_HEADERS = libtrace.h dagformat.h wag.h
    86 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
     86@HAVE_DAG_TRUE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
     87@HAVE_DAG_FALSE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
    8788libtrace_la_CFLAGS = @ADD_INCLS@
    8889libtrace_la_LIBADD = @ADD_LIBS@
     
    9596
    9697libtrace_la_DEPENDENCIES =
    97 am_libtrace_la_OBJECTS = libtrace_la-trace.lo libtrace_la-fifo.lo \
    98         libtrace_la-dagapi.lo libtrace_la-dagopts.lo
     98@HAVE_DAG_TRUE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
     99@HAVE_DAG_TRUE@ libtrace_la-fifo.lo libtrace_la-dagapi.lo \
     100@HAVE_DAG_TRUE@ libtrace_la-dagopts.lo
     101@HAVE_DAG_FALSE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
     102@HAVE_DAG_FALSE@        libtrace_la-fifo.lo
    99103libtrace_la_OBJECTS = $(am_libtrace_la_OBJECTS)
    100104
Note: See TracChangeset for help on using the changeset viewer.