From caa438d84c8cf94cd32d0dd2d7fb2c655a57a4db Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 30 Oct 2008 19:11:41 +0100 Subject: [PATCH] Slightly better names for configuration modules. --- free/libs/configure | 4 ++-- free/libs/examples/internal/configure | 4 ++-- ucw/perl/UCW/Configure/{Autoconf.pm => C.pm} | 2 +- ucw/perl/UCW/Configure/{UCW.pm => LibUCW.pm} | 11 ++++------- ucw/perl/UCW/Configure/Paths.pm | 7 +++---- 5 files changed, 12 insertions(+), 16 deletions(-) rename ucw/perl/UCW/Configure/{Autoconf.pm => C.pm} (99%) rename ucw/perl/UCW/Configure/{UCW.pm => LibUCW.pm} (86%) diff --git a/free/libs/configure b/free/libs/configure index f0f701e0..b2433fc1 100755 --- a/free/libs/configure +++ b/free/libs/configure @@ -27,8 +27,8 @@ Include "ucw/default.cfg"; Log "### Configuring Sherlock Libraries " . Get("SHERLOCK_VERSION") . " with configuration " . Get("CONFIG") . "\n"; Include Get("CONFIG"); require UCW::Configure::Paths; -require UCW::Configure::Autoconf; -require UCW::Configure::UCW; +require UCW::Configure::C; +require UCW::Configure::LibUCW; Finish(); Log "\nConfigured, run `make' to build everything.\n"; diff --git a/free/libs/examples/internal/configure b/free/libs/examples/internal/configure index 3196cbe0..32d61781 100755 --- a/free/libs/examples/internal/configure +++ b/free/libs/examples/internal/configure @@ -27,8 +27,8 @@ Include "ucw/default.cfg"; Log "### Configuring TestApp ###\n\n"; Include Get("CONFIG"); require UCW::Configure::Paths; -require UCW::Configure::Autoconf; -require UCW::Configure::UCW; +require UCW::Configure::C; +require UCW::Configure::LibUCW; Finish(); Log "\nConfigured, run `make' to build everything.\n"; diff --git a/ucw/perl/UCW/Configure/Autoconf.pm b/ucw/perl/UCW/Configure/C.pm similarity index 99% rename from ucw/perl/UCW/Configure/Autoconf.pm rename to ucw/perl/UCW/Configure/C.pm index 6d916197..fbfab631 100644 --- a/ucw/perl/UCW/Configure/Autoconf.pm +++ b/ucw/perl/UCW/Configure/C.pm @@ -1,4 +1,4 @@ -# Automatic configuration, OS & CPU detection part +# UCW Library configuration system: OS and C compiler # (c) 2005--2008 Martin Mares # (c) 2006 Robert Spalek # (c) 2008 Michal Vaner diff --git a/ucw/perl/UCW/Configure/UCW.pm b/ucw/perl/UCW/Configure/LibUCW.pm similarity index 86% rename from ucw/perl/UCW/Configure/UCW.pm rename to ucw/perl/UCW/Configure/LibUCW.pm index 81a62f00..445c4a26 100644 --- a/ucw/perl/UCW/Configure/UCW.pm +++ b/ucw/perl/UCW/Configure/LibUCW.pm @@ -1,10 +1,9 @@ -# Automatic configuration, libucw specific part -# (c) 2008 Michal Vaner -# Code taken from autoconf.cfg by: +# UCW Library configuration system: parameters of the library # (c) 2005--2008 Martin Mares # (c) 2006 Robert Spalek +# (c) 2008 Michal Vaner -package UCW::Configure::UCW; +package UCW::Configure::LibUCW; use UCW::Configure; # Determine page size @@ -41,7 +40,5 @@ if (Get("CPU_ARCH") eq "default" || Get("CPU_ARCH") =~ /^i[345]86$/) { Set("CONFIG_UCW_RADIX_SORTER_BITS" => 12); } -# If debugging memory allocations: -#LIBS+=-lefence - +# We succeeded 1; diff --git a/ucw/perl/UCW/Configure/Paths.pm b/ucw/perl/UCW/Configure/Paths.pm index 385987ca..ef5c8851 100644 --- a/ucw/perl/UCW/Configure/Paths.pm +++ b/ucw/perl/UCW/Configure/Paths.pm @@ -1,8 +1,7 @@ -# Automatic configuration, installation paths part -# (c) 2008 Michal Vaner -# Code taken from autoconf.cfg by: +# UCW Library configuration system: installation paths # (c) 2005--2008 Martin Mares # (c) 2006 Robert Spalek +# (c) 2008 Michal Vaner package UCW::Configure::Paths; use UCW::Configure; @@ -40,6 +39,6 @@ Set("INSTALL_RUN_DIR", '$(INSTALL_VAR_PREFIX)run'); # Remember PKG_CONFIG_PATH used for building, so that it will be propagated to # pkg-config's run locally in the makefiles. Set("PKG_CONFIG_PATH", $ENV{"PKG_CONFIG_PATH"}) if defined $ENV{"PKG_CONFIG_PATH"}; -# We succeeded +# We succeeded 1; -- 2.39.2