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

diff --git a/free/libs/configure b/free/libs/configure
index be2aee08..db17e900 100755
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -7,25 +7,29 @@ use strict;
 
 our $srcdir;
 BEGIN {
-	my $pkgfile = "lib/wildmatch.c";
+	my $pkgfile = "ucw/wildmatch.c";
 	if (!defined ($srcdir = $ENV{"SRCDIR"})) {
 		if (-f $pkgfile) {
 			$srcdir=".";
 		} 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/lib/perl/Configure.pm";
-	UCW::Configure::import UCW::Configure;
 }
 
+use lib "$srcdir/ucw/perl/";
+use UCW::Configure;
+
 Init($srcdir, "default.cfg");
-Include "lib/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";
+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";