Changeset 3a333e2


Ignore:
Timestamp:
08/06/15 06:09:21 (5 years ago)
Author:
Alistair King <alistair@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
fc0325e
Parents:
d280f48
Message:

Remove libwandio source, replace with external dependency

Removes the libwandio source code (now a separate repository) and updates the
build scripts to treat libwandio as an external dependency.

After this commit libwandio will need to be installed prior to building
libtrace.

Files:
18 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    ra2ce0a6 r3a333e2  
    11LIBPACKETDUMP_DIR = libpacketdump
    22TOOLS_DIR = tools
    3 WANDIO_DIR=libwandio
    4 SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
     3SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
    54
    65ACLOCAL_AMFLAGS = -I m4
  • configure.in

    r3e5518a r3a333e2  
    4141        examples/stats/Makefile examples/tutorial/Makefile
    4242        docs/libtrace.doxygen
    43         lib/libtrace.h libwandio/Makefile libwandio/tools/wandiocat/Makefile
     43        lib/libtrace.h
    4444        ])
    4545
     
    100100
    101101LIBPKTDUMP_LIBS="-ltrace "
    102 ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/libwandio -L\$(abs_top_srcdir)/lib"
    103 LIBTRACE_LIBS="-lwandio"
     102ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/lib"
     103LIBTRACE_LIBS=""
    104104TOOLS_LIBS=""
    105 LIBWANDIO_LIBS=""
    106105
    107106CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wextra -DLT_BUILDING_DLL=1"
     
    198197# Checking for libgdc
    199198AC_CHECK_HEADER(gdc.h,AC_DEFINE(HAVE_LIBGDC,1,[has gdc.h]))
     199
     200# Check for libwandio (no longer bundled with libtrace)
     201AC_CHECK_LIB(wandio,wandio_create,wandiofound=1,wandiofound=0)
     202if test "$wandiofound" = 0; then
     203        AC_MSG_ERROR(libwandio is required to compile libtrace. If you have installed it in a non-standard location please use LDFLAGS to specify the location of the library. WANDIO can be obtained from XXX: add download url)
     204else
     205        LIBTRACE_LIBS="$LIBTRACE_LIBS -lwandio"
     206        TOOLS_LIBS="$TOOLS_LIBS -lwandio"
     207        AC_DEFINE([HAVE_LIBWANDIO],1,[compile with libwandio support])
     208fi
    200209
    201210# Check for libpcap
     
    424433
    425434if test "$have_pthread" = 1; then
    426         LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread"
    427435        AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
    428436fi
     
    517525        with_ncurses=no]
    518526)
    519                        
    520 AC_ARG_WITH([bzip2],
    521         AC_HELP_STRING([--with-bzip2], [build with support for bzip2 compressed files]))
    522 
    523 AS_IF([test "x$with_bzip2" != "xno"],
    524         [
    525         AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
    526         ], [have_bzip=no])
    527 
    528 AS_IF([test "x$have_bzip" = "xyes"], [
    529         if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
    530                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2"
    531         fi
    532         with_bzip2=yes
    533         AC_DEFINE(HAVE_LIBBZ2, 1, "Compiled with bzip2 support")],
    534        
    535         [AS_IF([test "x$with_bzip2" = "xyes"],
    536                 [AC_MSG_ERROR([bzip2 requested but not found])])
    537         AC_DEFINE(HAVE_LIBBZ2, 0, "Compiled with bzip2 support")
    538         with_bzip2=no]
    539 )
    540 
    541 AC_ARG_WITH([zlib],
    542         AC_HELP_STRING([--with-zlib], [build with support for zlib compressed files]))
    543 
    544 AS_IF([test "x$with_zlib" != "xno"],
    545         [
    546         AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
    547         ], [have_zlib=no])
    548 
    549 AS_IF([test "x$have_zlib" = "xyes"], [
    550         if test "$ac_cv_lib_z_deflate" != "none required"; then
    551                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz"
    552         fi
    553         AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
    554         with_zlib=yes],
    555 
    556        
    557         [AS_IF([test "x$with_zlib" = "xyes"],
    558                 [AC_MSG_ERROR([zlib requested but not found])])
    559         AC_DEFINE(HAVE_LIBZ, 0, "Compiled with zlib support")
    560         with_zlib=no]
    561 )
    562 
    563 AC_ARG_WITH([lzo],
    564         AC_HELP_STRING([--with-lzo], [build with support for writing lzo compressed files]))
    565 
    566 AS_IF([test "x$with_lzo" != "xno"],
    567         [
    568         AC_CHECK_LIB(lzo2, lzo1x_1_compress, have_lzo=yes, have_lzo=no)
    569         ], [have_lzo=no])
    570 
    571 AS_IF([test "x$have_lzo" = "xyes"], [
    572         if test "$ac_cv_lib_lzo2_lzo1x_1_compress" != "none required"; then
    573                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzo2"
    574         fi
    575         AC_DEFINE(HAVE_LIBLZO2, 1, "Compiled with lzo2 support")
    576         with_lzo=yes],
    577 
    578        
    579         [AS_IF([test "x$with_lzo" = "xyes"],
    580                 [AC_MSG_ERROR([lzo requested but not found])])
    581         AC_DEFINE(HAVE_LIBLZO2, 0, "Compiled with lzo2 support")
    582         with_lzo=no]
    583 )
    584 
    585 AC_ARG_WITH([lzma],
    586         AC_HELP_STRING([--with-lzma], [build with support for lzma compressed files]))
    587 
    588 AS_IF([test "x$with_lzma" != "xno"],
    589         [
    590         AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
    591         ], [have_lzma=no])
    592 
    593 AS_IF([test "x$have_lzma" = "xyes"], [
    594         if test "$ac_cv_lib_lzma_code" != "none required"; then
    595                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzma"
    596         fi
    597         AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support")
    598         with_lzma=yes],
    599 
    600        
    601         [AS_IF([test "x$with_lzma" = "xyes"],
    602                 [AC_MSG_ERROR([lzma requested but not found])])
    603         AC_DEFINE(HAVE_LIBLZMA, 0, "Compiled with lzma support")
    604         with_lzma=no]
    605 )
    606527
    607528# Define automake conditionals for use in our Makefile.am files
     
    615536AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
    616537AM_CONDITIONAL([HAVE_NCURSES], [test "x$with_ncurses" != "xno"])
    617 AM_CONDITIONAL([HAVE_BZLIB], [test "x$with_bzip2" != "xno"])
    618 AM_CONDITIONAL([HAVE_ZLIB], [test "x$with_zlib" != "xno"])
    619 AM_CONDITIONAL([HAVE_LZO], [ test "x$with_lzo" != "xno"])
    620 AM_CONDITIONAL([HAVE_LZMA], [ test "x$with_lzma" != "xno"])
    621538
    622539# Check for miscellaneous programs
     
    628545AC_SUBST([LIBTRACE_LIBS])
    629546AC_SUBST([LIBPKTDUMP_LIBS])
    630 AC_SUBST([LIBWANDIO_LIBS])
    631547AC_SUBST([TOOLS_LIBS])
    632548#AC_SUBST([ADD_LIBS])
     
    670586fi
    671587
    672 reportopt "Compiled with compressed trace (zlib) support" $with_zlib
    673 reportopt "Compiled with compressed trace (bz2) support" $with_bzip2
    674 reportopt "Compiled with compressed trace (lzo write only) support" $with_lzo
    675 reportopt "Compiled with compressed trace (lzma) support" $with_lzma
    676588if test x"$libtrace_dag" = xtrue; then
    677589        if test "$libtrace_dag_version" = 24; then
  • examples/Makefile.examples

    rfdb5e98 r3a333e2  
    1 AM_CFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump" \
    2         -I"$(top_srcdir)/libwandio"
    3 AM_CXXFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump" \
    4         -I"$(top_srcdir)/libwandio"
    5 
     1AM_CFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump"
     2AM_CXXFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump"
    63AM_LDFLAGS=-L"$(top_srcdir)/lib" -L"$(top_srcdir)/libpacketdump" \
    7         -L"$(top_srcdir)/libwandio" -ltrace -lwandio
     4        -ltrace -lwandio
  • lib/Makefile.am

    r3fc3267 r3a333e2  
    6363endif
    6464
    65 AM_CPPFLAGS= @ADD_INCLS@ -I../libwandio
     65AM_CPPFLAGS= @ADD_INCLS@
    6666libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@ $(DPDKLIBS)
    6767libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
  • libpacketdump/Makefile.am

    rbd119b3 r3a333e2  
    172172dist_plugin_DATA = $(TXT_PROTOCOLS)
    173173
    174 AM_CPPFLAGS= @ADD_INCLS@ -I../lib -I../libwandio
     174AM_CPPFLAGS= @ADD_INCLS@ -I../lib
    175175
    176176# NOTE: You CANNOT add @LEXLIBS@ here, as they are statically compiled
  • tools/Makefile.tools

    rfdb5e98 r3a333e2  
    11
    22
    3 AM_CFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump" \
    4         -I"$(top_srcdir)/libwandio"
    5 AM_CXXFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump" \
    6         -I"$(top_srcdir)/libwandio"
    7        
     3AM_CFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump"
     4AM_CXXFLAGS=-I"$(top_srcdir)/lib" -I"$(top_srcdir)/libpacketdump"
    85AM_LDFLAGS=-L"$(top_srcdir)/lib" -L"$(top_srcdir)/libpacketdump" \
    9         -L"$(top_srcdir)/libwandio" -ltrace -lwandio @TOOLS_LIBS@
     6       -ltrace @TOOLS_LIBS@
Note: See TracChangeset for help on using the changeset viewer.