X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2Fgenconf;h=ac9755f4aaa7b28b2495b82baf111cc3d06a30dc;hb=f635f4d406f772b54455331cdf23cc10a361392a;hp=29565a9c48a9d3bc2e34c442cbd3b8b9c457b690;hpb=15ea795b7c38ac31c2d00e051fddb65b12e8310c;p=libucw.git

diff --git a/build/genconf b/build/genconf
index 29565a9c..ac9755f4 100755
--- a/build/genconf
+++ b/build/genconf
@@ -20,8 +20,11 @@ while (<CF>) {
 }
 close CF;
 
-my $opt_regex = join("|", keys %options);
-sub eval_expr { $_ = "@_"; s/\b($opt_regex)\b/ 1 /g if $opt_regex; s/\bCONFIG_\w+\b/ 0 /g; return eval $_; }
+sub eval_expr {
+	$_ = shift @_;
+	s/\b(CONFIG_\w+)\b/defined($options{$1}) ? 1 : 0/ge;
+	return eval $_;
+}
 
 open IN, $ARGV[0] or die "Unable to open $ARGV[0]";
 open OUT, ">$ARGV[1]" or die "Unable to create $ARGV[1]";