diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-04-27 14:46:33 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-04-27 14:46:33 +0000 |
| commit | 6a64a69fbc56b97f6285fbaad9f30fe58f211a88 (patch) | |
| tree | 6c14652af7ca8f19dd6de544f9f36d7ea6a17cee /make/utilities.pm | |
| parent | 2d7e463111c208c9ec8f3f406ddb3c035d4f737a (diff) | |
Fix this up a bit nicer
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9588 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'make/utilities.pm')
| -rw-r--r-- | make/utilities.pm | 10 |
1 files changed, 6 insertions, 4 deletions
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; } |