expose WITH_DHCP to Make, and then don't build proto_dhcp

diff --git a/Make.inc.in b/Make.inc.in
index 7a77625..a69292e 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -108,6 +108,8 @@ bm_static_libs  = @USE_STATIC_LIBS@
 STATIC_MODULES = @STATIC_MODULES@
 LIBREADLINE    = @LIBREADLINE@
 
+WITH_DHCP      = @WITH_DHCP@
+
 #
 #  Version to use for packaging and other Make related things
 #

diff --git a/configure b/configure
index 05860f8..4fa37f7 100755 (executable)
--- a/configure
+++ b/configure
@@ -654,6 +654,7 @@ SNMPWALK
 SNMPGET
 PERL
 openssl_version_check_config
+WITH_DHCP
 modconfdir
 dictdir
 raddbdir
@@ -5304,6 +5305,7 @@ $as_echo "#define WITH_DHCP 1" >>confdefs.h
 
 fi
 
+
 STATIC_MODULES=
 
 # Check whether --with-static_modules was given.

diff --git a/configure.ac b/configure.ac
index 9ead51d..72f0425 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -430,6 +430,7 @@ AC_ARG_WITH(dhcp,
 if test "x$WITH_DHCP" = "xyes"; then
   AC_DEFINE(WITH_DHCP, [1], [define if you want DHCP support])
 fi
+AC_SUBST(WITH_DHCP)
 
 dnl #
 dnl #  Allow the user to specify a list of modules to be linked

diff --git a/src/modules/proto_dhcp/all.mk b/src/modules/proto_dhcp/all.mk
index d098a8a..12242b6 100644 (file)
--- a/src/modules/proto_dhcp/all.mk
+++ b/src/modules/proto_dhcp/all.mk
@@ -1 +1,3 @@
+ifneq "$(WITH_DHCP)" "no"
 SUBMAKEFILES := libfreeradius-dhcp.mk proto_dhcp.mk rlm_dhcp.mk dhcpclient.mk
+endif