[svn:ponie] r382 - in trunk: . perl

Author: nnunley
Date: Mon Jan 30 10:40:06 2006
New Revision: 382

Modified:
   trunk/   (props changed)
   trunk/Configure.pl
   trunk/perl/perl.c
Log:
 r16309@norman:  nnunley | 2006-01-30 18:36:11 +0000
 Incremental refactoring of include path code.  Doesn't fix the build yet. :(


Modified: trunk/Configure.pl
==============================================================================
--- trunk/Configure.pl	(original)
+++ trunk/Configure.pl	Mon Jan 30 10:40:06 2006
@@ -108,9 +108,7 @@ unless (-e 'config.sh' && -e 'config.h' 
     }
     system('sh','Configure',@config_args)  && die "error";;
 
-    my $inc_path = "$dir/parrot/include";
-    my $inc_path_parrot_pmc = "$dir/parrot/src/pmc";
-    my $inc_path_pmc = "$dir/src/pmc";
+    my @inc_path = ("$dir/parrot/include", "$dir/parrot/src/pmc", "$dir/src/pmc");
     my @lib_path = ("$dir/parrot/blib/lib", "$dir/src/pmc");
 
     open (FH, "config.sh") or die $!;
@@ -127,9 +125,8 @@ unless (-e 'config.sh' && -e 'config.h' 
     if (" $Parrot::Config::PConfig{libs} " =~ / -lgmp /) {
 	$bonus_libs .= " -lgmp";
     }
-    $munge{cppflags} = $munge{ccflags} = " -I${inc_path} -I{$inc_path_parrot_pmc} -I${inc_path_pmc}";
-    $munge{ldflags} = $munge{lddlflags}
-      = join '', map " -L$_", @lib_path;
+    $munge{cppflags} = $munge{ccflags} = join '', map {" -I$_" } @inc_path;
+    $munge{ldflags} = $munge{lddlflags} = join '', map " -L$_", @lib_path;
     $munge{libs} = $munge{perllibs} = "$bonus_libs ";
     $munge{libpth} = join " ", @lib_path;
 

Modified: trunk/perl/perl.c
==============================================================================
--- trunk/perl/perl.c	(original)
+++ trunk/perl/perl.c	Mon Jan 30 10:40:06 2006
@@ -80,6 +80,7 @@ School of Mathematics and Statistics  Un
 #include "EXTERN.h"
 #define PERL_IN_PERL_C
 #include "perl.h"
+#include "parrot/config.h"
 #include "parrot/extend.h"
 #include "patchlevel.h"			/* for local_patches */
 #include "perl5pmcs.h"