Merge branch 'master' into dev-lib

[libucw.git] / free / libs / examples / external-ucw-build / configure

diff --git a/free/libs/examples/external-ucw-build/configure b/free/libs/examples/external-ucw-build/configure
index 1e9ccedc1b103c9a2fc250fe616cd6ba3754a963..ec4b279e7fbbed3f46fbdcac76280994efa11605 100755 (executable)
--- a/free/libs/examples/external-ucw-build/configure
+++ b/free/libs/examples/external-ucw-build/configure
@@ -15,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
-       $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?\n";
+       $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\n" if $? || not defined $libdir;
 }
 use lib $libdir;
 use UCW::Configure;