aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure.pl40
-rw-r--r--misc/config/makefile/nmake.in10
-rw-r--r--misc/config/makefile/unix.in6
-rw-r--r--misc/config/makefile/unix_shr.in6
-rw-r--r--modules/es_win32/modinfo.txt2
-rw-r--r--modules/fd_unix/modinfo.txt2
-rw-r--r--modules/ml_win32/modinfo.txt2
-rw-r--r--modules/mux_qt/modinfo.txt2
8 files changed, 39 insertions, 31 deletions
diff --git a/configure.pl b/configure.pl
index d44368291..e255c0b51 100755
--- a/configure.pl
+++ b/configure.pl
@@ -158,6 +158,11 @@ sub autoconfig {
print with_diagnostic('autoconfig', @_);
}
+sub emit_help {
+ print join('', @_);
+ exit;
+}
+
sub trace {
return unless 0;
@@ -174,7 +179,7 @@ sub trace {
##################################################
# Display Help and Quit #
##################################################
-sub help {
+sub display_help {
my $sets = join('|', sort keys %MODULE_SETS);
my $helptxt = <<ENDOFHELP;
@@ -208,6 +213,9 @@ ENDOFHELP
my $listing = sub {
my ($header, @list) = @_;
+
+ return '' if (@list == 0);
+
my ($output, $len) = ('', 0);
my $append = sub {
@@ -229,27 +237,27 @@ ENDOFHELP
return $output . "\n";
};
- $helptxt .= &$listing('CC', keys %COMPILER);
- $helptxt .= &$listing('OS', keys %OPERATING_SYSTEM);
- $helptxt .= &$listing('CPU', keys %CPU);
- $helptxt .= &$listing('Modules', keys %MODULES) if(%MODULES);
-
- print $helptxt;
- exit;
- }
+ emit_help($helptxt,
+ &$listing('CC', keys %COMPILER),
+ &$listing('OS', keys %OPERATING_SYSTEM),
+ &$listing('CPU', keys %CPU),
+ &$listing('Modules', keys %MODULES));
+}
##################################################
# Display Further Information about Modules #
##################################################
sub display_module_info {
+
+ my $info = '';
foreach my $mod (sort keys %MODULES) {
my $modinfo = $MODULES{$mod};
my $fullname = $$modinfo{'realname'};
while(length($mod) < 10) { $mod .= ' '; }
- print "$mod - $fullname\n";
+ $info .= "$mod - $fullname\n";
}
- exit;
+ emit_help($info);
}
##################################################
@@ -265,7 +273,8 @@ sub choose_target {
my ($cc,$os,$submodel) = split(/-/,$target,3);
- help() unless(defined($cc) and defined($os) and defined($submodel));
+ display_help()
+ unless(defined($cc) and defined($os) and defined($submodel));
croak("Compiler $cc isn't known (try --help)")
unless defined($COMPILER{$cc});
@@ -366,16 +375,15 @@ sub get_options {
my $save_option = sub {
my ($opt, $val) = @_;
$opt =~ s/-/_/g;
- print "$opt -> $val\n";
$$config{$opt} = $val;
};
my $module_set = '';
my @modules;
exit 1 unless GetOptions(
- 'help' => sub { help(); },
+ 'help' => sub { display_help(); },
'module-info' => sub { display_module_info(); },
- 'version' => sub { print "Botan $VERSION_STRING\n"; exit; },
+ 'version' => sub { emit_help("Botan $VERSION_STRING\n") },
'prefix=s' => sub { &$save_option(@_); },
'docdir=s' => sub { &$save_option(@_); },
@@ -406,7 +414,7 @@ sub get_options {
return ('', $mod_str) if($#ARGV == -1);
return ($ARGV[0], $mod_str) if($#ARGV == 0);
- help();
+ display_help();
}
##################################################
diff --git a/misc/config/makefile/nmake.in b/misc/config/makefile/nmake.in
index 01d1fd07a..7e8dc7349 100644
--- a/misc/config/makefile/nmake.in
+++ b/misc/config/makefile/nmake.in
@@ -88,14 +88,14 @@ static: $(STATIC_LIB)
# Fake Targets #
##################################################
clean:
- $(RM) @{var:build}\lib\* @{var:build}\checks\*
+ $(RM) @{var:build-dir}\lib\* @{var:build-dir}\checks\*
$(RM) $(LIBRARIES) $(CHECK)
distclean: clean
- $(RM) @{var:build}\include\botan\*
- $(RMDIR) @{var:build}\include\botan
- $(RMDIR) @{var:build}\lib @{var:build}\checks @{var:build}\include
- $(RMDIR) @{var:build}
+ $(RM) @{var:build-dir}\include\botan\*
+ $(RMDIR) @{var:build-dir}\include\botan @{var:build-dir}\include
+ $(RMDIR) @{var:build-dir}\lib @{var:build-dir}\checks
+ $(RMDIR) @{var:build-dir}
$(RM) Makefile
##################################################
diff --git a/misc/config/makefile/unix.in b/misc/config/makefile/unix.in
index f5d83c81a..a4342da00 100644
--- a/misc/config/makefile/unix.in
+++ b/misc/config/makefile/unix.in
@@ -43,7 +43,7 @@ INSTALL_CMD_EXEC = @{var:install_cmd_exec}
INSTALL_CMD_DATA = @{var:install_cmd_data}
LN = ln -fs
MKDIR = @mkdir
-MKDIR_INSTALL = @umask 022; mkdir -p -m $(EXEC_MODE)
+MKDIR_INSTALL = @umask 022; mkdir -p -m 755
RANLIB = @{var:ranlib_command}
RM = @rm -f
RM_R = @rm -rf
@@ -97,11 +97,11 @@ $(STATIC_LIB): $(LIBOBJS)
static: $(STATIC_LIB)
clean:
- $(RM_R) @{var:build}/lib/* @{var:build}/checks/*
+ $(RM_R) @{var:build-dir}/lib/* @{var:build-dir}/checks/*
$(RM) $(LIBRARIES) $(SYMLINK) $(CHECK)
distclean: clean
- $(RM_R) @{var:build}
+ $(RM_R) @{var:build-dir}
$(RM) Makefile $(CONFIG_SCRIPT)
install: $(LIBRARIES)
diff --git a/misc/config/makefile/unix_shr.in b/misc/config/makefile/unix_shr.in
index 24a77707e..fc85f4ad3 100644
--- a/misc/config/makefile/unix_shr.in
+++ b/misc/config/makefile/unix_shr.in
@@ -45,7 +45,7 @@ INSTALL_CMD_EXEC = @{var:install_cmd_exec}
INSTALL_CMD_DATA = @{var:install_cmd_data}
LN = ln -fs
MKDIR = @mkdir
-MKDIR_INSTALL = @umask 022; mkdir -p -m $(EXEC_MODE)
+MKDIR_INSTALL = @umask 022; mkdir -p -m 755
RANLIB = @{var:ranlib_command}
RM = @rm -f
RM_R = @rm -rf
@@ -110,11 +110,11 @@ static: $(STATIC_LIB)
shared: $(SHARED_LIB)
clean:
- $(RM_R) @{var:build}/lib/* @{var:build}/checks/*
+ $(RM_R) @{var:build-dir}/lib/* @{var:build-dir}/checks/*
$(RM) $(LIBRARIES) $(SYMLINK) $(CHECK)
distclean: clean
- $(RM_R) @{var:build}
+ $(RM_R) @{var:build-dir}
$(RM) Makefile $(CONFIG_SCRIPT)
install: $(LIBRARIES)
diff --git a/modules/es_win32/modinfo.txt b/modules/es_win32/modinfo.txt
index 57e516920..9bb27a03a 100644
--- a/modules/es_win32/modinfo.txt
+++ b/modules/es_win32/modinfo.txt
@@ -1,4 +1,4 @@
-realname "MS Windows Entropy Source"
+realname "Win32 Entropy Source"
# Probably not much of an issue anymore
#note "This module will not run under NT4"
diff --git a/modules/fd_unix/modinfo.txt b/modules/fd_unix/modinfo.txt
index 88147cf8d..8841fa7b5 100644
--- a/modules/fd_unix/modinfo.txt
+++ b/modules/fd_unix/modinfo.txt
@@ -1,4 +1,4 @@
-realname "Pipe Unix I/O support"
+realname "Unix I/O support for Pipe"
define PIPE_UNIXFD_IO
diff --git a/modules/ml_win32/modinfo.txt b/modules/ml_win32/modinfo.txt
index 91c3e63db..db72b510b 100644
--- a/modules/ml_win32/modinfo.txt
+++ b/modules/ml_win32/modinfo.txt
@@ -1,4 +1,4 @@
-realname "Memory Locking for Windows"
+realname "Memory Locking for Win32"
<replace>
mlock.cpp
diff --git a/modules/mux_qt/modinfo.txt b/modules/mux_qt/modinfo.txt
index 77b3e8298..f895464d9 100644
--- a/modules/mux_qt/modinfo.txt
+++ b/modules/mux_qt/modinfo.txt
@@ -1,4 +1,4 @@
-realname "Support for Qt/QCA"
+realname "Qt Mutex"
define MUTEX_QT
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 12:55:02 +0000