Changeset 4631115 for configure.in


Ignore:
Timestamp:
02/13/15 13:23:34 (7 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:
de74f88
Parents:
0b01fea (diff), 92d5f15 (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 branch 'master' into develop.

Update to include fixes/features etc from the 3.0.22 release.

Conflicts:

README
lib/format_dag25.c
lib/format_dpdk.c
lib/format_linux.c
lib/trace.c
test/Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    rd7fd648 r4631115  
    44# and in the README
    55
    6 AC_INIT([libtrace],[3.0.21],[contact@wand.net.nz],[libtrace])
     6AC_INIT([libtrace],[3.0.22],[contact@wand.net.nz],[libtrace])
    77
    88LIBTRACE_MAJOR=3
    99LIBTRACE_MID=0
    10 LIBTRACE_MINOR=21
     10LIBTRACE_MINOR=22
    1111
    1212# OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not
     
    430430if test "$ac_cv_search_dlopen" != "none required"; then
    431431        LIBPKTDUMP_LIBS="$LIBPKTDUMP_LIBS $ac_cv_search_dlopen"
     432        if test "$dpdk_found" = 1; then
     433                LIBTRACE_LIBS="$LIBTRACE_LIBS -Wl,$ac_cv_search_dlopen"
     434        fi
    432435fi
    433436
Note: See TracChangeset for help on using the changeset viewer.