summaryrefslogtreecommitdiff
path: root/source4/heimdal_build/config.mk
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-11 03:52:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:04 -0500
commit8c018ff786952424a2f1c612046eb91d2e42f648 (patch)
tree2a764027c508d596aad32343cdac8c5d42d956d5 /source4/heimdal_build/config.mk
parent2271bb4475603fcba8421cc2d33847956c5d4a6b (diff)
downloadsamba-8c018ff786952424a2f1c612046eb91d2e42f648.tar.gz
samba-8c018ff786952424a2f1c612046eb91d2e42f648.tar.bz2
samba-8c018ff786952424a2f1c612046eb91d2e42f648.zip
r8310: replace the heimdal networking interface scanning code with glue code that uses the Samba
interfaces list. This makes heimdal obey the 'interfaces=' smb.conf option, and should also fix the portability problems with the heimdal code (This used to be commit ba621d1c554e135f449a144019b84719a086e04f)
Diffstat (limited to 'source4/heimdal_build/config.mk')
-rw-r--r--source4/heimdal_build/config.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index aca4589ffe..c0fe33bf9e 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -114,7 +114,6 @@ ADD_OBJ_FILES = \
heimdal/lib/krb5/free_host_realm.o \
heimdal/lib/krb5/generate_seq_number.o \
heimdal/lib/krb5/generate_subkey.o \
- heimdal/lib/krb5/get_addrs.o \
heimdal/lib/krb5/get_cred.o \
heimdal/lib/krb5/get_default_principal.o \
heimdal/lib/krb5/get_default_realm.o \
@@ -285,13 +284,19 @@ ADD_OBJ_FILES = \
heimdal/lib/roken/strlwr.o \
heimdal/lib/roken/strsep_copy.o \
heimdal/lib/roken/strupr.o \
- heimdal/lib/roken/strpool.o \
- heimdal/lib/roken/getifaddrs.o
+ heimdal/lib/roken/strpool.o
NOPROTO = YES
# End SUBSYSTEM HEIMDAL_ROKEN
#######################
#######################
+# Start SUBSYSTEM HEIMDAL_GLUE
+[SUBSYSTEM::HEIMDAL_GLUE]
+ADD_OBJ_FILES = heimdal_build/glue.o
+# End SUBSYSTEM HEIMDAL_GLUE
+#######################
+
+#######################
# Start SUBSYSTEM HEIMDAL_COM_ERR
[SUBSYSTEM::HEIMDAL_COM_ERR]
ADD_OBJ_FILES = \
@@ -377,7 +382,7 @@ NOPROTO = YES
TARGET_CFLAGS = -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include
REQUIRED_SUBSYSTEMS = \
HEIMDAL_GSSAPI HEIMDAL_KRB5 \
- HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR
+ HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_GLUE
# End SUBSYSTEM HEIMDAL
#######################