diff options
| -rw-r--r-- | make/configure.pm | 14 | ||||
| -rw-r--r-- | make/utilities.pm | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/make/configure.pm b/make/configure.pm index 6a2faaef4..4f176324c 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -77,8 +77,10 @@ sub getcompilerflags { open(FLAGS, $file) or return ""; while (<FLAGS>) { if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); @@ -90,8 +92,10 @@ sub getlinkerflags { open(FLAGS, $file) or return ""; while (<FLAGS>) { if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); @@ -103,8 +107,10 @@ sub getdependencies { open(FLAGS, $file) or return ""; while (<FLAGS>) { if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) { + my $x = translate_functions($1, $file); + next if ($x eq ""); close(FLAGS); - return translate_functions($1,$file); + return $x; } } close(FLAGS); @@ -116,6 +122,8 @@ sub nopedantic { open(FLAGS, $file) or return ""; while (<FLAGS>) { if ($_ =~ /^\/\* \$NoPedantic \*\/$/) { + my $x = translate_functions($_, $file); + next if ($x eq ""); close(FLAGS); return 1; } diff --git a/make/utilities.pm b/make/utilities.pm index fc7ce13d2..8b74b7e84 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -114,7 +114,6 @@ sub pkgconfig_get_include_dirs($$$;$) my $v = `pkg-config --modversion $packagename 2>/dev/null`; my $ret = `pkg-config --cflags $packagename 2>/dev/null`; my $foo = ""; - if ((!defined $v) || ($v eq "")) { $foo = `locate "$headername" | head -n 1`; @@ -350,12 +349,15 @@ sub translate_functions($$) { if (defined $main::config{$1}) { - return "" if (($main::config{$1} !~ /y/i) and ($main::config{$1} ne "1")) + if (($main::config{$1} !~ /y/i) and ($main::config{$1} ne "1")) + { + $line = ""; + return ""; + } } $line =~ s/if\("(.+?)"\)//; } - while ($line =~ /exec\("(.+?)"\)/) { print "Executing program for module \e[1;32m$module\e[0m ... \e[1;32m$1\e[0m\n"; @@ -422,7 +424,7 @@ sub translate_functions($$) if ($@) { my $err = $@; - $err =~ s/at .+? line \d+.*//g; + #$err =~ s/at .+? line \d+.*//g; print "\n\nConfiguration failed. The following error occured:\n\n$err\n"; exit; } |