Split autoconf.cfg

[libucw.git] / free / libs / configure

diff --git a/free/libs/configure b/free/libs/configure
index be2aee08c841d67e59fadf22af703fec48262e68..a359da281800638055b798e531eeb050949d8a83 100755 (executable)
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -7,7 +7,7 @@ use strict;
 
 our $srcdir;
 BEGIN {
 
 our $srcdir;
 BEGIN {

-       my $pkgfile = "lib/wildmatch.c";
+       my $pkgfile = "ucw/wildmatch.c";

        if (!defined ($srcdir = $ENV{"SRCDIR"})) {
                if (-f $pkgfile) {
                        $srcdir=".";
        if (!defined ($srcdir = $ENV{"SRCDIR"})) {
                if (-f $pkgfile) {
                        $srcdir=".";


@@ -17,15 +17,17 @@ BEGIN {
                        die "Don't know how to find myself. Please set SRCDIR manually.";
                }
        }
                        die "Don't know how to find myself. Please set SRCDIR manually.";
                }
        }

-       require "$srcdir/lib/perl/Configure.pm";
+       require "$srcdir/ucw/perl/Configure.pm";

        UCW::Configure::import UCW::Configure;
 }
 
 Init($srcdir, "default.cfg");
        UCW::Configure::import 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");
 Log "### Configuring Sherlock Libraries " . Get("SHERLOCK_VERSION") . " with configuration " . Get("CONFIG") . "\n";
 Include Get("CONFIG");

-Include "lib/autoconf.cfg";
+Include "ucw/paths.cfg";
+Include "ucw/autoconf.cfg";
+Include "ucw/ucw.cfg";

 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";