X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=configure.ac;h=6996955e3ff1848abc5fc2a9d83adcd5a8e356bf;hb=c95c6162dd3b5774ee680f9c7df60db217cae161;hp=3e01cf24324ab9c3645e479dfadd290c82138614;hpb=898d3f4b437ca1348abc1bbd036b0106c66a7ba6;p=ppp.git diff --git a/configure.ac b/configure.ac index 3e01cf2..6996955 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,7 @@ AM_COND_IF([PPP_WITH_CBCP], AC_ARG_ENABLE([maxoctets], AS_HELP_STRING([--disable-maxoctets], [Disable support for limiting session by maximum octets])) AS_IF([test "x$enable_maxoctets" != "xno"], - AC_DEFINE([MAXOCTETS], 1, ["Limit sessions by maximum number of octets"])) + AC_DEFINE([PPP_WITH_MAXOCTETS], 1, [Limit sessions by maximum number of octets])) # # Disable Microsoft extensions will remove CHAP and MPPE support @@ -178,8 +178,8 @@ AM_CONDITIONAL(PPP_WITH_PLUGINS, test "${enable_plugins}" != "no") AC_ARG_ENABLE([eaptls], AS_HELP_STRING([--disable-eaptls], [Disable EAP-TLS authentication support])) AS_IF([test "x$enable_eaptls" != "xno"], - AC_DEFINE([USE_EAPTLS], 1, ["Have EAP-TLS authentication support"])) -AM_CONDITIONAL(WITH_EAPTLS, test "x${enable_eaptls}" != "xno") + AC_DEFINE([PPP_WITH_EAPTLS], 1, [Have EAP-TLS authentication support])) +AM_CONDITIONAL(PPP_WITH_EAPTLS, test "x${enable_eaptls}" != "xno") # # Disable PEAP support @@ -284,9 +284,9 @@ 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"])], [ +AM_CONDITIONAL([PPP_WITH_FILTER], [ test "x${with_pcap}" = "xyes" && test "x${build_sunos}" != "xyes" ]) +AM_COND_IF([PPP_WITH_FILTER], [ + AC_DEFINE([PPP_WITH_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"