UCW::CGI: Implemented UTF-8 mode (compatible with `use utf8')

[libucw.git] / ucw / perl / UCW / Configure / C.pm

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index 5346fb1a3a5f4a46a8deb32192ccb82841faf546..84c20da00680e08c4eec9aa2f45674fba0a199eb 100644 (file)
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -188,7 +188,7 @@ Set("CLANG" => "-std=gnu99 -fno-common");
 # C optimizations
 Set("COPT" => '-O2');
 if (Get("CPU_ARCH") ne "unknown" && Get("CPU_ARCH") ne "default") {
-       Append("COPT", '-march=$(CPU_ARCH)');
+       Append("COPT", '-march=' . Get("CPU_ARCH"));
 }
 
 # C optimizations for highly exposed code
@@ -269,9 +269,9 @@ if (IsSet("CONFIG_DARWIN")) {
 
 ### Compiling test programs ###
 
-sub TestCompile($) {
-       my ($source) = @_;
-       my $dir = 'conftest';
+sub TestCompile($$) {
+       my ($testname, $source) = @_;
+       my $dir = "conftest-$testname";
        `rm -rf $dir && mkdir $dir`; $? and Fail "Cannot initialize $dir";
 
        open SRC, ">$dir/conftest.c";
@@ -287,6 +287,10 @@ sub TestCompile($) {
                );
        `$cmd`;
        my $result = !$?;
+
+       `rm -rf $dir` unless Get("KEEP_CONFTEST");
+
+       return $result;
 }
 
 ### Writing C headers with configuration ###