fix freeradius SDK builds

[openwrt/svn-archive/archive.git] / net / freeradius / Makefile

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index cf7b537ad5aa8c41e61acf1a486343fde23bfba7..335127ef94951074b25b5f0077a36b04eef727aa 100644 (file)
--- 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,15 +264,21 @@ else
   PKG_CONFIGURE_OPTIONS+= --without-rlm_sql_postgresql
 endif
 
-ifeq ($(CONFIG_PACKAGE_freeradius-mod-eap-tls),)
-  PKG_CONFIGURE_OPTIONS+= --without-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_peap
 endif
 
-ifeq ($(CONFIG_PACKAGE_freeradius-mod-eap-peap),)
-  PKG_CONFIGURE_OPTIONS+= --without-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_tls
 endif
 
-ifeq ($(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
 endif
 
@@ -314,7 +313,7 @@ define Package/freeradius/install
                $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$$$${f} $(1)/usr/share/freeradius/ ; \
        done
        $(INSTALL_DIR) $(1)/usr/lib/freeradius
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so $(1)/usr/lib/freeradius/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d