summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-25 09:56:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:22 -0500
commitf7ef5201580d6c57f12764e95e8facf864224f0a (patch)
tree417ef880874d7df2e51dcb5ae82d57c9e0d67963 /source4
parent8d78725b2abdf81c310c35f8cde3c9c353973564 (diff)
downloadsamba-f7ef5201580d6c57f12764e95e8facf864224f0a.tar.gz
samba-f7ef5201580d6c57f12764e95e8facf864224f0a.tar.bz2
samba-f7ef5201580d6c57f12764e95e8facf864224f0a.zip
r15234: Remove heimdal include paths from global CFLAGS
(This used to be commit 0466165e90160209679a6005511e04e55ed2bf06)
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/config.m41
-rw-r--r--source4/heimdal_build/config.mk13
2 files changed, 5 insertions, 9 deletions
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 4a3ad4d947..75667ab772 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -218,7 +218,6 @@ AC_PROG_YACC
# if we ever get to using a host kerberos, we might add conditionals here
AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
-CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb -Iheimdal/kdc -Iheimdal/lib/roken -Iheimdal/lib/des"
HAVE_KRB5=YES
SMB_ENABLE(KERBEROS_LIB, YES)
SMB_ENABLE(asn1_compile, YES)
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 69a62ef008..c403b09a87 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -314,7 +314,7 @@ OBJ_FILES = \
#######################
# Start SUBSYSTEM HEIMDAL_ROKEN
[SUBSYSTEM::HEIMDAL_ROKEN]
-EXTRA_CFLAGS = -Iheimdal/lib/roken -Iheimdal_build
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
OBJ_FILES = \
../heimdal/lib/roken/base64.o \
../heimdal/lib/roken/hex.o \
@@ -368,10 +368,8 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
#######################
# Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
[SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX]
-EXTRA_CFLAGS = -D_GNU_SOURCE \
- -Iheimdal_build -Iheimdal/lib/asn1
-OBJ_FILES = \
- ../heimdal/lib/asn1/lex.ho
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/asn1/lex.ho
# End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
#######################
@@ -410,9 +408,8 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX
#######################
# Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
[SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX]
-EXTRA_CFLAGS = -D_GNU_SOURCE -Iheimdal_build -Iheimdal/lib/com_err
-OBJ_FILES = \
- ../heimdal/lib/com_err/lex.ho
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/com_err/lex.ho
# End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
#######################