Fixed bugs in sorter docs.

[libucw.git] / free / libs / configure

diff --git a/free/libs/configure b/free/libs/configure
index a359da281800638055b798e531eeb050949d8a83..db17e9003eca97864d1bafb9884414bdc9d74950 100755 (executable)
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -14,20 +14,22 @@ BEGIN {
                } 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/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/paths.cfg";
-Include "ucw/autoconf.cfg";
-Include "ucw/ucw.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";