svn commit: samba r15234 - in branches/SAMBA_4_0/source/heimdal_build: .

jelmer at samba.org jelmer at samba.org
Tue Apr 25 09:56:39 GMT 2006


Author: jelmer
Date: 2006-04-25 09:56:39 +0000 (Tue, 25 Apr 2006)
New Revision: 15234

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15234

Log:
Remove heimdal include paths from global CFLAGS

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.m4	2006-04-25 09:45:15 UTC (rev 15233)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4	2006-04-25 09:56:39 UTC (rev 15234)
@@ -218,7 +218,6 @@
 
 # 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)

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-25 09:45:15 UTC (rev 15233)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2006-04-25 09:56:39 UTC (rev 15234)
@@ -314,7 +314,7 @@
 #######################
 # 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 @@
 #######################
 # 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 @@
 #######################
 # 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
 #######################
 



More information about the samba-cvs mailing list