From f2c6a4ab56f68b261c79c3bf56410e780657aa20 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Fri, 27 May 2005 05:24:20 +0000 Subject: [PATCH] Ack freeradius package configuration, Don't build with features that were not selected SVN-Revision: 1073 --- openwrt/package/Makefile | 12 +++- openwrt/package/freeradius/Makefile | 85 ++++++++++++++++++----------- 2 files changed, 63 insertions(+), 34 deletions(-) diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index f6cf6dec22..a26411ddb4 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -122,7 +122,6 @@ arpwatch-compile: libpcap-compile cyrus-sasl-compile: openssl-compile dropbear-compile: zlib-compile fprobe-compile: libpcap-compile -freeradius-compile: libtool-compile mysql-compile openldap-compile openssl-compile postgresql-compile kismet-compile: uclibc++-compile libpcap-compile ncurses-compile lcd4linux-compile: ncurses-compile libgd-compile: libpng-compile @@ -157,6 +156,17 @@ ifneq ($(BR2_PACKAGE_ASTERISK_MYSQL),) asterisk-compile: mysql-compile endif +freeradius-compile: libtool-compile openssl-compile +ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_LDAP),) +freeradius-compile: openldap-compile +endif +ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),) +freeradius-compile: mysql-compile +endif +ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),) +freeradius-compile: postgresql-compile +endif + openvpn-compile: openssl-compile ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) openvpn-compile: lzo-compile diff --git a/openwrt/package/freeradius/Makefile b/openwrt/package/freeradius/Makefile index 6da13253d7..f94f73e2b0 100644 --- a/openwrt/package/freeradius/Makefile +++ b/openwrt/package/freeradius/Makefile @@ -14,6 +14,57 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_CONFIGURE_OPTIONS := \ + --enable-shared \ + --disable-static \ + --disable-ltdl-install \ + --with-ltdl-include="$(STAGING_DIR)/usr/include" \ + --with-ltdl-lib="$(STAGING_DIR)/usr/lib" \ + --with-openssl-includes="$(STAGING_DIR)/usr/include" \ + --with-openssl-libraries="$(STAGING_DIR)/usr/lib" \ + --enable-strict-dependencies \ + --with-raddbdir=/etc/freeradius \ + --without-edir \ + --without-snmp \ + --without-rlm_attr-rewrite \ + --with-rlm_checkval \ + --without-rlm_counter \ + --without-rlm_dbm \ + --with-rlm_eap \ + --without-rlm_eap_sim \ + --with-rlm_files \ + --without-rlm_ippool \ + --without-rlm_krb5 \ + --without-rlm_pam \ + --without-rlm_radutmp \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_oracle \ + --without-rlm_sql_unixodbc \ + --without-rlm_unix \ + --without-rlm_x99-token \ + +ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_LDAP),) +PKG_CONFIGURE_OPTIONS += \ + --with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \ + --with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib" +else +PKG_CONFIGURE_OPTIONS += --without-rlm_ldap +endif +ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),) +PKG_CONFIGURE_OPTIONS += \ + --with-mysql-include-dir="$(STAGING_DIR)/usr/include/mysql" \ + --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" +else +PKG_CONFIGURE_OPTIONS += --without-rlm_sql_mysql +endif +ifneq ($(BR2_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" +else +PKG_CONFIGURE_OPTIONS += --without-rlm_sql_postgresql +endif + include $(TOPDIR)/package/rules.mk define PKG_mod_template @@ -97,39 +148,7 @@ $(PKG_BUILD_DIR)/.configured: --sysconfdir=/etc \ $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ - --enable-shared \ - --disable-static \ - --disable-ltdl-install \ - --with-ltdl-include="$(STAGING_DIR)/usr/include" \ - --with-ltdl-lib="$(STAGING_DIR)/usr/lib" \ - --with-openssl-includes="$(STAGING_DIR)/usr/include" \ - --with-openssl-libraries="$(STAGING_DIR)/usr/lib" \ - --enable-strict-dependencies \ - --with-raddbdir=/etc/freeradius \ - --without-edir \ - --without-snmp \ - --without-rlm_attr-rewrite \ - --with-rlm_checkval \ - --without-rlm_counter \ - --without-rlm_dbm \ - --with-rlm_eap \ - --without-rlm_eap_sim \ - --with-rlm_files \ - --without-rlm_ippool \ - --without-rlm_krb5 \ - --with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib" \ - --without-rlm_pam \ - --without-rlm_radutmp \ - --without-rlm_sql_iodbc \ - --with-mysql-include-dir="$(STAGING_DIR)/usr/include/mysql" \ - --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" \ - --without-rlm_sql_oracle \ - --with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib" \ - --without-rlm_sql_unixodbc \ - --without-rlm_unix \ - --without-rlm_x99-token \ + $(PKG_CONFIGURE_OPTIONS) \ ) touch $@ -- 2.25.1