Fixed bugs in sorter docs.

[libucw.git] / free / libs / configure

diff --git a/free/libs/configure b/free/libs/configure
index 037b973e86078451797d2afea187af15cf4d17d5..db17e9003eca97864d1bafb9884414bdc9d74950 100755 (executable)
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -7,27 +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");
-# FIXME!
-Set("SHERLOCK_VERSION" => "0.0");
+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;
+require UCW::Configure::Doc;
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";