X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=free%2Flibs%2Fconfigure;h=db17e9003eca97864d1bafb9884414bdc9d74950;hb=70c814157dc1df252c914b743789e5d99e63f611;hp=3934fef4c34dba3cf7993a1f341629ec3fa101cb;hpb=6653d0a752dd937152fa66f1725fab42edc25b8a;p=libucw.git

diff --git a/free/libs/configure b/free/libs/configure
index 3934fef4..db17e900 100755
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -14,18 +14,22 @@ 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";
 		}
 	}
-	require "$srcdir/ucw/perl/Configure.pm";
-	UCW::Configure::import UCW::Configure;
 }
 
+use lib "$srcdir/ucw/perl/";
+use UCW::Configure;
+
 Init($srcdir, "default.cfg");
 Include "ucw/default.cfg";
 Log "### Configuring Sherlock Libraries " . Get("SHERLOCK_VERSION") . " with configuration " . Get("CONFIG") . "\n";
 Include Get("CONFIG");
-Include "ucw/autoconf.cfg";
+require UCW::Configure::Paths;
+require UCW::Configure::C;
+require UCW::Configure::LibUCW;
+require UCW::Configure::Doc;
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";