X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=configure.ac;h=8dc3ca1fa33364fa9ddd8467ca5c0d80e258a51f;hb=49e1aff19a7ba4376b2a8387f11ff92382cef34f;hp=649a357f806bfb25de6199aa26c441564d28c857;hpb=2883dd07101bf851e2ea368f0c04c91aea85cff2;p=ppp.git diff --git a/configure.ac b/configure.ac index 649a357..8dc3ca1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) AC_INIT([ppp], - [2.4.10], + [2.4.10-dev], [https://github.com/ppp-project/ppp]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -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