Renamed both instances of `defconfig' to `default.cfg' to keep the names

in line with the rest of the configuration files.

diff --git a/free/libs/configure b/free/libs/configure
index 769eaac67c35aa5ca4ba9ac34be1b2a1d714a53d..037b973e86078451797d2afea187af15cf4d17d5 100755 (executable)
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -21,7 +21,7 @@ BEGIN {
        UCW::Configure::import UCW::Configure;
 }
 
-Init($srcdir, "defconfig");    ## FIXME: Shouldn't we use default.cfg everywhere?
+Init($srcdir, "default.cfg");
 # FIXME!
 Set("SHERLOCK_VERSION" => "0.0");
 Log "### Configuring Sherlock Libraries " . Get("SHERLOCK_VERSION") . " with configuration " . Get("CONFIG") . "\n";

diff --git a/free/libs/default.cfg b/free/libs/default.cfg
new file mode 100644 (file)
index 0000000..9a9de22
--- /dev/null
+++ b/free/libs/default.cfg
@@ -0,0 +1,34 @@
+# Default configuration of Sherlock libraries (see sherlock/default.cfg for an explanation)
+
+# Do we want shared or static libraries?
+Set("CONFIG_SHARED");
+
+# We want the public API
+Set("CONFIG_INSTALL_API");
+
+# Libucw should support files >2GB and threading
+Set("CONFIG_LARGE_FILES");
+Set("CONFIG_UCW_THREADS" => 1);
+
+# Libucw extensions
+Set("CONFIG_UCW_PERL" => 1);
+Set("CONFIG_UCW_PERL_MODULES" => 1);
+Set("CONFIG_UCW_SHELL_UTILS" => 1);
+
+# Libsh settings
+Set("CONFIG_BUCKET_SHIFT" => 6);
+
+# Liblang settings
+Set("CONFIG_LANG");
+Set("MAX_WORD_LEN" => 64);
+
+# Libimages settings
+Set("CONFIG_IMAGES");
+Set("CONFIG_IMAGES_LIBJPEG");
+Set("CONFIG_IMAGES_LIBPNG");
+Set("CONFIG_IMAGES_LIBUNGIF");
+UnSet("CONFIG_IMAGES_LIBGIF");
+UnSet("CONFIG_IMAGES_LIBMAGICK");
+
+# Return success
+1;

diff --git a/free/libs/defconfig b/free/libs/defconfig
deleted file mode 100644 (file)
index 9a9de22..0000000
--- a/free/libs/defconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# Default configuration of Sherlock libraries (see sherlock/default.cfg for an explanation)
-
-# Do we want shared or static libraries?
-Set("CONFIG_SHARED");
-
-# We want the public API
-Set("CONFIG_INSTALL_API");
-
-# Libucw should support files >2GB and threading
-Set("CONFIG_LARGE_FILES");
-Set("CONFIG_UCW_THREADS" => 1);
-
-# Libucw extensions
-Set("CONFIG_UCW_PERL" => 1);
-Set("CONFIG_UCW_PERL_MODULES" => 1);
-Set("CONFIG_UCW_SHELL_UTILS" => 1);
-
-# Libsh settings
-Set("CONFIG_BUCKET_SHIFT" => 6);
-
-# Liblang settings
-Set("CONFIG_LANG");
-Set("MAX_WORD_LEN" => 64);
-
-# Libimages settings
-Set("CONFIG_IMAGES");
-Set("CONFIG_IMAGES_LIBJPEG");
-Set("CONFIG_IMAGES_LIBPNG");
-Set("CONFIG_IMAGES_LIBUNGIF");
-UnSet("CONFIG_IMAGES_LIBGIF");
-UnSet("CONFIG_IMAGES_LIBMAGICK");
-
-# Return success
-1;

diff --git a/free/libs/examples/internal/configure b/free/libs/examples/internal/configure
index 8cbed3519cf5ccc1c0793956bdcc5e1583035244..2c6bf6c070605b0940466b83dd8d1364a3c79a93 100755 (executable)
--- a/free/libs/examples/internal/configure
+++ b/free/libs/examples/internal/configure
@@ -21,7 +21,7 @@ BEGIN {
        UCW::Configure::import UCW::Configure;
 }
 
-Init($srcdir, "defconfig");
+Init($srcdir, "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
new file mode 100644 (file)
index 0000000..1723d12
--- /dev/null
+++ b/free/libs/examples/internal/default.cfg
@@ -0,0 +1,22 @@
+# 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");
+
+# Liblang settings
+Set("CONFIG_LANG");
+Set("MAX_WORD_LEN" => 64);
+
+# Libimages settings
+Set("CONFIG_IMAGES");
+Set("CONFIG_IMAGES_LIBJPEG");
+Set("CONFIG_IMAGES_LIBPNG");
+Set("CONFIG_IMAGES_LIBUNGIF");
+UnSet("CONFIG_IMAGES_LIBGIF");
+UnSet("CONFIG_IMAGES_LIBMAGICK");
+
+# Return success
+1;

diff --git a/free/libs/examples/internal/defconfig b/free/libs/examples/internal/defconfig
deleted file mode 100644 (file)
index 1723d12..0000000
--- a/free/libs/examples/internal/defconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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");
-
-# Liblang settings
-Set("CONFIG_LANG");
-Set("MAX_WORD_LEN" => 64);
-
-# Libimages settings
-Set("CONFIG_IMAGES");
-Set("CONFIG_IMAGES_LIBJPEG");
-Set("CONFIG_IMAGES_LIBPNG");
-Set("CONFIG_IMAGES_LIBUNGIF");
-UnSet("CONFIG_IMAGES_LIBGIF");
-UnSet("CONFIG_IMAGES_LIBMAGICK");
-
-# Return success
-1;