summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-16 18:48:56 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-16 18:48:56 +0200
commit4beb6731a733fcbd2c871911f6e797f615c188ec (patch)
treea3ceadd57c943f92b69383dde06c8f92b53b8049
parent3e5ba883b3dd82e5285d98b8c5083336c478ba04 (diff)
downloadsamba-4beb6731a733fcbd2c871911f6e797f615c188ec.tar.gz
samba-4beb6731a733fcbd2c871911f6e797f615c188ec.tar.bz2
samba-4beb6731a733fcbd2c871911f6e797f615c188ec.zip
Use pidl from Samba 4 from Samba 3 rather than hoping there is one installed on the
system.
-rw-r--r--source3/Makefile.in2
-rwxr-xr-xsource3/script/build_idl.sh4
2 files changed, 1 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 31387c315c..11399bad3c 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 7aaddc70c7..8ff5dcd949 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}"
##