From: Denis Ovsienko <infrastation@yandex.ru>
Date: Wed, 26 Feb 2014 14:16:53 +0000 (+0400)
Subject: revert the latest change
X-Git-Tag: tcpdump-4.6.0~210
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/b48bf6ced37c7bd8e22cb0b66cc5ee9415e6cb54

revert the latest change

./configure fails during the "BUILD_LIBPCAP=true BUILD_IPV6=true"
scenarios (both GCC and Clang):

Makefile:8411: warning: overriding commands for target `configure'
Makefile:455: warning: ignoring old commands for target `configure'
Makefile:8416: warning: overriding commands for target `stamp-h.in'
Makefile:460: warning: ignoring old commands for target `stamp-h.in'
Makefile:8421: warning: overriding commands for target `stamp-h'
Makefile:465: warning: ignoring old commands for target `stamp-h'
Makefile:8424: warning: overriding commands for target `Makefile'
Makefile:468: warning: ignoring old commands for target `Makefile'
Makefile:8427: warning: overriding commands for target `config.status'
Makefile:471: warning: ignoring old commands for target `config.status'
[...]
./config.status: line 1103: syntax error near unexpected token `done'
./config.status: line 1103: `done # for ac_tag'

I don't have the expertise to resolve it well right now, keep Travis CI
working meanwihle.
---

diff --git a/.travis.yml b/.travis.yml
index aee270c8..888b20a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ before_script:
   - if [ "$BUILD_LIBPCAP" = "true" ]; then ( cd ../ && git clone git://github.com/the-tcpdump-group/libpcap.git && cd libpcap && ./configure && make ); else sudo apt-get install libpcap-dev; fi
 
 script:
-  - touch .devel
   - if [ "$BUILD_IPV6" = "true" ]; then ./configure; else ./configure --disable-ipv6; fi
   - make
   - if [ "$BUILD_IPV6" = "true" ]; then make check; else true; fi