diff options
| author | Eivind Næss <eivnaes@yahoo.com> | 2021-07-20 01:18:23 -0700 |
|---|---|---|
| committer | Eivind Næss <eivnaes@yahoo.com> | 2021-07-20 08:25:53 -0700 |
| commit | 9d5da9abed2b47cbd2ce4ab428ebf9f2e4fd2993 (patch) | |
| tree | db0135b2cbcd555438613d4a9992546e01221619 | |
| parent | af9eafe584f98986a20bc33c8535a044bbdbb12b (diff) | |
| download | ppp-9d5da9abed2b47cbd2ce4ab428ebf9f2e4fd2993.tar.gz | |
Fixing up libpcap configure option on SunOS
Re-introducing the Automake WITH_FILTER to separate the detection
of libpcap. SunOS has a viable libpcap, but does not support the
filter feature.
Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | m4/ax_check_pcap.m4 | 2 | ||||
| -rw-r--r-- | pppd/Makefile.am | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 649a357..68ba12a 100644 --- a/configure.ac +++ b/configure.ac @@ -282,10 +282,18 @@ AM_CONDITIONAL(WITH_PAM, test "x${with_pam}" = "xyes") # # With libpcap support, activate pppd on network activity -AX_CHECK_PCAP( - [AC_DEFINE([PPP_FILTER], 1, ["Have packet activity filter support"])]) -# AS_IF([test "x${build_sunos}" = "xyes" && test "x${with_pcap}" != "xno"], -# [AC_MSG_ERROR([Filter is not supported on SunOS])]) +AX_CHECK_PCAP + +# +# SunOS provides a version of libpcap that would work, but SunOS has no support for activity filter +AM_CONDITIONAL([WITH_FILTER], [ test "x${with_pcap}" = "xyes" && test "x${build_sunos}" != "xyes" ]) +AM_COND_IF([WITH_FILTER], [ + AC_DEFINE([PPP_FILTER], 1, ["Have packet activity filter support"])], [ + AS_IF([test "x${build_sunos}" = "xyes"], [ + AC_MSG_WARN([Packet activity filter not supported on SunOS]) + with_pcap="no" + ]) + ]) # # Some contributions require GTK/GLIB @@ -320,7 +328,8 @@ AC_OUTPUT AS_IF([test "x${build_sunos}" = "xyes" ], [[ - echo "Setting up SunOS kernel module(s)" + echo " +Setting up SunOS kernel module(s)" mkmkf() { rm -f $2 if [ -f $1 ]; then diff --git a/m4/ax_check_pcap.m4 b/m4/ax_check_pcap.m4 index 155f6df..6d70ec1 100644 --- a/m4/ax_check_pcap.m4 +++ b/m4/ax_check_pcap.m4 @@ -41,7 +41,7 @@ AC_DEFUN([AX_CHECK_PCAP], [ esac ]) - if [ test "${with_pcap}" != "no" ] ; then + if [ test "x${with_pcap}" != "xno" ] ; then PCAP_LIBS="-lpcap" for pcapdir in $pcapdirs; do AC_MSG_CHECKING([for pcap.h in $pcapdir]) diff --git a/pppd/Makefile.am b/pppd/Makefile.am index 1766f05..3a0ddfa 100644 --- a/pppd/Makefile.am +++ b/pppd/Makefile.am @@ -92,7 +92,7 @@ if WITH_MPPE pppd_SOURCES += mppe.c endif -if WITH_PCAP +if WITH_FILTER pppd_CPPFLAGS += $(PCAP_CFLAGS) pppd_LDFLAGS += $(PCAP_LDFLAGS) pppd_LIBS += $(PCAP_LIBS) |