X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=free%2Flibs%2Fconfigure;h=db17e9003eca97864d1bafb9884414bdc9d74950;hb=45201a4c724923aae01ed891be9e125b229ad189;hp=6728ce201d434a2376610dba9344f843aed3b701;hpb=89f86d97def2a365b1799f70e3f254264b9c7615;p=libucw.git

diff --git a/free/libs/configure b/free/libs/configure
index 6728ce20..db17e900 100755
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -14,20 +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/UCW/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/paths.cfg";
-Include "ucw/autoconf.cfg";
-Include "ucw/ucw.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";