summaryrefslogtreecommitdiff
path: root/package/heimdal
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:32:55 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:32:55 +0100
commit3d45df344602687c8983f5fb609721aa8ca2469f (patch)
treebd089044e1402b116cf6447eda74e81b7f65d129 /package/heimdal
parent897be7157eb98898fdc62224857025d4a0f01dd5 (diff)
rework PKG_FLAVOURS. Subpackages can have flavours, so
always add PKG_NAME to PKG_FLAVOURS variable. ala PKG_FLAVOURS_LIBNCURSES. Bug reported by Phil Sutter.
Diffstat (limited to 'package/heimdal')
-rw-r--r--package/heimdal/Makefile28
1 files changed, 12 insertions, 16 deletions
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 4d7ecafa5..9568237e0 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -21,16 +21,16 @@ PKGSC_LIBHEIMDAL:= libs
PKGSD_LIBHEIMDAL_CLIENT:= Kerberos 5 client libraries
PKGSC_LIBHEIMDAL_CLIENT:= libs
-PKG_FLAVOURS:= PKINIT
-PKGFD_PKINIT:= Enable PK-INIT
+PKG_FLAVOURS_HEIMDAL_SERVER:= WITH_PKINIT
+PKGFD_WITH_PKINIT: Enable PK-INIT
-PKG_CHOICES:= WITH_LDAP WITH_BDB
-PKGCD_WITH_LDAP:= use OpenLDAP as database backend
-PKGCS_WITH_LDAP:= libopenldap
-PKGCB_WITH_LDAP:= openldap
-PKGCD_WITH_BDB:= use Berkeley DB as database backend
-PKGCS_WITH_BDB:= libdb
-PKGCB_WITH_BDB:= libdb
+PKG_CHOICES_HEIMDAL_SERVER:= WITH_LDAP WITH_BDB
+PKGCD_WITH_LDAP:= use OpenLDAP as database backend
+PKGCS_WITH_LDAP:= libopenldap
+PKGCB_WITH_LDAP:= openldap
+PKGCD_WITH_BDB:= use Berkeley DB as database backend
+PKGCS_WITH_BDB:= libdb
+PKGCB_WITH_BDB:= libdb
include $(TOPDIR)/mk/package.mk
@@ -48,13 +48,13 @@ CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \
--with-ipv6 \
--sysconfdir=/etc/heimdal
-ifeq ($(ADK_COMPILE_HEIMDAL_WITH_BDB),y)
+ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_BDB),y)
CONFIGURE_ARGS+= --with-berkeley-db
else
CONFIGURE_ARGS+= --without-berkeley-db
endif
-ifeq ($(ADK_COMPILE_HEIMDAL_WITH_LDAP),y)
+ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_LDAP),y)
CONFIGURE_ARGS+= --with-openldap=yes
CONFIGURE_ARGS+= --with-openldap-include=${STAGING_TARGET_DIR}/usr
CONFIGURE_ARGS+= --with-openldap-lib=${STAGING_TARGET_DIR}/usr
@@ -62,7 +62,7 @@ else
CONFIGURE_ARGS+= --without-openldap
endif
-ifeq ($(ADK_PACKAGE_HEIMDAL_PKINIT),y)
+ifeq ($(ADK_PACKAGE_HEIMDAL_SERVER_WITH_PKINIT),y)
CONFIGURE_OPTS+= --enable-pk-init
else
CONFIGURE_OPTS+= --disable-pk-init \
@@ -75,10 +75,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin
CONFIGURE_ENV+= cross_compiling=yes \
ac_cv_func_getaddrinfo_numserv=yes
-ifeq ($(ADK_HOST_CYGWIN),y)
-EXEEXT:= .exe
-endif
-
post-extract:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
./configure --prefix=$(STAGING_HOST_DIR) \