bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add missing dependency on freeradius to freeradius-mod-radutmp, tweak makefile

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@12360 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2008-08-21 01:03:30 +00:00
parent 6ff49d8b83
commit dfd2a7d58f
1 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
net/freeradius/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -195,6 +195,7 @@ endef
define Package/freeradius-mod-radutmp define Package/freeradius-mod-radutmp
$(call Package/freeradius/Default) $(call Package/freeradius/Default)
DEPENDS:=freeradius
TITLE:=Radius UTMP module TITLE:=Radius UTMP module
endef endef
@ -204,7 +205,9 @@ define Package/freeradius-utils
TITLE:=Misc. client utilities TITLE:=Misc. client utilities
endef endef
PKG_CONFIGURE_ARGS:= \ CONFIGURE_ARGS+= \
--libdir=/usr/lib/freeradius \
--libexecdir=/usr/lib/freeradius \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
--disable-developer \ --disable-developer \
@ -250,76 +253,69 @@ PKG_DICTIONARIES:= \
wispr \ wispr \
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-ldap),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-ldap),)
PKG_CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \ --with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
--with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib" --with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
PKG_CONFIGURE_LIBS+= -lcrypto -lssl CONFIGURE_LIBS+= -lcrypto -lssl
else else
PKG_CONFIGURE_ARGS+= --without-rlm_ldap CONFIGURE_ARGS+= --without-rlm_ldap
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-mysql),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-mysql),)
PKG_CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \ --with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
--with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" \ --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" \
--without-threads --without-threads
PKG_CONFIGURE_LIBS+= -lz CONFIGURE_LIBS+= -lz
else else
PKG_CONFIGURE_ARGS+= --without-rlm_sql_mysql CONFIGURE_ARGS+= --without-rlm_sql_mysql
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-pgsql),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-sql-pgsql),)
PKG_CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \ --with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \
--with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib" --with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib"
else else
PKG_CONFIGURE_ARGS+= --without-rlm_sql_postgresql CONFIGURE_ARGS+= --without-rlm_sql_postgresql
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-peap),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-peap),)
PKG_CONFIGURE_ARGS+= --with-rlm_eap_peap CONFIGURE_ARGS+= --with-rlm_eap_peap
PKG_CONFIGURE_LIBS+= -lcrypto -lssl CONFIGURE_LIBS+= -lcrypto -lssl
else else
PKG_CONFIGURE_ARGS+= --without-rlm_eap_peap CONFIGURE_ARGS+= --without-rlm_eap_peap
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-tls),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-tls),)
PKG_CONFIGURE_ARGS+= --with-rlm_eap_tls CONFIGURE_ARGS+= --with-rlm_eap_tls
PKG_CONFIGURE_LIBS+= -lcrypto -lssl CONFIGURE_LIBS+= -lcrypto -lssl
else else
PKG_CONFIGURE_ARGS+= --without-rlm_eap_tls CONFIGURE_ARGS+= --without-rlm_eap_tls
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-ttls),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-eap-ttls),)
PKG_CONFIGURE_ARGS+= --with-rlm_eap_ttls CONFIGURE_ARGS+= --with-rlm_eap_ttls
PKG_CONFIGURE_LIBS+= -lcrypto -lssl CONFIGURE_LIBS+= -lcrypto -lssl
else else
PKG_CONFIGURE_ARGS+= --without-rlm_eap_ttls CONFIGURE_ARGS+= --without-rlm_eap_ttls
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-attr-rewrite),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-attr-rewrite),)
PKG_CONFIGURE_ARGS+= --with-rlm_attr-rewrite CONFIGURE_ARGS+= --with-rlm_attr-rewrite
else else
PKG_CONFIGURE_ARGS+= --without-rlm_attr-rewrite CONFIGURE_ARGS+= --without-rlm_attr-rewrite
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-radutmp),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius-mod-radutmp),)
PKG_CONFIGURE_ARGS+= --with-rlm_radutmp CONFIGURE_ARGS+= --with-rlm_radutmp
else else
PKG_CONFIGURE_ARGS+= --without-rlm_radutmp CONFIGURE_ARGS+= --without-rlm_radutmp
endif endif
define Build/Configure CONFIGURE_VARS+= \
$(call Build/Configure/Default, \
--libdir=/usr/lib/freeradius \
--libexecdir=/usr/lib/freeradius \
$(PKG_CONFIGURE_ARGS) \
, \
LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \ LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \
LIBS="$(PKG_CONFIGURE_LIBS)" \ LIBS="$(CONFIGURE_LIBS)" \
MYSQL_CONFIG="no" \ MYSQL_CONFIG="no" \
)
endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \