From: Martin Mares <mj@ucw.cz>
Date: Thu, 26 Jul 2007 09:50:44 +0000 (+0200)
Subject: Use lib/default.cfg and get the version string from there.
X-Git-Tag: holmes-import~506^2~19^2~2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=aaa20e4500b8f34ae150ac98c541f94e588c78f5;p=libucw.git

Use lib/default.cfg and get the version string from there.
Avoid sherlock/autoconf.cfg.
---

diff --git a/free/libs/configure b/free/libs/configure
index 037b973e..be2aee08 100755
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -22,12 +22,10 @@ BEGIN {
 }
 
 Init($srcdir, "default.cfg");
-# FIXME!
-Set("SHERLOCK_VERSION" => "0.0");
+Include "lib/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";
 Finish();
 
 Log "\nConfigured, run `make' to build everything.\n";
diff --git a/free/libs/examples/internal/configure b/free/libs/examples/internal/configure
index 2c6bf6c0..e4b5f100 100755
--- a/free/libs/examples/internal/configure
+++ b/free/libs/examples/internal/configure
@@ -22,6 +22,7 @@ BEGIN {
 }
 
 Init($srcdir, "default.cfg");
+Include "lib/default.cfg";
 Log "### Configuring TestApp ###\n\n";
 Include Get("CONFIG");
 Include "lib/autoconf.cfg";
diff --git a/free/libs/examples/internal/default.cfg b/free/libs/examples/internal/default.cfg
index 1723d128..c0335b5e 100644
--- a/free/libs/examples/internal/default.cfg
+++ b/free/libs/examples/internal/default.cfg
@@ -1,8 +1,5 @@
 # Default configuration file for our test application
 
-# Version string used by all Sherlock libraries
-Set("SHERLOCK_VERSION" => "0.0");
-
 # We want to build all libraries shared
 Set("CONFIG_SHARED");