[svn:parrot] r48971 - trunk/config/auto

jkeenan at svn.parrot.org jkeenan at svn.parrot.org
Mon Sep 13 01:15:02 UTC 2010


Author: jkeenan
Date: Mon Sep 13 01:15:01 2010
New Revision: 48971
URL: https://trac.parrot.org/parrot/changeset/48971

Log:
Apply 1 of several patches submitted by ronaldws++ in http://trac.parrot.org/parrot/ticket/1401.  Express 'result' more clearly -- 'no' -- when PCRE not found.

Modified:
   trunk/config/auto/pcre.pm

Modified: trunk/config/auto/pcre.pm
==============================================================================
--- trunk/config/auto/pcre.pm	Mon Sep 13 00:31:23 2010	(r48970)
+++ trunk/config/auto/pcre.pm	Mon Sep 13 01:15:01 2010	(r48971)
@@ -35,11 +35,10 @@
 
     my $without = $conf->options->get( qw| without-pcre | );
 
-    if ($without) {
-        $conf->data->set( HAS_PCRE => 0 );
-        $self->set_result('no');
-        return 1;
-    }
+    $self->set_result('no');
+    $conf->data->set( HAS_PCRE => 0 );
+
+    return 1 if ($without);
 
     my $osname = $conf->data->get('osname');
 
@@ -53,12 +52,12 @@
 
     $conf->cc_gen('config/auto/pcre/pcre_c.in');
     eval { $conf->cc_build( q{}, $extra_libs ) };
-    my $has_pcre = 0;
     if ( !$@ ) {
         my $test = $conf->cc_run();
-        $has_pcre = $self->_evaluate_cc_run($conf, $test);
+        if ( my $has_pcre = $self->_evaluate_cc_run($conf, $test) ) {
+	    $conf->data->set( HAS_PCRE => $has_pcre);
+        }
     }
-    $conf->data->set( HAS_PCRE => $has_pcre);
 
     return 1;
 }


More information about the parrot-commits mailing list