diff options
author | Toni Uhlig <matzeton@googlemail.com> | 2017-12-20 18:59:13 +0100 |
---|---|---|
committer | Toni Uhlig <matzeton@googlemail.com> | 2017-12-20 18:59:13 +0100 |
commit | d6a2338179619b8edf24770e3871072ac87fa174 (patch) | |
tree | 09a943c917600b4963b7774788b4d08b8f5af680 | |
parent | 3541aa3bf2e9090e2778e80a8dc20955bbb7654f (diff) |
ptunnel-ng:
* pcap for Windows is optional (but recommended)
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -37,6 +37,8 @@ If you want pcap support you will need the WinPcap library as well. WinPcap is available here: <http://www.winpcap.org/install/bin/WpdPack_4_0_2.zip> +REMEMBER: ptunnel-ng might not work on Windows without WinPcap! + Running ------- diff --git a/configure.ac b/configure.ac index 4533baf..54285fc 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,8 @@ case ${selinux_enabled} in esac dnl Check libcap headers/functions. -if test x"${pcap_enabled}" != x; then +if test x"${pcap_enabled}" != x -a \ + x"${use_msw}" != xyes; then AC_CHECK_HEADERS([pcap.h],, [pcap_enabled=]) AC_SEARCH_LIBS([pcap_lookupnet], [pcap],, diff --git a/src/Makefile.am b/src/Makefile.am index 6ded388..6d37a49 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ ptunnel_ng_SOURCES = \ if IS_WINDOWS wpcap_DEF = $(abs_srcdir)/win32/WPCAP.DEF wpcap_IMP = $(abs_srcdir)/win32/libwpcap_implib.a -ptunnel_ng_CFLAGS += -I$(abs_srcdir)/win32/includes -DHAVE_PCAP=1 +ptunnel_ng_CFLAGS += -I$(abs_srcdir)/win32/includes ptunnel_ng_LDADD += $(wpcap_IMP) ptunnel_ng_SOURCES += $(wpcap_DEF) |