s4-heimdal_build fix up build after heimdal import

Heimdal has it's own dynconfig like system, and so we need the
LIBDIR etc in the CFLAGS here.

We also need to define build rules for the new files imported in
the merge commit, and fix up some header files.

This includes the work by Matthieu Patou <mat@matws.net>

Andrew Bartlett

source4/dynconfig/wscript

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import string, Utils, Options, sys
+import string, Utils, Options, sys, Build
 from samba_utils import EXPAND_VARIABLES
 
 # list of directory options to offer in configure
@@ -37,6 +37,7 @@ dyn_cflags = {
     'SWATDIR'                        : '${DATADIR}/swat',
     'CODEPAGEDIR'                    : '${LIBDIR}/samba',
     'LIBDIR'                         : '${LIBDIR}',
+    'LIBEXECDIR'                     : '${MODULESDIR}',
     'STATEDIR'                       : '${LOCALSTATEDIR}',
     'CACHEDIR'                       : '${LOCKDIR}',
     'SMB_PASSWD_FILE'                : '${PRIVATEDIR}/smbpasswd',
@@ -61,6 +62,7 @@ dyn_cflags_fhs = {
     'NCALRPCDIR'                     : '${LOCALSTATEDIR}/ncalrpc',
     'PYTHONDIR'                      : '${PYTHONDIR}',
     'MODULESDIR'                     : '${LIBDIR}/samba',
+    'LIBEXECDIR'                     : '${MODULESDIR}',
     'INCLUDEDIR'                     : '${INCLUDEDIR}/samba-4.0',
     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
     'SWATDIR'                        : '${DATADIR}/swat',
@@ -120,9 +122,10 @@ def dynconfig_cflags(bld):
     for f in dyn_cflags.keys():
         cflags.append('-D%s="%s"' % (f, bld.env[f]))
     return cflags
+Build.BuildContext.dynconfig_cflags = dynconfig_cflags
 
 def build(bld):
-    cflags = dynconfig_cflags(bld)
+    cflags = bld.dynconfig_cflags()
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
                         'dynconfig.c',
                         deps='replace talloc',

source4/heimdal_build/config.h

@@ -23,6 +23,11 @@
 
 #undef HAVE_KRB5_ENCRYPT_BLOCK
 
+/* Because it can't be defined in roken.h */
+#ifndef USE_HCRYPTO_IMATH
+#define USE_HCRYPTO_IMATH
+#endif
+
 /*Workaround for heimdal define vs samba define*/
 #ifdef HAVE_LIBINTL_H
 #define LIBINTL

source4/heimdal_build/roken.h

@@ -14,7 +14,6 @@
 
 /* HDB module dir - set to Samba LIBDIR/hdb ? */
 #define HDBDIR "/usr/heimdal/lib"
-#define LIBDIR "/usr/heimdal/lib"
 #define HEIMDAL_LOCALEDIR "/usr/heimdal/locale"
 
 /* Maximum values on all known systems */