cvsuser 04/09/30 05:25:23
Modified: . Configure.pl
config/gen icu.pl
Log:
- removed error message if icu-config does not exists
- added a note that icu autodetection will not work if you specifiy any other ICU
command line option
Revision Changes Path
1.147 +5 -2 parrot/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /cvs/public/parrot/Configure.pl,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -w -r1.146 -r1.147
--- Configure.pl 29 Sep 2004 15:02:17 -0000 1.146
+++ Configure.pl 30 Sep 2004 12:25:21 -0000 1.147
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: Configure.pl,v 1.146 2004/09/29 15:02:17 jrieks Exp $
+# $Id: Configure.pl,v 1.147 2004/09/30 12:25:21 jrieks Exp $
=head1 NAME
@@ -188,6 +188,9 @@
Use --icu-config=none to disable the autodetect feature. Parrot will
then be build with its own ICU.
+B<Note:> If you specifiy another ICU option than --icu-config, the
+autodetection functionality will be disabled.
+
=item C<--icuplatform=(platform)>
Use the given platform name to pass to ICU's runConfigureICU. (See
icu/source/runConfigureICU for the list of available "platform" names, which specify
both operating system and compiler.)
@@ -276,7 +279,7 @@
for($key) {
/version/ && do {
- my $cvsid='$Id: Configure.pl,v 1.146 2004/09/29 15:02:17 jrieks Exp $';
+ my $cvsid='$Id: Configure.pl,v 1.147 2004/09/30 12:25:21 jrieks Exp $';
print <<"END";
Parrot Version $parrot_version Configure 2.0
$cvsid
1.21 +20 -3 parrot/config/gen/icu.pl
Index: icu.pl
===================================================================
RCS file: /cvs/public/parrot/config/gen/icu.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- icu.pl 29 Sep 2004 17:01:55 -0000 1.20
+++ icu.pl 30 Sep 2004 12:25:23 -0000 1.21
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: icu.pl,v 1.20 2004/09/29 17:01:55 jrieks Exp $
+# $Id: icu.pl,v 1.21 2004/09/30 12:25:23 jrieks Exp $
=head1 NAME
@@ -39,8 +39,25 @@
print "specified a icu config parameter,\nICU autodetection disabled.\n"
if $verbose;
} elsif (!defined $icuconfig || !$icuconfig) {
- `icu-config --exists`;
- if (($? == -1) || ($? >> 8) != 0 ) {
+ my $notfound = 1;
+
+ {
+ # disable STDERR
+ open OLDERR, ">&", \*STDERR;
+ open STDERR, ">d8e622ad2.log";
+
+ # check if ICU is installed
+ system("icu-config", "--exists");
+ $notfound = ($? == -1);
+ $notfound ||= ($? >> 8) != 0;
+
+ # reenable STDERR
+ close STDERR;
+ unlink "d8e622ad2.log";
+ open STDERR, ">&", \*OLDERR;
+ }
+
+ if ($notfound) {
undef $icuconfig;
print "icu-config not found.\n" if $verbose;
} else {
