use the @CPP@ value from configure if possible when determining cpp in

pidl
(This used to be commit c47e88dabfc62db7533d2d39c7f1010b4188d2ea)

3 files changed, 12 insertions, 4 deletions

diff --git a/source4/Makefile.in b/source4/Makefile.in
index f2c68dd40e..c09e558b74 100644
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -643,10 +643,10 @@ pch: basics
 
 
 idl_full: build/pidl/idl.pm
-	script/build_idl.sh FULL
+	CPP="@CPP@" script/build_idl.sh FULL
 
 idl: build/pidl/idl.pm
-	@script/build_idl.sh
+	@CPP="@CPP@" script/build_idl.sh
 
 basics: idl proto_test
 
diff --git a/source4/build/pidl/idl.pm b/source4/build/pidl/idl.pm
index 5e285bdc7c..d5c0ae0071 100644
--- a/source4/build/pidl/idl.pm
+++ b/source4/build/pidl/idl.pm
@@ -1974,7 +1974,11 @@ sub parse_idl($$)
 
 	my $saved_delim = $/;
 	undef $/;
-	my $data = `cpp $filename`;
+	my $cpp = $ENV{CPP};
+	if (! defined $cpp) {
+		$cpp = "cpp"
+	}
+	my $data = `$cpp -xc $filename`;
 	$/ = $saved_delim;
 
         $self->YYData->{INPUT} = $data;
diff --git a/source4/build/pidl/idl.yp b/source4/build/pidl/idl.yp
index 3e9943a009..bfc4698709 100644
--- a/source4/build/pidl/idl.yp
+++ b/source4/build/pidl/idl.yp
@@ -304,7 +304,11 @@ sub parse_idl($$)
 
 	my $saved_delim = $/;
 	undef $/;
-	my $data = `cc -E $filename`;
+	my $cpp = $ENV{CPP};
+	if (! defined $cpp) {
+		$cpp = "cpp"
+	}
+	my $data = `$cpp -xc $filename`;
 	$/ = $saved_delim;
 
         $self->YYData->{INPUT} = $data;