diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-08 10:35:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:37:50 -0500 |
| commit | c070fd62228a4fb0af0d275edc3d141e44dff389 (patch) | |
| tree | a3e7880864609930dcca90f75fa9c17a225f192c | |
| parent | 6a74a831510674f25c582b60bfb763489e0b538d (diff) | |
| download | samba-c070fd62228a4fb0af0d275edc3d141e44dff389.tar.gz samba-c070fd62228a4fb0af0d275edc3d141e44dff389.tar.bz2 samba-c070fd62228a4fb0af0d275edc3d141e44dff389.zip | |
r10074: Pass CPP to pidl via environment variables rather then config.pm. This fixes the
standalone pidl build (as used for ethereal)
(This used to be commit 9c9ebd2214423c58357854f09bd744e13e807d8f)
| -rw-r--r-- | source4/lib/registry/config.mk | 2 | ||||
| -rw-r--r-- | source4/pidl/idl.yp | 3 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/IDL.pm | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index d0939c720b..4a518321a4 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -18,7 +18,7 @@ INIT_OBJ_FILES = lib/registry/tdr_regf.o lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c lib/registry/tdr_regf.c: lib/registry/regf.idl - @./pidl/pidl --header --outputdir=lib/registry --parse --tdr-header --tdr-parser -- lib/registry/regf.idl + @CPP="$(CPP) $(PERL) pidl/pidl --header --outputdir=lib/registry --parse --tdr-header --tdr-parser -- lib/registry/regf.idl ################################################ # Start MODULE registry_w95 diff --git a/source4/pidl/idl.yp b/source4/pidl/idl.yp index 0f5b17e0fa..ce8100722b 100644 --- a/source4/pidl/idl.yp +++ b/source4/pidl/idl.yp @@ -319,7 +319,6 @@ optional_semicolon: # start code %% -use config qw(%config); use Parse::Pidl::Util; ##################################################################### @@ -423,7 +422,7 @@ sub parse_idl($$) undef $/; my $cpp = $ENV{CPP}; if (! defined $cpp) { - $cpp = $config::config{'CPP'}; + $cpp = "CPP"; } my $data = `$cpp -D__PIDL__ -xc $filename`; $/ = $saved_delim; diff --git a/source4/pidl/lib/Parse/Pidl/IDL.pm b/source4/pidl/lib/Parse/Pidl/IDL.pm index 2e73bd8410..dd667cb9eb 100644 --- a/source4/pidl/lib/Parse/Pidl/IDL.pm +++ b/source4/pidl/lib/Parse/Pidl/IDL.pm @@ -2672,7 +2672,6 @@ sub #line 320 "pidl/idl.yp" -use config qw(%config); use Parse::Pidl::Util; ##################################################################### @@ -2776,7 +2775,7 @@ sub parse_idl($$) undef $/; my $cpp = $ENV{CPP}; if (! defined $cpp) { - $cpp = $config::config{'CPP'}; + $cpp = "CPP"; } my $data = `$cpp -D__PIDL__ -xc $filename`; $/ = $saved_delim; |