diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-06 10:30:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:43 -0500 |
| commit | 6c85bcc9723f662cd6d1075586758694574e42d7 (patch) | |
| tree | 1ee75b44333bf90a99b35f729ff4ba518e38f1fa | |
| parent | 6aa376ef15d69c06fbb8a637201d61ad0267cd7a (diff) | |
| download | samba-6c85bcc9723f662cd6d1075586758694574e42d7.tar.gz samba-6c85bcc9723f662cd6d1075586758694574e42d7.tar.bz2 samba-6c85bcc9723f662cd6d1075586758694574e42d7.zip | |
r18154: try to get the heimdal_build code to use libreplace in a better way
(chasing down build failures ...)
added showflags as part of 'all' target, which makes tracking down
problems easier in the build farm
(This used to be commit d52aaccdf8a537dc8de8db7c30ff0ab076c4c63f)
| -rw-r--r-- | source4/heimdal_build/config.h | 12 | ||||
| -rw-r--r-- | source4/main.mk | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index 5c1d55ca9a..f7adedd2d4 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -6,10 +6,8 @@ #ifndef HAVE_HEIMDAL_CONFIG_H #define HAVE_HEIMDAL_CONFIG_H 1 -/* bring in the samba4 config.h */ #include "include/config.h" - -#ifdef HAVE_KRB5 +#include "replace.h" #define RCSID(msg) @@ -41,14 +39,6 @@ /* these should be done with configure tests */ #define KRB5 -#include <sys/types.h> -#include <stdarg.h> -#ifdef HAVE_INTTYPES_H -#include <inttypes.h> -#endif -#include "lib/replace/replace.h" -#endif - /* we need to tell roken about the functions that Samba replaces in lib/replace */ #ifndef HAVE_SETEUID #define HAVE_SETEUID 1 diff --git a/source4/main.mk b/source4/main.mk index 6be785e0ce..cb8dbc1848 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,4 +1,4 @@ -all: $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries libraries modules +all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries libraries modules include dynconfig.mk include heimdal_build/config.mk |