From: Martin Mares <mj@ucw.cz>
Date: Sun, 9 Nov 2008 21:11:23 +0000 (+0100)
Subject: Example: Fix the previous commit.
X-Git-Tag: holmes-import~169
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=b56cd57bdce6b573ac0fc973ba4d16057c1e2ca5;p=libucw.git

Example: Fix the previous commit.

(pkg-config does not like testing the version and reading a variable simultaneously.)
---

diff --git a/free/libs/examples/external-ucw-build/configure b/free/libs/examples/external-ucw-build/configure
index 1e9ccedc..8214aa94 100755
--- a/free/libs/examples/external-ucw-build/configure
+++ b/free/libs/examples/external-ucw-build/configure
@@ -18,10 +18,12 @@ BEGIN {
 			die "Don't know how to find myself. Please set SRCDIR manually.";
 		}
 	}
-	# Ask pkg-config for the rest of configure
-	$libdir=`pkg-config libucw --atleast-version=3.13 --variable=perl_modules_dir`;
+	# Ask pkg-config if libucw is installed and find its configure modules
+	`pkg-config libucw --atleast-version=3.13`;
+	!$? or die "Package `libucw' (version 3.13 or newer) not found. Is PKG_CONFIG_PATH set properly?";
+	$libdir=`pkg-config libucw --variable=perl_modules_dir`;
 	chomp $libdir;
-	die "Package `libucw' (version 3.13 or newer) not found. Is PKG_CONFIG_PATH set properly?" if $? || not defined $libdir;
+	die "Unable to find the libucw configure system" if $? || not defined $libdir;
 }
 use lib $libdir;
 use UCW::Configure;