X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fperl%2FUCW%2FConfigure.pm;h=5d458adbb63c15e96d1011682eb1286877a0bafd;hb=156301aa8c7fd24d49ed27cfbd1afc10ccb7bc58;hp=6d4d3f1294c6d1dc59e5608de6792cb3792f1fde;hpb=39d95f1ecc54d72307809743c4f3a88e2630c64c;p=libucw.git

diff --git a/ucw/perl/UCW/Configure.pm b/ucw/perl/UCW/Configure.pm
index 6d4d3f12..5d458adb 100644
--- a/ucw/perl/UCW/Configure.pm
+++ b/ucw/perl/UCW/Configure.pm
@@ -1,6 +1,6 @@
 #	Perl module for UCW Configure Scripts
 #
-#	(c) 2005--2008 Martin Mares <mj@ucw.cz>
+#	(c) 2005--2010 Martin Mares <mj@ucw.cz>
 #
 #	This software may be freely distributed and used according to the terms
 #	of the GNU Lesser General Public License.
@@ -16,7 +16,7 @@ BEGIN {
 	our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 	$VERSION = 1.0;
 	@ISA = qw(Exporter);
-	@EXPORT = qw(&Init &Log &Notice &Warn &Fail &IsSet &IsGiven &Set &UnSet &Append &Override &Get &Test &Include &Finish &FindFile &TryFindFile &TryCmd &PkgConfig &TrivConfig &debPrint &PostConfig &AtWrite);
+	@EXPORT = qw(&Init &Log &Notice &Warn &Fail &IsSet &IsGiven &Set &UnSet &Append &Override &Get &Test &TestBool &Include &Finish &FindFile &TryFindFile &DebugDump &PostConfig &AtWrite);
 	@EXPORT_OK = qw();
 	%EXPORT_TAGS = ();
 }
@@ -26,9 +26,9 @@ our %overriden;
 our @postconfigs;
 our @atwrites;
 
-sub debPrint() {
-  print "VARS:\n";
-#  print "$_: $vars{$_}\n" foreach( keys %vars );
+sub DebugDump() {
+	print "VARS:\n";
+	print "$_: $vars{$_}\n" foreach( keys %vars );
 }
 
 sub Log($) {
@@ -89,10 +89,25 @@ sub Override($;$) {
 sub Test($$$) {
 	my ($var,$msg,$sub) = @_;
 	Log "$msg ... ";
-	if (!IsSet($var)) {
-		Set $var, &$sub();
+	if (IsSet($var)) {
+		Log Get($var) . " (preset)\n";
+	} else {
+		my $val = &$sub();
+		Set($var, $val);
+		Log "$val\n";
+	}
+}
+
+sub TestBool($$$) {
+	my ($var,$msg,$sub) = @_;
+	Log "$msg ... ";
+	if (IsSet($var) || IsGiven($var)) {
+		Log ((Get($var) ? "yes" : "no") . " (set)\n");
+	} else {
+		my ($val, $comment) = &$sub();
+		Set($var, $val);
+		Log (($val ? "yes" : "no") . "\n");
 	}
-	Log Get($var) . "\n";
 }
 
 sub TryFindFile($) {
@@ -208,89 +223,4 @@ sub Finish() {
 	}
 }
 
-sub TryCmd($) {
-	my ($cmd) = @_;
-	my $res = `$cmd`;
-	defined $res or return;
-	chomp $res;
-	return $res unless $?;
-	return;
-}
-
-sub maybe_manually($) {
-	my ($n) = @_;
-	if (IsGiven($n)) {
-		if (Get("$n")) { Log "YES (set manually)\n"; }
-		else { Log "NO (set manually)\n"; }
-		return 1;
-	}
-	return 0;
-}
-
-sub PkgConfig($@) {
-	my $pkg = shift @_;
-	my %opts = @_;
-	my $upper = $pkg; $upper =~ tr/a-z/A-Z/; $upper =~ s/[^0-9A-Z]+/_/g;
-	Log "Checking for package $pkg ... ";
-	maybe_manually("CONFIG_HAVE_$upper") and return Get("CONFIG_HAVE_$upper");
-	my $ver = TryCmd("pkg-config --modversion $pkg 2>/dev/null");
-	if (!defined $ver) {
-		Log("NONE\n");
-		return 0;
-	}
-	if (defined($opts{minversion})) {
-		my $min = $opts{minversion};
-		if (!defined TryCmd("pkg-config --atleast-version=$min $pkg")) {
-			Log("NO: version $ver is too old (need >= $min)\n");
-			return 0;
-		}
-	}
-	Log("YES: version $ver\n");
-	Set("CONFIG_HAVE_$upper" => 1);
-	Set("CONFIG_VER_$upper" => $ver);
-	my $cf = TryCmd("pkg-config --cflags $pkg");
-	Set("${upper}_CFLAGS" => $cf) if defined $cf;
-	my $lf = TryCmd("pkg-config --libs $pkg");
-	Set("${upper}_LIBS" => $lf) if defined $lf;
-	return 1;
-}
-
-sub ver_norm($) {
-	my ($v) = @_;
-	return join(".", map { sprintf("%05s", $_) } split(/\./, $v));
-}
-
-sub TrivConfig($@) {
-	my $pkg = shift @_;
-	my %opts = @_;
-	my $upper = $pkg; $upper =~ tr/a-z/A-Z/; $upper =~ s/[^0-9A-Z]+/_/g;
-	Log "Checking for package $pkg ... ";
-	maybe_manually("CONFIG_HAVE_$upper") and return Get("CONFIG_HAVE_$upper");
-	my $pc = $opts{script};
-	my $ver = TryCmd("$pc --version 2>/dev/null");
-	if (!defined $ver) {
-		Log("NONE\n");
-		return 0;
-	}
-	if (defined($opts{minversion})) {
-		my $min = $opts{minversion};
-		if (ver_norm($ver) lt ver_norm($min)) {
-			Log("NO: version $ver is too old (need >= $min)\n");
-			return 0;
-		}
-	}
-	Log("YES: version $ver\n");
-	Set("CONFIG_HAVE_$upper" => 1);
-	Set("CONFIG_VER_$upper" => $ver);
-
-	my $want = $opts{want};
-	defined $want or $want = ["cflags", "libs"];
-	for my $w (@$want) {
-		my $uw = $w; $uw =~ tr/a-z-/A-Z_/;
-		my $cf = TryCmd("$pc --$w");
-		Set("${upper}_${uw}" => $cf) if defined $cf;
-	}
-	return 1;
-}
-
 1;  # OK