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])])
#
# Specify runtime directory
-AC_ARG_ENABLE([plugin-dir],
+AC_ARG_WITH([plugin-dir],
AC_HELP_STRING([--with-plugin-dir=DIR], [Specify the plugin directory for pppd]))
AS_IF([test -n "$with_plugin_dir"],
[PPPD_PLUGIN_DIR="$with_plugin_dir"],
#
# Specify runtime directory
-AC_ARG_ENABLE([runtime-dir],
+AC_ARG_WITH([runtime-dir],
AC_HELP_STRING([--with-runtime-dir=DIR], [Specify the runtime directory for pppd]))
AS_IF([test -n "$with_runtime_dir"],
[PPPD_RUNTIME_DIR="$with_runtime_dir"],
#
# Specify runtime directory
-AC_ARG_ENABLE([logfile-dir],
+AC_ARG_WITH([logfile-dir],
AC_HELP_STRING([--with-logfile-dir=DIR], [Specify the log directory for pppd]))
AS_IF([test -n "$with_logfile_dir"],
[PPPD_LOGFILE_DIR="$with_logfile_dir"],
[AC_MSG_ERROR([OpenSSL not found, and if this is your intention then run configure --disable-eaptls])])
])
-AM_CONDITIONAL([OPENSSL_HAVE_MD4], test "x${ac_cv_openssl_md4}" != "xno")
+AM_CONDITIONAL([OPENSSL_HAVE_MD4], test "x${ac_cv_openssl_md4}" = "xyes")
AM_COND_IF([OPENSSL_HAVE_MD4],,
AC_DEFINE([USE_MD4], 1, [Use included md4 included with pppd]))
-AM_CONDITIONAL([OPENSSL_HAVE_MD5], test "x${ac_cv_openssl_md5}" != "xno")
+AM_CONDITIONAL([OPENSSL_HAVE_MD5], test "x${ac_cv_openssl_md5}" = "xyes")
AM_COND_IF([OPENSSL_HAVE_MD5],,
AC_DEFINE([USE_MD5], 1, [Use included md5 included with pppd]))
-AM_CONDITIONAL([OPENSSL_HAVE_SHA], test "x${ac_cv_openssl_sha}" != "xno")
+AM_CONDITIONAL([OPENSSL_HAVE_SHA], test "x${ac_cv_openssl_sha}" = "xyes")
AM_COND_IF([OPENSSL_HAVE_SHA],,
AC_DEFINE([USE_SHA], 1, [Use included sha included with pppd]))
-AM_CONDITIONAL([OPENSSL_HAVE_DES], test "x${ac_cv_openssl_des}" != "xno")
+AM_CONDITIONAL([OPENSSL_HAVE_DES], test "x${ac_cv_openssl_des}" = "xyes")
AM_COND_IF([OPENSSL_HAVE_DES],,
AC_DEFINE([USE_CRYPT], 1, [Use included des included with pppd]))
#
# 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
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