Changeset 4b0cd2f for configure.in


Ignore:
Timestamp:
06/30/14 13:20:00 (6 years ago)
Author:
Shane Alcock <salcock@…>
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:
d19ff50
Parents:
3a3b661
Message:

Integrate lzma into libwandio properly

Update configure to detect lzma properly.
Add missing get_compression_type API function to wandio code.
Add code to detect if input file is LZMA.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    rabf01b6 r4b0cd2f  
    580580)
    581581
     582AC_ARG_WITH([lzma],
     583        AC_HELP_STRING([--with-lzma], [build with support for lzma compressed files]))
     584
     585AS_IF([test "x$with_lzma" != "xno"],
     586        [
     587        AC_CHECK_LIB(lzma, lzma_code, have_lzma=yes, have_lzma=no)
     588        ], [have_lzma=no])
     589
     590AS_IF([test "x$have_lzma" = "xyes"], [
     591        if test "$ac_cv_lib_lzma_code" != "none required"; then
     592                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzma"
     593        fi
     594        AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support")
     595        with_lzma=yes],
     596
     597       
     598        [AS_IF([test "x$with_lzma" = "xyes"],
     599                [AC_MSG_ERROR([lzma requested but not found])])
     600        AC_DEFINE(HAVE_LIBLZMA, 0, "Compiled with lzma support")
     601        with_lzma=no]
     602)
    582603
    583604# Define automake conditionals for use in our Makefile.am files
     
    594615AM_CONDITIONAL([HAVE_ZLIB], [test "x$with_zlib" != "xno"])
    595616AM_CONDITIONAL([HAVE_LZO], [ test "x$with_lzo" != "xno"])
     617AM_CONDITIONAL([HAVE_LZMA], [ test "x$with_lzma" != "xno"])
    596618
    597619# Check for miscellaneous programs
     
    648670reportopt "Compiled with compressed trace (bz2) support" $with_bzip2
    649671reportopt "Compiled with compressed trace (lzo write only) support" $with_lzo
     672reportopt "Compiled with compressed trace (lzma) support" $with_lzma
    650673if test x"$libtrace_dag" = xtrue; then
    651674        if test "$libtrace_dag_version" = 24; then
Note: See TracChangeset for help on using the changeset viewer.