X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=free%2Flibs%2Fconfigure;h=f0f701e06dfe91a12d5d1d5131989f01a4e4538d;hb=58ab1f9ffac67f884809115198177bce94204b4d;hp=0313d745fcf62a143a02c25d40657965886c1f6e;hpb=33a9906a504d894349311ad1932076e25ae49e85;p=libucw.git

diff --git a/free/libs/configure b/free/libs/configure
index 0313d745..f0f701e0 100755
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -7,7 +7,7 @@ use strict;
 
 our $srcdir;
 BEGIN {
-	my $pkgfile = "lib/wildmatch.c";
+	my $pkgfile = "ucw/wildmatch.c";
 	if (!defined ($srcdir = $ENV{"SRCDIR"})) {
 		if (-f $pkgfile) {
 			$srcdir=".";
@@ -17,16 +17,18 @@ BEGIN {
 			die "Don't know how to find myself. Please set SRCDIR manually.";
 		}
 	}
-	require "$srcdir/lib/perl/Configure.pm";
-	UCW::Configure::import UCW::Configure;
 }
 
-Init($srcdir, "defconfig");	## FIXME: Shouldn't we use default.cfg everywhere?
-Include "sherlock/default.cfg";
+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 "lib/autoconf.cfg";
-Include "sherlock/autoconf.cfg";
+require UCW::Configure::Paths;
+require UCW::Configure::Autoconf;
+require UCW::Configure::UCW;
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";