Changeset 341c38f for configure.in


Ignore:
Timestamp:
08/25/15 14:48:04 (5 years ago)
Author:
Richard Sanger <rsangerarj@…>
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:
03aca91
Parents:
54cf135 (diff), 84cdb05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'upstream/develop' into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r4007dbb r341c38f  
    4141        examples/stats/Makefile examples/tutorial/Makefile examples/parallel/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"
     
    201200# Checking for libgdc
    202201AC_CHECK_HEADER(gdc.h,AC_DEFINE(HAVE_LIBGDC,1,[has gdc.h]))
     202
     203# Check for libwandio (no longer bundled with libtrace)
     204AC_CHECK_LIB(wandio,wandio_create,wandiofound=1,wandiofound=0)
     205if test "$wandiofound" = 0; then
     206        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 http://research.wand.net.nz/software/libwandio.php)
     207else
     208        LIBTRACE_LIBS="$LIBTRACE_LIBS -lwandio"
     209        TOOLS_LIBS="$TOOLS_LIBS -lwandio"
     210        AC_DEFINE([HAVE_LIBWANDIO],1,[compile with libwandio support])
     211fi
    203212
    204213# Check for libpcap
     
    449458
    450459if test "$have_pthread" = 1; then
    451         LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread"
    452460        AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
    453461fi
     
    551559        with_ncurses=no]
    552560)
    553                        
    554 AC_ARG_WITH([bzip2],
    555         AC_HELP_STRING([--with-bzip2], [build with support for bzip2 compressed files]))
    556 
    557 AS_IF([test "x$with_bzip2" != "xno"],
    558         [
    559         AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
    560         ], [have_bzip=no])
    561 
    562 AS_IF([test "x$have_bzip" = "xyes"], [
    563         if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
    564                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2"
    565         fi
    566         with_bzip2=yes
    567         AC_DEFINE(HAVE_LIBBZ2, 1, "Compiled with bzip2 support")],
    568        
    569         [AS_IF([test "x$with_bzip2" = "xyes"],
    570                 [AC_MSG_ERROR([bzip2 requested but not found])])
    571         AC_DEFINE(HAVE_LIBBZ2, 0, "Compiled with bzip2 support")
    572         with_bzip2=no]
    573 )
    574 
    575 AC_ARG_WITH([zlib],
    576         AC_HELP_STRING([--with-zlib], [build with support for zlib compressed files]))
    577 
    578 AS_IF([test "x$with_zlib" != "xno"],
    579         [
    580         AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
    581         ], [have_zlib=no])
    582 
    583 AS_IF([test "x$have_zlib" = "xyes"], [
    584         if test "$ac_cv_lib_z_deflate" != "none required"; then
    585                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz"
    586         fi
    587         AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
    588         with_zlib=yes],
    589 
    590        
    591         [AS_IF([test "x$with_zlib" = "xyes"],
    592                 [AC_MSG_ERROR([zlib requested but not found])])
    593         AC_DEFINE(HAVE_LIBZ, 0, "Compiled with zlib support")
    594         with_zlib=no]
    595 )
    596 
    597 AC_ARG_WITH([lzo],
    598         AC_HELP_STRING([--with-lzo], [build with support for writing lzo compressed files]))
    599 
    600 AS_IF([test "x$with_lzo" != "xno"],
    601         [
    602         AC_CHECK_LIB(lzo2, lzo1x_1_compress, have_lzo=yes, have_lzo=no)
    603         ], [have_lzo=no])
    604 
    605 AS_IF([test "x$have_lzo" = "xyes"], [
    606         if test "$ac_cv_lib_lzo2_lzo1x_1_compress" != "none required"; then
    607                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzo2"
    608         fi
    609         AC_DEFINE(HAVE_LIBLZO2, 1, "Compiled with lzo2 support")
    610         with_lzo=yes],
    611 
    612        
    613         [AS_IF([test "x$with_lzo" = "xyes"],
    614                 [AC_MSG_ERROR([lzo requested but not found])])
    615         AC_DEFINE(HAVE_LIBLZO2, 0, "Compiled with lzo2 support")
    616         with_lzo=no]
    617 )
    618 
    619 AC_ARG_WITH([lzma],
    620         AC_HELP_STRING([--with-lzma], [build with support for lzma compressed files]))
    621 
    622 AS_IF([test "x$with_lzma" != "xno"],
    623         [
    624         AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
    625         ], [have_lzma=no])
    626 
    627 AS_IF([test "x$have_lzma" = "xyes"], [
    628         if test "$ac_cv_lib_lzma_code" != "none required"; then
    629                 LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzma"
    630         fi
    631         AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support")
    632         with_lzma=yes],
    633 
    634        
    635         [AS_IF([test "x$with_lzma" = "xyes"],
    636                 [AC_MSG_ERROR([lzma requested but not found])])
    637         AC_DEFINE(HAVE_LIBLZMA, 0, "Compiled with lzma support")
    638         with_lzma=no]
    639 )
    640561
    641562# Define automake conditionals for use in our Makefile.am files
     
    649570AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
    650571AM_CONDITIONAL([HAVE_NCURSES], [test "x$with_ncurses" != "xno"])
    651 AM_CONDITIONAL([HAVE_BZLIB], [test "x$with_bzip2" != "xno"])
    652 AM_CONDITIONAL([HAVE_ZLIB], [test "x$with_zlib" != "xno"])
    653 AM_CONDITIONAL([HAVE_LZO], [ test "x$with_lzo" != "xno"])
    654 AM_CONDITIONAL([HAVE_LZMA], [ test "x$with_lzma" != "xno"])
    655572
    656573# Check for miscellaneous programs
     
    662579AC_SUBST([LIBTRACE_LIBS])
    663580AC_SUBST([LIBPKTDUMP_LIBS])
    664 AC_SUBST([LIBWANDIO_LIBS])
    665581AC_SUBST([TOOLS_LIBS])
    666582#AC_SUBST([ADD_LIBS])
     
    704620fi
    705621
    706 reportopt "Compiled with compressed trace (zlib) support" $with_zlib
    707 reportopt "Compiled with compressed trace (bz2) support" $with_bzip2
    708 reportopt "Compiled with compressed trace (lzo write only) support" $with_lzo
    709 reportopt "Compiled with compressed trace (lzma) support" $with_lzma
    710622if test x"$libtrace_dag" = xtrue; then
    711623        if test "$libtrace_dag_version" = 24; then
Note: See TracChangeset for help on using the changeset viewer.