cvsuser     02/03/05 13:42:46

  Modified:    .        Configure.pl
  Log:
  Minor cleanup and enhancements.
  
  Revision  Changes    Path
  1.96      +27 -18    parrot/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /home/perlcvs/parrot/Configure.pl,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -w -r1.95 -r1.96
  --- Configure.pl      5 Mar 2002 19:48:38 -0000       1.95
  +++ Configure.pl      5 Mar 2002 21:42:46 -0000       1.96
  @@ -2,7 +2,7 @@
   #
   # Configure.pl
   #
  -# $Id: Configure.pl,v 1.95 2002/03/05 19:48:38 brentdax Exp $
  +# $Id: Configure.pl,v 1.96 2002/03/05 21:42:46 brentdax Exp $
   #
   # Author: Brent Dax
   #
  @@ -75,7 +75,7 @@
   
   if($opt_version) {
       print "Parrot Version $parrot_version Configure\n";
  -    print '$Id: Configure.pl,v 1.95 2002/03/05 19:48:38 brentdax Exp $' . "\n";
  +    print '$Id: Configure.pl,v 1.96 2002/03/05 21:42:46 brentdax Exp $' . "\n";
       exit;
   }
   
  @@ -626,15 +626,19 @@
       print "Verifying that the compiler supports function pointer casts...\n";
       eval { compiletestc("testparrotfuncptr"); };
   
  -    if ($@ || !(runtestc("testparrotfuncptr") =~ /OK/)) {
  -        print "Although it is not required by the ANSI C standard,\n";
  -        print "Parrot requires the ability to cast from void pointers to 
function\n";
  -        print "pointers for its JIT support.\n\n";
  -        print "Your compiler does not appear to support this behavior with the\n";
  -        print "flags you have specified.  You must adjust your settings in order\n";
  -     print "to use the JIT code.\n\n";
  -        print "If you wish to continue without JIT support, please re-run this 
script\n";
  -     print "With the '--define jitcapable=0' argument.\n";
  +    if ($@ || runtestc("testparrotfuncptr") !~ /OK/) {
  +        print <<"END";
  +Although it is not required by the ANSI C standard,
  +Parrot requires the ability to cast from void pointers to function
  +pointers for its JIT support.
  +
  +Your compiler does not appear to support this behavior with the
  +flags you have specified.  You must adjust your settings in order
  +to use the JIT code.
  +
  +If you wish to continue without JIT support, please re-run this script
  +With the '--define jitcapable=0' argument.
  +END
        exit(-1);
       }    
       cleantestc("testparrotfuncptr");
  @@ -658,16 +662,21 @@
       open NEEDED, ">include/parrot/vtable.h";
       print NEEDED "/* dummy */ struct _vtable { int a; };\n";
       close NEEDED;
  +
       buildfile("testparrotsizes_c");
       compiletestc("testparrotsizes");
  +
       %newc=eval(runtestc("testparrotsizes"))
         or die "Can't run the test program: $!";
  +
       @c{keys %newc}=values %newc;
   
       @c{qw(stacklow intlow numlow strlow pmclow)} = lowbitmask(@c{qw(stackchunk 
iregchunk nregchunk sregchunk pregchunk)});
   
       cleantestc("testparrotsizes");
  +
       unlink('testparrotsizes.c');
  +
       unlink("include/parrot/vtable.h");
   }
   
  @@ -903,7 +912,7 @@
   sub cleantestc {
       my ($name) = @_;
   
  -    unlink("$name$c{o}", "$name$c{exe}");
  +    unlink(grep {!/\.c$/} glob("$name.*"));
   }
   
   #
  
  
  


Reply via email to