heimdal: Call HEIMDAL_AUTOPROTO_PRIVATE() manually.

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 3fbc9d098f4817fc3021a29110b490173672885a..67adb51f0e4b0a36a3fe9b63818e18e27001c63c 100644 (file)
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -164,7 +164,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
                   autoproto=None,
                   autoproto_options=None,
                   autoproto_extra='',
-                  autoproto_private=None,
                   is_bundled=True):
     '''define a Heimdal library'''
 
@@ -214,8 +213,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
     if autoproto is not None:
         HEIMDAL_AUTOPROTO(autoproto, source + ' ' + autoproto_extra,
             options=autoproto_options)
-    if autoproto_private is not None:
-        HEIMDAL_AUTOPROTO_PRIVATE(autoproto_private, source + ' ' + autoproto_extra)
 
 
 def HEIMDAL_GENERATOR(name, rule, source='', target='',
@@ -501,10 +498,10 @@ KDC_SOURCE='../heimdal/kdc/default_config.c ../heimdal/kdc/kerberos5.c ../heimda
 HEIMDAL_LIBRARY('kdc', source=KDC_SOURCE,
                     includes='../heimdal/kdc',
                     autoproto='../heimdal/kdc/kdc-protos.h',
-                    autoproto_private='../heimdal/kdc/kdc-private.h',
                     deps='roken krb5 hdb asn1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO com_err wind',
                     vnum='2.0.0',
                     )
+HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/kdc/kdc-private.h', KDC_SOURCE)
 
 HEIMNTLM_SOURCE = '../heimdal/lib/ntlm/ntlm.c'
 HEIMDAL_LIBRARY('heimntlm',
@@ -532,10 +529,10 @@ HEIMDAL_LIBRARY('hdb',
                     source=HDB_SOURCE,
                     includes='../heimdal/lib/hdb',
                     autoproto='../heimdal/lib/hdb/hdb-protos.h',
-                    autoproto_private='../heimdal/lib/hdb/hdb-private.h',
                     deps='HDB_LDB krb5 HEIMDAL_HDB_KEYS roken HEIMDAL_HCRYPTO com_err HEIMDAL_HDB_ASN1 wind',
                     vnum='11.0.2',
     )
+HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/hdb/hdb-private.h', HDB_SOURCE)
 
 
 HEIMDAL_LIBRARY('gssapi',
@@ -629,10 +626,11 @@ HEIMDAL_LIBRARY('krb5', KRB5_SOURCE,
                     autoproto='../heimdal/lib/krb5/krb5-protos.h',
                     autoproto_options='-E KRB5_LIB -q -P comment -o',
                     autoproto_extra='../heimdal/lib/krb5/expand_path.c ../heimdal/lib/krb5/plugin.c',
-                    autoproto_private='../heimdal/lib/krb5/krb5-private.h',
             deps='roken HEIMDAL_PKINIT_ASN1 wind HEIMDAL_KRB5_ASN1 hx509 HEIMDAL_HCRYPTO LIBSAMBA-HOSTCONFIG intl com_err HEIMDAL_CONFIG',
             vnum='26.0.0',
                     )
+HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/krb5/krb5-private.h',
+    KRB5_SOURCE + ' ../heimdal/lib/krb5/expand_path.c ../heimdal/lib/krb5/plugin.c')
 
 if not bld.CONFIG_SET("USING_SYSTEM_ASN1"):
     HEIMDAL_HEIM_ASN1_DER_SOURCE = '''