s4:s3compat Import Samba3 IDL files into the s3compat build.

We now need to build these, as Samba3 no longer has these checked into
the tree.

Andrew Bartlett

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 6bbdc7a8defde52306431cb6d3adfd27ab972586..75100a23a41a383afb275e870111cb848da699bc 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -1,5 +1,13 @@
 #!/usr/bin/env python
 
+bld.SAMBA_PIDL_LIST('s3-PIDL',
+                    source=bld.SUBDIR('../../source3/librpc/idl/', 
+                                      ['messaging.idl', 'libnetapi.idl', 'notify.idl', 
+                                      'wbint.idl', 'perfcount.idl', 
+                                      'secrets.idl', 'libnet_join.idl']),
+                    options="--includedir=../librpc/idl --header --ndr-parser --samba3-ndr-server --samba3-ndr-client",
+                    output_dir='../../source3/librpc/gen_ndr',
+                    generate_tables=False)
 
 TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
           lib/dbwrap.c lib/dbwrap_tdb.c
@@ -125,7 +133,7 @@ SMBLDAPUTIL = ''
 ZLIB_SRCS = ''
 
 LIB_SRC = '''${CRYPTO_SRC}
-          lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+          lib/messages.c lib/messages_local.c
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
           lib/talloc_dict.c
@@ -768,6 +776,41 @@ def S3_SUBSYSTEM(name, source,
                         cflags='-D_PUBLIC_= ',
                         public_deps=public_deps)
 
+S3_SUBSYSTEM('NDR_S3_MESSAGING',
+       source=bld.SUBDIR('librpc/gen_ndr/', 'ndr_messaging.c'),
+       public_deps='LIBNDR NDR_STANDARD'
+       )
+
+S3_SUBSYSTEM('NDR_S3_LIBNETAPI',
+       source=bld.SUBDIR('librpc/gen_ndr/', 'ndr_libnetapi.c'),
+       public_deps='LIBNDR NDR_STANDARD'
+       )
+
+S3_SUBSYSTEM('NDR_S3_NOTIFY',
+       source=bld.SUBDIR('librpc/gen_ndr/', 'ndr_notify.c'),
+       public_deps='LIBNDR NDR_STANDARD'
+       )
+
+S3_SUBSYSTEM('NDR_S3_WBINT',
+       source=bld.SUBDIR('librpc/gen_ndr/', 'ndr_wbint.c'),
+       public_deps='LIBNDR NDR_STANDARD'
+       )
+
+S3_SUBSYSTEM('NDR_S3_PERFCOUNT',
+       source=bld.SUBDIR('librpc/gen_ndr/', 'ndr_perfcount.c'),
+       public_deps='LIBNDR NDR_STANDARD'
+       )
+
+S3_SUBSYSTEM('NDR_S3_SECRETS',
+       source=bld.SUBDIR('librpc/gen_ndr/', 'ndr_secrets.c'),
+       public_deps='LIBNDR NDR_STANDARD'
+       )
+
+S3_SUBSYSTEM('NDR_S3_LIBNET_JOIN',
+       source=bld.SUBDIR('librpc/gen_ndr/', 'ndr_libnet_join.c'),
+       public_deps='LIBNDR NDR_STANDARD'
+       )
+
 
 S3_SUBSYSTEM('GROUPDB',
              source=GROUPDB_SRC)
@@ -791,6 +834,7 @@ S3_SUBSYSTEM('PARAM',
 
 S3_SUBSYSTEM('LIBS',
              source=LIB_SRC,
+             deps='NDR_S3_MESSAGING',
              vars=locals())
 
 S3_SUBSYSTEM('LIB_NONSMBD',
@@ -812,6 +856,7 @@ S3_SUBSYSTEM('LIBSMB',
                     deps='LIBSAMBA',
                     vars=locals())
 
+
 bld.SAMBA_SUBSYSTEM('s3_smbd',
                     bld.SUBDIR('../../source3', SMBD_SRC),
                     includes=SAMBA3_INCLUDES,