summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-02-05 16:58:32 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-02-05 19:45:18 +0100
commit44b95bc72777ab42f2b089f37b0b84b3b4c0736c (patch)
treef4ffeaa53177e4a5f5cb217799dd60cf75e48baf
parentf9f1db18834648da73b7b1f6d9472523941e8277 (diff)
downloadsamba-44b95bc72777ab42f2b089f37b0b84b3b4c0736c.tar.gz
samba-44b95bc72777ab42f2b089f37b0b84b3b4c0736c.tar.bz2
samba-44b95bc72777ab42f2b089f37b0b84b3b4c0736c.zip
s4:Heimdal build - never require the NSS wrapper for Heimdal Kerberos
Disable the use of it in the heimdal code. Notice: This doesn't need to be ported upstream since it only affects the build in conjunction with s4.
-rw-r--r--source4/heimdal_build/internal.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
index 7e85b9758d..843bb858a3 100644
--- a/source4/heimdal_build/internal.mk
+++ b/source4/heimdal_build/internal.mk
@@ -586,12 +586,12 @@ $(HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimda
HEIMDAL_ROKEN_PROGNAME_H_OBJ_FILES = \
$(heimdalsrcdir)/lib/roken/getprogname.ho \
$(heimdalsrcdir)/lib/roken/setprogname.ho
-$(HEIMDAL_ROKEN_PROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1
+$(HEIMDAL_ROKEN_PROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
[SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM_H]
HEIMDAL_ROKEN_CLOSEFROM_H_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.ho
-$(HEIMDAL_ROKEN_CLOSEFROM_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1
+$(HEIMDAL_ROKEN_CLOSEFROM_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
#######################
# Start SUBSYSTEM HEIMDAL_ROKEN
@@ -645,7 +645,7 @@ HEIMDAL_ROKEN_OBJ_FILES = \
$(HEIMDAL_ROKEN_OBJ_FILES) $(HEIMDAL_ROKEN_OBJ_FILES:.o=.d):: $(heimdalsrcdir)/lib/roken/roken.h
[SUBSYSTEM::HEIMDAL_ROKEN_H]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1
+CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
PRIVATE_DEPENDENCIES = \
HEIMDAL_ROKEN_PROGNAME_H \
HEIMDAL_ROKEN_CLOSEFROM_H \
@@ -704,7 +704,7 @@ asn1_compile_OBJ_FILES = \
$(asn1_compile_ASN1_OBJ_FILES) \
$(heimdalsrcdir)/lib/vers/print_version.ho
-$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1
+$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
$(eval $(call heimdal_proto_header_template, \
$(heimdalsrcdir)/lib/asn1/der-protos.h, \
@@ -731,7 +731,7 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \
$(heimdalsrcdir)/lib/com_err/lex.ho \
$(heimdalsrcdir)/lib/com_err/compile_et.ho
-$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1
+$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
$(heimdalsrcdir)/lib/com_err/lex.c:: $(heimdalsrcdir)/lib/com_err/parse.c
dist:: $(heimdalsrcdir)/lib/com_err/lex.c