Changeset 60f3c4c for configure.in

Timestamp:

03/06/12 15:36:43 (9 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:

1d4db58

Parents:

bd6576d

Message:

• Shifted wandio into a separate library, seeing as we're going to be exporting the API now

File:

• configure.in (modified) (7 diffs)

configure.in

@@ -41 +41 @@
         examples/stats/Makefile examples/tutorial/Makefile
         docs/libtrace.doxygen 
-        lib/libtrace.h
+        lib/libtrace.h libwandio/Makefile
         ])
 
@@ -100 +100 @@
 
 LIBPKTDUMP_LIBS="-ltrace "
-ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/lib" 
-LIBTRACE_LIBS=""
+ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/libwandio -L\$(abs_top_srcdir)/lib" 
+LIBTRACE_LIBS="-lwandio"
 TOOLS_LIBS=""
+LIBWANDIO_LIBS=""
 
 # Set our C compiler flags based on the gcc version
@@ -395 +396 @@
 
 if test "$have_pthread" = 1; then
-        LIBTRACE_LIBS="$LIBTRACE_LIBS -lpthread"
+        LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread"
         AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
 fi
@@ -494 +495 @@
 AS_IF([test "x$have_bzip" = "xyes"], [
         if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
-                LIBTRACE_LIBS="$LIBTRACE_LIBS -lbz2"
+                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2"
         fi
         with_bzip2=yes
@@ -515 +516 @@
 AS_IF([test "x$have_zlib" = "xyes"], [
         if test "$ac_cv_lib_z_deflate" != "none required"; then
-                LIBTRACE_LIBS="$LIBTRACE_LIBS -lz"
+                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz"
         fi
         AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
@@ -537 +538 @@
 AS_IF([test "x$have_lzo" = "xyes"], [
         if test "$ac_cv_lib_lzo2_lzo1x_1_compress" != "none required"; then
-                LIBTRACE_LIBS="$LIBTRACE_LIBS -llzo2"
+                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzo2"
         fi
         AC_DEFINE(HAVE_LIBLZO2, 1, "Compiled with lzo2 support")
@@ -571 +572 @@
 AC_SUBST([LIBTRACE_LIBS])
 AC_SUBST([LIBPKTDUMP_LIBS])
+AC_SUBST([LIBWANDIO_LIBS])
 AC_SUBST([TOOLS_LIBS])
 #AC_SUBST([ADD_LIBS])