diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-07 07:22:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:45 -0500 |
| commit | bce8cda06123648c377fbef92526f1f56121e513 (patch) | |
| tree | 75e4b2a190c8e3a5efd7c41433d36766ea189179 /source4/heimdal_build/config.mk | |
| parent | 6eae7eb3c446e26d8003846a79471e6232b1b92e (diff) | |
| download | samba-bce8cda06123648c377fbef92526f1f56121e513.tar.gz samba-bce8cda06123648c377fbef92526f1f56121e513.tar.bz2 samba-bce8cda06123648c377fbef92526f1f56121e513.zip | |
r7352: the internal heimdal build change. This changes quite a few things:
- if you want kerberos now, you need to unpack a lorikeet heimdal
tree in source/heimdal/. If source/heimdal/ does not exist at
configure time then all kerberos features are disabled. You cannot
use an external kerberos library for now. That may change later.
- moved lib/replace/ config stuff to lib/replace/ and create a
lib/replace/replace.h. That allows the heimdal build to use our
portability layer, and prevenets duplicate definitions of functions
like strlcat()
- if you do enable heimdal, then you will need to do 'make
HEIMDAL_EXTERNAL' before you build Samba. That should be fixed once
I explain the problem to jelmer (the problem is the inability to
set a depend without also dragging in the object list of the
dependency. We need this for building the heimdal asn1 compiler and
et compiler.
- disabled all of the m4 checks for external kerberos libraries. I
left them in place in auth/kerberos/, but disabled it in
configure.in
some of the heimdal_build/ code is still very rough, for example I
don't correctly detect the correct awk, flex, bison replacements for
heimdal_build/build_external.sh. I expect to fix that stuff up over
the next few days.
(This used to be commit d4648249b2c7fc8b5e7c0fc8d8f92ae043b5691f)
Diffstat (limited to 'source4/heimdal_build/config.mk')
| -rw-r--r-- | source4/heimdal_build/config.mk | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 4ce95f26db..4d7e63877a 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -311,15 +311,13 @@ ADD_OBJ_FILES = \ heimdal/lib/asn1/hash.o \ heimdal/lib/asn1/lex.o \ heimdal/lib/asn1/parse.o \ - heimdal/lib/roken/strlcat.o \ - heimdal/lib/roken/strlcpy.o \ heimdal/lib/roken/emalloc.o \ heimdal/lib/roken/getarg.o \ heimdal/lib/roken/print_version.o \ heimdal/lib/roken/setprogname.o \ heimdal/lib/asn1/symbol.o -TARGET_CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/kdc -Iheimdal/lib/asn1 -Iheimdal/lib/des -Iheimdal/lib/com_err -Iheimdal/include REQUIRED_SUBSYSTEMS = HEIMDAL_ROKEN +TARGET_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken NOPROTO = YES # End SUBSYSTEM ASN1_COMPILER ####################### @@ -327,13 +325,38 @@ NOPROTO = YES ####################### # Start BINARY asn1_compile [BINARY::asn1_compile] -REQUIRED_SUBSYSTEMS = ASN1_COMPILER -TARGET_CFLAGS = -Iheimdal/lib/krb5 -Iheimdal/kdc -Iheimdal/lib/asn1 -Iheimdal/lib/des -Iheimdal/lib/com_err -Iheimdal_build -Iheimdal/include +REQUIRED_SUBSYSTEMS = ASN1_COMPILER LIBREPLACE # End BINARY asn1_compile ####################### ####################### +# Start SUBSYSTEM COMPILE_ET +[SUBSYSTEM::COMPILE_ET] +ADD_OBJ_FILES = \ + heimdal/lib/com_err/lex.o \ + heimdal/lib/com_err/parse.o \ + heimdal/lib/com_err/compile_et.o \ + heimdal/lib/roken/getarg.o \ + heimdal/lib/roken/get_window_size.o \ + heimdal/lib/roken/getprogname.o \ + heimdal/lib/roken/strupr.o \ + heimdal/lib/roken/print_version.o \ + heimdal/lib/roken/setprogname.o +TARGET_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +NOPROTO = YES +# End SUBSYSTEM COMPILE_ET +####################### + +####################### +# Start BINARY compile_et +[BINARY::compile_et] +REQUIRED_SUBSYSTEMS = COMPILE_ET LIBREPLACE +# End BINARY compile_et +####################### + + +####################### # Start TARGET HEIMDAL_EXTERNAL [TARGET::HEIMDAL_EXTERNAL] CMD = heimdal_build/build_external.sh @@ -346,7 +369,7 @@ REQUIRED_SUBSYSTEMS = ASN1_COMPILER # Start SUBSYSTEM HEIMDAL [SUBSYSTEM::HEIMDAL] NOPROTO = YES -TARGET_CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/hdb -Iheimdal/lib/gssapi -Iheimdal/kdc -Iheimdal/lib/asn1 -Iheimdal/lib/des -Iheimdal/lib/com_err -Iheimdal/include +TARGET_CFLAGS = -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include REQUIRED_SUBSYSTEMS = \ HEIMDAL_KDC HEIMDAL_HDB HEIMDAL_GSSAPI HEIMDAL_KRB5 \ HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR @@ -357,6 +380,6 @@ REQUIRED_SUBSYSTEMS = \ # Start SUBSYSTEM KERBEROS_LIB [SUBSYSTEM::KERBEROS_LIB] #REQUIRED_SUBSYSTEMS = EXT_LIB_KRB5 -REQUIRED_SUBSYSTEMS = HEIMDAL +REQUIRED_SUBSYSTEMS = HEIMDAL LIBREPLACE # End SUBSYSTEM KERBEROS_LIB ####################### |