Added new ./configure flags:

  --disable-def-auth      Disable deferred authentication
  --disable-pf            Disable internal packet filter


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@4852 e7ae566f-a301-0410-adde-c780ea21d3b5

3 files changed, 23 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index c6d19f9..ae40458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,18 @@ AC_ARG_ENABLE(iproute2,
    test $enableval = "yes" && AC_DEFINE(CONFIG_FEATURE_IPROUTE, 1, [enable iproute2 support])   
 )
 
+AC_ARG_ENABLE(def-auth,
+   [  --disable-def-auth      Disable deferred authentication],
+   [DEF_AUTH="$enableval"],
+   [DEF_AUTH="yes"]
+)
+
+AC_ARG_ENABLE(pf,
+   [  --disable-pf            Disable internal packet filter],
+   [PF="$enableval"],
+   [PF="yes"]
+)
+
 AC_ARG_ENABLE(strict,
    [  --enable-strict         Enable strict compiler warnings (debugging option)],
    [STRICT="$enableval"],
@@ -816,6 +828,16 @@ if test "$PORT_SHARE" = "yes"; then
    AC_DEFINE(ENABLE_PORT_SHARE, 1, [Enable TCP Server port sharing])
 fi
 
+dnl enable deferred auth
+if test "$DEF_AUTH" = "yes"; then
+   AC_DEFINE(CONFIGURE_DEF_AUTH, 1, [Enable deferred authentication])
+fi
+
+dnl enable internal packet filter
+if test "$PF" = "yes"; then
+   AC_DEFINE(CONFIGURE_PF, 1, [Enable internal packet filter])
+fi
+
 dnl enable strict compiler warnings
 if test "$STRICT" = "yes"; then
    CFLAGS="$CFLAGS -Wall -Wno-unused-parameter -Wno-unused-function"
diff --git a/syshead.h b/syshead.h
index 6d9d5f8..b6f3c4e 100644
--- a/syshead.h
+++ b/syshead.h
@@ -494,7 +494,6 @@ socket_defined (const socket_descriptor_t sd)
 /*
  * Enable deferred authentication?
  */
-#define CONFIGURE_DEF_AUTH /* this should be set by autoconf and config.h */
 #if defined(CONFIGURE_DEF_AUTH) && P2MP_SERVER && defined(ENABLE_PLUGIN)
 #define PLUGIN_DEF_AUTH
 #endif
@@ -508,7 +507,6 @@ socket_defined (const socket_descriptor_t sd)
 /*
  * Enable packet filter?
  */
-#define CONFIGURE_PF /* this should be set by autoconf and config.h */
 #if defined(CONFIGURE_PF) && P2MP_SERVER && defined(ENABLE_PLUGIN) && defined(HAVE_STAT)
 #define PLUGIN_PF
 #endif
diff --git a/version.m4 b/version.m4
index dde430d..61cdcbb 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1_rc19a])
+define(PRODUCT_VERSION,[2.1_rc19b])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])