Changeset 6c7e292

Timestamp:

11/11/04 17:36:35 (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:

7b82f21

Parents:

35902e3

Message:

added AM_CONDITIONAL test for dag

Files:

• config.h (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)
• lib/Makefile.am (modified) (1 diff)
• lib/Makefile.in (modified) (2 diffs)

config.h

@@ -6 +6 @@
 
 /* define if you have a DAG API */
-#define HAVE_DAG_API 1
+/* #undef HAVE_DAG_API */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */

configure

@@ -8888 +8888 @@
                 ADD_LIBS="$ADD_LIBS -ldag"
                 ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
+
+
+if ; then
+  HAVE_DAG_TRUE=
+  HAVE_DAG_FALSE='#'
+else
+  HAVE_DAG_TRUE='#'
+  HAVE_DAG_FALSE=
+fi;
                 #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
                 #ADD_SOURCEES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
@@ -9619 +9628 @@
 s,@CPP@,$CPP,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@HAVE_DAG_TRUE@,$HAVE_DAG_TRUE,;t t
+s,@HAVE_DAG_FALSE@,$HAVE_DAG_FALSE,;t t
 s,@ADD_LIBS@,$ADD_LIBS,;t t
 s,@ADD_LDFLAGS@,$ADD_LDFLAGS,;t t

configure.in

@@ -102 +102 @@
                 ADD_LIBS="$ADD_LIBS -ldag"
                 ADD_LDFLAGS="$ADD_LDFLAGS -L$dag_lib_dir"
-                DAG_SOURCES="dagapi.c dagopts.c"
+                AM_CONDITIONAL(HAVE_DAG);
                 #ADD_LIBS="$ADD_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o"
                 #ADD_SOURCEES="$ADD_SOURCES $dag_tools_dir/dagapi.c $dag_tools_dir/dagopts.c"
@@ -174 +174 @@
 AC_SUBST([ADD_LDFLAGS])
 AC_SUBST([ADD_INCLS])
-AC_SUBST([DAG_SOURCES])
 
 dnl and finally, output our Makefiles

lib/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libtrace.la
 include_HEADERS = libtrace.h dagformat.h wag.h
-libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h @DAG_SOURCES@
-#dagapi.c dagopts.c
+if HAVE_DAG
+libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
+else
+libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
+endif
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@

lib/Makefile.in

@@ -84 +84 @@
 lib_LTLIBRARIES = libtrace.la
 include_HEADERS = libtrace.h dagformat.h wag.h
-libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
+@HAVE_DAG_TRUE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
+@HAVE_DAG_FALSE@libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@
@@ -95 +96 @@
 
 libtrace_la_DEPENDENCIES =
-am_libtrace_la_OBJECTS = libtrace_la-trace.lo libtrace_la-fifo.lo \
-        libtrace_la-dagapi.lo libtrace_la-dagopts.lo
+@HAVE_DAG_TRUE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
+@HAVE_DAG_TRUE@ libtrace_la-fifo.lo libtrace_la-dagapi.lo \
+@HAVE_DAG_TRUE@ libtrace_la-dagopts.lo
+@HAVE_DAG_FALSE@am_libtrace_la_OBJECTS = libtrace_la-trace.lo \
+@HAVE_DAG_FALSE@        libtrace_la-fifo.lo
 libtrace_la_OBJECTS = $(am_libtrace_la_OBJECTS)