From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 28 Mar 2007 17:05:00 +0000 (+0000)
Subject: fix freeradius SDK builds
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=da3badc1e4af74fb30d87b17e85296f0955ebd19;hp=1ab8a7dfbc11209cbb771ee2101f1fa62b7fa122;ds=sidebyside

fix freeradius SDK builds


SVN-Revision: 6743
---

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index bbb4132772..335127ef94 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -237,14 +237,7 @@ PKG_DICTIONARIES:= \
 	microsoft \
 	wispr \
 
-ifneq ($(SDK),)
-# Make sure the options below are enabled when building with the SDK
-  CONFIG_PACKAGE_freeradius-mod-ldap:=m
-  CONFIG_PACKAGE_freeradius-mod-sql-mysql:=m
-  CONFIG_PACKAGE_freeradius-mod-sql-pgsql:=m
-endif
-
-ifneq ($(CONFIG_PACKAGE_freeradius-mod-ldap),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-ldap),)
   PKG_CONFIGURE_LIBS+= -lcrypto -lssl
   PKG_CONFIGURE_OPTIONS+= \
 		--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
@@ -253,7 +246,7 @@ else
   PKG_CONFIGURE_OPTIONS+= --without-rlm_ldap
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeradius-mod-sql-mysql),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-mysql),)
   PKG_CONFIGURE_LIBS+= -lz
   PKG_CONFIGURE_OPTIONS+= \
 		--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
@@ -263,7 +256,7 @@ else
   PKG_CONFIGURE_OPTIONS+= --without-rlm_sql_mysql
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeradius-mod-sql-pgsql),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-pgsql),)
   PKG_CONFIGURE_OPTIONS+= \
 		--with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \
 		--with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib"
@@ -271,19 +264,19 @@ else
   PKG_CONFIGURE_OPTIONS+= --without-rlm_sql_postgresql
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeradius-mod-eap-tls),)
-  PKG_CONFIGURE_OPTIONS+= --with-rlm_eap_tls
+ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-peap),)
+  PKG_CONFIGURE_OPTIONS+= --with-rlm_eap_peap
 else
-  PKG_CONFIGURE_OPTIONS+= --without-rlm_eap_tls
+  PKG_CONFIGURE_OPTIONS+= --without-rlm_eap_peap
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeradius-mod-eap-peap),)
-  PKG_CONFIGURE_OPTIONS+= --with-rlm_eap_peap
+ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-tls),)
+  PKG_CONFIGURE_OPTIONS+= --with-rlm_eap_tls
 else
-  PKG_CONFIGURE_OPTIONS+= --without-rlm_eap_peap
+  PKG_CONFIGURE_OPTIONS+= --without-rlm_eap_tls
 endif
 
-ifneq ($(CONFIG_PACKAGE_freeradius-mod-eap-ttls),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-ttls),)
   PKG_CONFIGURE_OPTIONS+= --with-rlm_eap_ttls
 else
   PKG_CONFIGURE_OPTIONS+= --without-rlm_eap_ttls