Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug #432 Attempt to use local libopts to fix Travis CI #433

Merged
merged 14 commits into from
Jan 18, 2018
Merged

Bug #432 Attempt to use local libopts to fix Travis CI #433

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e400045
Bug #432 Attempt to use local libopts to fix Travis CI
fklassen Jan 7, 2018
027b2ba
Bug #432 upgrade to libopts 41.1.16
fklassen Jan 17, 2018
e371cdc
Bug #432 fix travis ci build
fklassen Jan 17, 2018
18a82c8
Bug #432 add missing verify.h
fklassen Jan 17, 2018
85f24fe
Bug #432 add autogen to linux travis builds
fklassen Jan 17, 2018
f56b9e6
Bug #432 fix travis syntax
fklassen Jan 17, 2018
a4c1adf
Bug #432 fix libopt errors detected by Codacy
fklassen Jan 17, 2018
00a7b91
Bug #432 revert to to libopts 41.0.16
fklassen Jan 17, 2018
b986f00
Bug #432 restore travis configure options
fklassen Jan 17, 2018
feb0048
fix warnings on newer OS X SDKs
fklassen Jan 17, 2018
e235dcb
Merge branch 'Bug_#432_CI_failures' of github.com:appneta/tcpreplay i…
fklassen Jan 17, 2018
6310330
Bug #432 more reverts
fklassen Jan 17, 2018
cef8554
PV-3708 fix typo in configure.ac
fklassen Jan 18, 2018
6c0958b
PV-3708 remove macOS Travis build - not available anymore
fklassen Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PV-3708 fix typo in configure.ac
  • Loading branch information
@fklassen
fklassen committed Jan 18, 2018
commit cef85546181aa5cf7af854dfc12d863c303075f0
9 changes: 7 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dnl $Id$
AC_PREREQ([2.69])

dnl Set version info here!
AC_INIT([tcpreplay],[4.2.6],
AC_INIT([tcpreplay],[4.3.0-beta1],
[https://github.com/appneta/tcpreplay/issues],
[tcpreplay],
[http://tcpreplay.sourceforge.net/])
Expand Down Expand Up @@ -876,6 +876,9 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
* returns zero if version >= 0.9.6
* or one otherwise
*/
if (strncmp(pcap_lib_version(), PCAP_TEST, 3) >= 0)
exit(0);

if (strncmp(pcap_lib_version(), PCAP_TEST, 5) >= 0) {
printf("%s ", pcap_lib_version());
exit(0);
Expand Down Expand Up @@ -927,6 +930,8 @@ extern const char pcap_version[[]]; /* double up since autoconf escapes things *
* returns zero if version >= 0.7.2
* or one otherwise
*/
if (strncmp(pcap_lib_version(), PCAP_TEST, 3) >= 0)
exit(0);

if (strncmp(pcap_version, PCAP_TEST, 5) >= 0)
exit(0);
Expand Down Expand Up @@ -1726,7 +1731,7 @@ AM_CONDITIONAL([ENABLE_TCPDUMP], test "$tcpdump_path" != "no" -a x$have_pcap_dum
if test x$tcpdump_path != xno -a x$have_pcap_dump_fopen = xyes ; then
AC_DEFINE([ENABLE_VERBOSE], [1], [Do we have tcpdump and pcap_dump_fopen()?])
else
AC_MSG_WARN([Your version of libpcap is too old for --verbose support])
AC_MSG_WARN([Your version of libpcap does not support --verbose])
fi

dnl No 'make test' when cross compile
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.