Author: jelmer Date: 2005-09-08 10:35:55 +0000 (Thu, 08 Sep 2005) New Revision: 10074
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10074 Log: Pass CPP to pidl via environment variables rather then config.pm. This fixes the standalone pidl build (as used for ethereal) Modified: branches/SAMBA_4_0/source/lib/registry/config.mk branches/SAMBA_4_0/source/pidl/idl.yp branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm Changeset: Modified: branches/SAMBA_4_0/source/lib/registry/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/registry/config.mk 2005-09-08 09:45:19 UTC (rev 10073) +++ branches/SAMBA_4_0/source/lib/registry/config.mk 2005-09-08 10:35:55 UTC (rev 10074) @@ -18,7 +18,7 @@ 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 Modified: branches/SAMBA_4_0/source/pidl/idl.yp =================================================================== --- branches/SAMBA_4_0/source/pidl/idl.yp 2005-09-08 09:45:19 UTC (rev 10073) +++ branches/SAMBA_4_0/source/pidl/idl.yp 2005-09-08 10:35:55 UTC (rev 10074) @@ -319,7 +319,6 @@ # start code %% -use config qw(%config); use Parse::Pidl::Util; ##################################################################### @@ -423,7 +422,7 @@ undef $/; my $cpp = $ENV{CPP}; if (! defined $cpp) { - $cpp = $config::config{'CPP'}; + $cpp = "CPP"; } my $data = `$cpp -D__PIDL__ -xc $filename`; $/ = $saved_delim; Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm =================================================================== --- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm 2005-09-08 09:45:19 UTC (rev 10073) +++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm 2005-09-08 10:35:55 UTC (rev 10074) @@ -2672,7 +2672,6 @@ #line 320 "pidl/idl.yp" -use config qw(%config); use Parse::Pidl::Util; ##################################################################### @@ -2776,7 +2775,7 @@ undef $/; my $cpp = $ENV{CPP}; if (! defined $cpp) { - $cpp = $config::config{'CPP'}; + $cpp = "CPP"; } my $data = `$cpp -D__PIDL__ -xc $filename`; $/ = $saved_delim;
