diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-07 04:52:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:48 -0500 |
| commit | 820492ba79aba44ab35dd7af7c0e8cafab61f114 (patch) | |
| tree | 71151efb0c94a090cde55928e9b2ee4187942c2a /source4/heimdal_build/config.h | |
| parent | 4262be2e45a6d8c52fec909daa4efc18551206fc (diff) | |
| download | samba-820492ba79aba44ab35dd7af7c0e8cafab61f114.tar.gz samba-820492ba79aba44ab35dd7af7c0e8cafab61f114.tar.bz2 samba-820492ba79aba44ab35dd7af7c0e8cafab61f114.zip | |
r18203: rearranged the overrides in heimdal_build/*.h to avoid the use of
heimdal_build/config.h from interfering with libreplace
This is a workaround for the fact that with the current CFLAGS and
dependencies system, -Iheimdal_build is put at the front of the
includes list, which means it overrides the normal config.h
(This used to be commit 84335903ceaf2242e43a0c5464e33408daec44b4)
Diffstat (limited to 'source4/heimdal_build/config.h')
| -rw-r--r-- | source4/heimdal_build/config.h | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index 35f7d3e017..40c3e6d771 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -4,41 +4,12 @@ */ #ifndef HAVE_HEIMDAL_CONFIG_H -#define HAVE_HEIMDAL_CONFIG_H 1 - -#include "include/config.h" -#include "replace.h" +#define HAVE_HEIMDAL_CONFIG_H #define RCSID(msg) - -#ifdef VOID_RETSIGTYPE -#define SIGRETURN(x) return -#else -#define SIGRETURN(x) return (RETSIGTYPE)(x) -#endif - -/* path to sysconf - should we force this to samba LIBDIR ? */ -#define SYSCONFDIR "/etc" - -/* HDB module dir - set to Samba LIBDIR/hdb ? */ -#define HDBDIR "/usr/heimdal/lib" - -/* Maximum values on all known systems */ -#define MaxHostNameLen (64+4) -#define MaxPathLen (1024+4) - -#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"} - -#define VERSION "Samba" - -#define ROKEN_LIB_FUNCTION - -/* these should be done with configure tests */ #define KRB5 -#define GETHOSTBYADDR_PROTO_COMPATIBLE -#define GETSERVBYNAME_PROTO_COMPATIBLE -#define OPENLOG_PROTO_COMPATIBLE -#define GETSOCKNAME_PROTO_COMPATIBLE +#include "include/config.h" +#include "replace.h" #endif |