From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 19 Jun 2009 14:17:08 +0000 (+0200)
Subject: pidl: Don't run compile tests inside the tree, won't work yet.
X-Git-Tag: talloc-2.0.0~797
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9cf441f82eb2ac8368ac7aac8ef8152d056958e;p=thirdparty%2Fsamba.git

pidl: Don't run compile tests inside the tree, won't work yet.
---

diff --git a/pidl/tests/Util.pm b/pidl/tests/Util.pm
index 4ad216a6a10..cfc5cf3a99b 100644
--- a/pidl/tests/Util.pm
+++ b/pidl/tests/Util.pm
@@ -13,6 +13,8 @@ use strict;
 use FindBin qw($RealBin);
 use lib "$RealBin/../lib";
 
+use Parse::Pidl::Samba4 qw(is_intree);
+
 use Parse::Pidl;
 my $warnings = "";
 undef &Parse::Pidl::warning;
@@ -66,8 +68,12 @@ sub test_samba4_ndr
 
 SKIP: {
 
-	skip "no samba environment available, skipping compilation", 3 
-		if (system("pkg-config --exists ndr") != 0);
+	my $flags;
+	if (system("pkg-config --exists ndr") == 0 and !is_intree()) {
+		$flags = `pkg-config --libs --cflags ndr`;
+	} else {
+		skip "no samba environment available, skipping compilation", 3;
+	}
 
 	my $main = "
 #define uint_t unsigned int
@@ -134,8 +140,6 @@ $c
 		$cc = "cc";
 	}
 
-	my $flags = `pkg-config --libs --cflags ndr`;
-
 	my $cmd = "$cc $cflags -x c - -o $outfile $flags $ldflags";
 	$cmd =~ s/\n//g;
 	open CC, "|$cmd";