Merge branch 'dev-lib' of ssh://git.ucw.cz/projects/sherlock/GIT/sherlock into dev-lib

[libucw.git] / free / libs / configure

diff --git a/free/libs/configure b/free/libs/configure
index 769eaac67c35aa5ca4ba9ac34be1b2a1d714a53d..b2433fc1776c45c43c473c99f57ec491e95739b8 100755 (executable)
--- 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,17 +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?
-# FIXME!
-Set("SHERLOCK_VERSION" => "0.0");
+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::C;
+require UCW::Configure::LibUCW;
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";