r15234: Remove heimdal include paths from global CFLAGS

diff --git a/source/heimdal_build/config.m4 b/source/heimdal_build/config.m4
index 4a3ad4d947408dfa5c0254064b73e5e44e52c8ee..75667ab7723fc3a0d46cdf290c764dda4c90ba9f 100644 (file)
--- a/source/heimdal_build/config.m4
+++ b/source/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/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index 69a62ef008bb261dc7dc9a509ec0945140c8dc37..c403b09a87ff408fa6d4f6b2ff15d94a50b63e0b 100644 (file)
--- a/source/heimdal_build/config.mk
+++ b/source/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
 #######################