From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 29 Jan 2012 11:14:51 +0000 (+0100)
Subject: Enable DHCP by default
X-Git-Tag: release_3_0_0_beta0~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4175e278958a4f4d22066f92a1733e8aaa2539f4;p=thirdparty%2Ffreeradius-server.git

Enable DHCP by default
---

diff --git a/configure b/configure
index a08792b8eaf..022ad9db79b 100755
--- a/configure
+++ b/configure
@@ -1489,7 +1489,7 @@ Optional Packages:
   --with-ascend-binary    Include support for Ascend binary filter attributes (default=yes)
   --with-threads          Use threads, if available.  (default=yes)
   --with-vmps             Compile in VMPS support. (default=yes)
-  --with-dhcp             Compile in DHCP support. (default=no)
+  --with-dhcp             Compile in DHCP support. (default=yes)
   --with-static-modules=QUOTED-MODULE-LIST
  --with-modules=QUOTED-MODULE-LIST
   --with-experimental-modules      Use experimental and unstable modules. (default=no)
@@ -20303,25 +20303,31 @@ _ACEOF
 
 fi
 
+WITH_DHCP=yes
 
 # Check whether --with-dhcp was given.
 if test "${with_dhcp+set}" = set; then
   withval=$with_dhcp;  case "$withval" in
     yes)
+        ;;
+    *)
+	WITH_DHCP=no
+  esac
+
+fi
+
+if test "x$WITH_DHCP" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define WITH_DHCP 1
 _ACEOF
 
-	;;
-    *)
-	;;
-  esac
-
 fi
 
 
 
+
+
 STATIC_MODULES=
 
 # Check whether --with-static_modules was given.
diff --git a/configure.in b/configure.in
index 0a92e9bb7c2..eace2ee7899 100644
--- a/configure.in
+++ b/configure.in
@@ -259,16 +259,19 @@ if test "x$WITH_VMPS" = "xyes"; then
 fi
 
 dnl extra argument: --with-dhcp
+WITH_DHCP=yes
 AC_ARG_WITH(dhcp,
-[  --with-dhcp             Compile in DHCP support. (default=no)],
+[  --with-dhcp             Compile in DHCP support. (default=yes)],
 [ case "$withval" in
     yes)
-        AC_DEFINE(WITH_DHCP, [1], [Include experimental support for DHCP])
-	;;
+        ;;
     *)
-	;;
+	WITH_DHCP=no
   esac ]
 )
+if test "x$WITH_DHCP" = "xyes"; then
+	AC_DEFINE(WITH_DHCP, [1], [define if you want DHCP support])
+fi
 
 
 dnl #
diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index e0fcb81d6a9..ba396b086b0 100644
--- a/src/main/radiusd.mk
+++ b/src/main/radiusd.mk
@@ -1,6 +1,6 @@
 SOURCES := acct.c auth.c client.c conffile.c crypt.c exec.c files.c \
 		  listen.c log.c mainconfig.c modules.c modcall.c \
-		  radiusd.c stats.c soh.c connection.c \
+		  radiusd.c stats.c soh.c connection.c dhcpd.c \
 		  session.c threads.c util.c valuepair.c version.c  \
 		  xlat.c process.c realms.c evaluate.c vmps.c detail.c
 ifneq ($(OPENSSL_LIBS),)