summaryrefslogtreecommitdiff
path: root/source4/pidl/lib/Parse
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-06 20:01:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:56 -0500
commit5c3fd8e4717ec7167a67f9e9ee1e2d86f7d515a8 (patch)
treeb16ae1fcc626cf915f92ba73f8ccd220e6af03b8 /source4/pidl/lib/Parse
parent7218b3b878fe74b8bd739443a38cb2409d332e20 (diff)
downloadsamba-5c3fd8e4717ec7167a67f9e9ee1e2d86f7d515a8.tar.gz
samba-5c3fd8e4717ec7167a67f9e9ee1e2d86f7d515a8.tar.bz2
samba-5c3fd8e4717ec7167a67f9e9ee1e2d86f7d515a8.zip
r19580: Add --includedir option.
(This used to be commit b076bfa39fefafcf30ac5be5056abfd629338fa5)
Diffstat (limited to 'source4/pidl/lib/Parse')
-rw-r--r--source4/pidl/lib/Parse/Pidl/IDL.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/IDL.pm b/source4/pidl/lib/Parse/Pidl/IDL.pm
index b9c39f186e..87b4ccb5e5 100644
--- a/source4/pidl/lib/Parse/Pidl/IDL.pm
+++ b/source4/pidl/lib/Parse/Pidl/IDL.pm
@@ -2987,9 +2987,9 @@ sub parse_string
return CleanData($idl);
}
-sub parse_file($)
+sub parse_file($$)
{
- my ($filename) = @_;
+ my ($filename,$incdirs) = @_;
my $saved_delim = $/;
undef $/;
@@ -2997,7 +2997,8 @@ sub parse_file($)
if (! defined $cpp) {
$cpp = "cpp";
}
- my $data = `$cpp -D__PIDL__ -xc $filename`;
+ my $includes = map { " -I$_" } @$incdirs;
+ my $data = `$cpp -D__PIDL__$includes -xc $filename`;
$/ = $saved_delim;
return parse_string($data, $filename);