aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pidl/lib/Parse/Pidl/Samba4.pm
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2011-08-11 06:12:39 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2011-08-11 06:12:39 +0000
commit07213ad32930d6f59ddc47cc70766b0fbadb322f (patch)
treedbfc36d4c2a3b5d1ed152c43047c09c8058ca546 /tools/pidl/lib/Parse/Pidl/Samba4.pm
parent37bab5e89de94244c182beb31c84390df5d1835a (diff)
Sync up to the latest PIDL with Mathieu's wireshark patches
svn path=/trunk/; revision=38470
Diffstat (limited to 'tools/pidl/lib/Parse/Pidl/Samba4.pm')
-rw-r--r--tools/pidl/lib/Parse/Pidl/Samba4.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/pidl/lib/Parse/Pidl/Samba4.pm b/tools/pidl/lib/Parse/Pidl/Samba4.pm
index 1deb708689..b720ab9015 100644
--- a/tools/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/tools/pidl/lib/Parse/Pidl/Samba4.pm
@@ -18,12 +18,17 @@ use strict;
use vars qw($VERSION);
$VERSION = '0.01';
+
+# return true if we are using pidl within the samba source tree. This changes
+# the names of include files, as some include files (such as ntstatus.h) have
+# different paths when installed to the patch in the source tree
sub is_intree()
{
my $srcdir = $ENV{srcdir};
$srcdir = $srcdir ? "$srcdir/" : "";
- return 4 if (-f "${srcdir}kdc/kdc.c");
- return 3 if (-f "${srcdir}include/smb.h");
+ return 1 if (-f "${srcdir}kdc/kdc.c");
+ return 1 if (-d "${srcdir}source4");
+ return 1 if (-f "${srcdir}include/smb.h");
return 0;
}