cvs commit: ponie Configure.pl

[email protected] (Nicholas Clark) 26 Jun 2004 19:57:29 -0000
Newsgroups perl.ponie.changes
Message-ID <[email protected]>
cvsuser     04/06/26 12:57:29

  Modified:    .        Configure.pl
  Log:
  When mangling the library paths etc, put parrot's entries at the front to
  ensure they have priority.
  
  Revision  Changes    Path
  1.29      +4 -2      ponie/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /cvs/public/ponie/Configure.pl,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -w -r1.28 -r1.29
  --- Configure.pl	21 Jun 2004 21:00:25 -0000	1.28
  +++ Configure.pl	26 Jun 2004 19:57:29 -0000	1.29
  @@ -1,5 +1,5 @@
   #!/usr/bin/perl -w
  -# $Id: Configure.pl,v 1.28 2004/06/21 21:00:25 nicholas Exp $
  +# $Id: Configure.pl,v 1.29 2004/06/26 19:57:29 nicholas Exp $
   
   use strict;
   use Config;
  @@ -120,8 +120,10 @@
       $munge{libs} = $munge{perllibs} = " -lparrot -licuuc -licudata ";
       $munge{libpth} = $lib_path;
   
  +    # Put new text that the front. This gives our things priority. For example,
  +    # it ensures that our copy of ICU is found ahead of the system's.
       while (my ($key, $value) = each %munge) {
  -	s/(^$key='[^']*)'$/$1 $value'/m
  +	s/(^$key=')([^']*)'$/$1$value $2'/m
   	    or die "Can't find config.sh line for $key";
       }