[SCM] Samba Shared Repository - branch master updated - 4beb6731a733fcbd2c871911f6e797f615c188ec

[Jelmer Vernooij]

The branch, master has been updated
       via  4beb6731a733fcbd2c871911f6e797f615c188ec (commit)
      from  3e5ba883b3dd82e5285d98b8c5083336c478ba04 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4beb6731a733fcbd2c871911f6e797f615c188ec
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 16 18:48:56 2008 +0200

    Use pidl from Samba 4 from Samba 3 rather than hoping there is one installed on the
    system.

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in         |    2 +-
 source3/script/build_idl.sh |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 31387c3..11399ba 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1170,7 +1170,7 @@ samba3-idl::
 		epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
 		dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
 		nbt.idl" \
-		CPP="$(CPP)" PERL="$(PERL)" \
+		CPP="$(CPP)" PIDL="../source4/pidl/pidl" \
 	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
 
 
diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
index 7aaddc7..8ff5dcd 100755
--- a/source3/script/build_idl.sh
+++ b/source3/script/build_idl.sh
@@ -8,10 +8,6 @@ cd ${srcdir}
 
 [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
 
-if [ -z "$PIDL" ] ; then
-    PIDL=pidl
-fi
-
 PIDL="$PIDL ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}"
 
 ##


-- 
Samba Shared Repository