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 037b973e86078451797d2afea187af15cf4d17d5..be2aee08c841d67e59fadf22af703fec48262e68 100755 (executable)
--- 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 2c6bf6c070605b0940466b83dd8d1364a3c79a93..e4b5f1003536d9cffe4987b242b2727162ee0030 100755 (executable)
--- 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 1723d128c65812fadd8011c02a85635f85acd4e7..c0335b5e4167b9944e05c15f825300d5feb5a0c9 100644 (file)
--- 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");