Changeset 60f3c4c for configure.in


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r17094b2 r60f3c4c  
    4141        examples/stats/Makefile examples/tutorial/Makefile
    4242        docs/libtrace.doxygen
    43         lib/libtrace.h
     43        lib/libtrace.h libwandio/Makefile
    4444        ])
    4545
     
    100100
    101101LIBPKTDUMP_LIBS="-ltrace "
    102 ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/lib"
    103 LIBTRACE_LIBS=""
     102ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/libwandio -L\$(abs_top_srcdir)/lib"
     103LIBTRACE_LIBS="-lwandio"
    104104TOOLS_LIBS=""
     105LIBWANDIO_LIBS=""
    105106
    106107# Set our C compiler flags based on the gcc version
     
    395396
    396397if test "$have_pthread" = 1; then
    397         LIBTRACE_LIBS="$LIBTRACE_LIBS -lpthread"
     398        LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread"
    398399        AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
    399400fi
     
    494495AS_IF([test "x$have_bzip" = "xyes"], [
    495496        if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
    496                 LIBTRACE_LIBS="$LIBTRACE_LIBS -lbz2"
     497                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2"
    497498        fi
    498499        with_bzip2=yes
     
    515516AS_IF([test "x$have_zlib" = "xyes"], [
    516517        if test "$ac_cv_lib_z_deflate" != "none required"; then
    517                 LIBTRACE_LIBS="$LIBTRACE_LIBS -lz"
     518                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz"
    518519        fi
    519520        AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
     
    537538AS_IF([test "x$have_lzo" = "xyes"], [
    538539        if test "$ac_cv_lib_lzo2_lzo1x_1_compress" != "none required"; then
    539                 LIBTRACE_LIBS="$LIBTRACE_LIBS -llzo2"
     540                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzo2"
    540541        fi
    541542        AC_DEFINE(HAVE_LIBLZO2, 1, "Compiled with lzo2 support")
     
    571572AC_SUBST([LIBTRACE_LIBS])
    572573AC_SUBST([LIBPKTDUMP_LIBS])
     574AC_SUBST([LIBWANDIO_LIBS])
    573575AC_SUBST([TOOLS_LIBS])
    574576#AC_SUBST([ADD_LIBS])
Note: See TracChangeset for help on using the changeset viewer.