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

diff --git a/free/libs/configure b/free/libs/configure
index 3934fef4..f0f701e0 100755
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -17,15 +17,18 @@ BEGIN {
 			die "Don't know how to find myself. Please set SRCDIR manually.";
 		}
 	}
-	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::Autoconf;
+require UCW::Configure::UCW;
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";