X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=free%2Flibs%2Fexamples%2Fexternal-ucw-build%2Fconfigure;h=ec4b279e7fbbed3f46fbdcac76280994efa11605;hb=1cf8ac51f5495ccd5187dc220ffc69e95d6e0cfc;hp=f87fcc735132e471a4abfc5bc206db351fdbd44d;hpb=0c6a4ebe19047ddfda7c2afad0d549fbee0e6d77;p=libucw.git

diff --git a/free/libs/examples/external-ucw-build/configure b/free/libs/examples/external-ucw-build/configure
index f87fcc73..ec4b279e 100755
--- a/free/libs/examples/external-ucw-build/configure
+++ b/free/libs/examples/external-ucw-build/configure
@@ -1,8 +1,6 @@
 #!/usr/bin/perl
-# Configure script for the libucw example
+# Configure script for the libucw example (inspired by ../external/configure)
 # (c) 2008 Michal Vaner <vorner@ucw.cz>
-# A lot copyed from ../external/configure
-# (c) 2007 Martin Mares <mj@ucw.cz>
 
 use warnings;
 use strict;
@@ -17,13 +15,15 @@ BEGIN {
 		} elsif ($0 =~ m@^(.*)/configure$@ && -f "$1/$pkgfile") {
 			$srcdir=$1;
 		} else {
-			die "Don't know how to find myself. Please set SRCDIR manually.";
+			die "Don't know how to find myself. Please set SRCDIR manually.\n";
 		}
 	}
-	# Ask pkg-config for the rest of configure
+	# 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?\n";
 	$libdir=`pkg-config libucw --variable=perl_modules_dir`;
 	chomp $libdir;
-	die "libUCW not found. Is PKG_CONFIG_PATH set properly?" if $? || not defined $libdir;
+	die "Unable to find the libucw configure system\n" if $? || not defined $libdir;
 }
 use lib $libdir;
 use UCW::Configure;