cvsuser 04/09/29 10:01:56
Modified: config/gen icu.pl
Log:
Joshua Gatcomb:
I would propose that if Configure.pl does see any
other icu config flags that it not attempt to auto
configure.
Revision Changes Path
1.20 +11 -4 parrot/config/gen/icu.pl
Index: icu.pl
===================================================================
RCS file: /cvs/public/parrot/config/gen/icu.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- icu.pl 29 Sep 2004 15:02:20 -0000 1.19
+++ icu.pl 29 Sep 2004 17:01:55 -0000 1.20
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: icu.pl,v 1.19 2004/09/29 15:02:20 jrieks Exp $
+# $Id: icu.pl,v 1.20 2004/09/29 17:01:55 jrieks Exp $
=head1 NAME
@@ -28,10 +28,17 @@
$icushared, $icuheaders, $icuconfig) = @_;
my $icu_configure_command;
my @icu_headers = qw(ucnv.h utypes.h uchar.h);
+ my $autodetect = !defined($icudatadir)
+ && !defined($icuplatform)
+ && !defined($icushared)
+ && !defined($icuheaders);
print "\n" if $verbose;
- if (!defined $icuconfig || !$icuconfig) {
+ if (!$autodetect) {
+ print "specified a icu config parameter,\nICU autodetection disabled.\n"
+ if $verbose;
+ } elsif (!defined $icuconfig || !$icuconfig) {
`icu-config --exists`;
if (($? == -1) || ($? >> 8) != 0 ) {
undef $icuconfig;
@@ -42,7 +49,7 @@
}
}
- if ($icuconfig && $icuconfig ne "none") {
+ if ($autodetect && $icuconfig && $icuconfig ne "none") {
my $slash = Configure::Data->get('slash');
# icu-config script to use
