From 3035a3893584957f8167965b48b43466d523be5f Mon Sep 17 00:00:00 2001 From: lloyd Date: Sat, 2 Sep 2006 04:25:12 +0000 Subject: Remove various small unnecessary things from the configure code --- misc/config/code/config.pl | 2 +- misc/config/code/header.pl | 8 -------- misc/config/code/help.pl | 1 - misc/config/mkconfig.pl | 7 ------- 4 files changed, 1 insertion(+), 17 deletions(-) (limited to 'misc') diff --git a/misc/config/code/config.pl b/misc/config/code/config.pl index b60517589..071b83823 100644 --- a/misc/config/code/config.pl +++ b/misc/config/code/config.pl @@ -18,7 +18,7 @@ my $BUILD_INCLUDE_DIR = 'build/include'; my $CONFIG_HEADER = 'build.h'; -my $CPP_INCLUDE_DIR_DIRNAME = $PROJECT_NAME_LC; +my $CPP_INCLUDE_DIR_DIRNAME = 'botan'; # Available module sets my %MODULE_SETS = ( diff --git a/misc/config/code/header.pl b/misc/config/code/header.pl index baa310484..b7cf76eaf 100644 --- a/misc/config/code/header.pl +++ b/misc/config/code/header.pl @@ -1,13 +1,5 @@ #!/usr/bin/perl -w -# Warning: This file is machine-generated; any changes will be lost. Instead, -# change mkconfig.pl and the system description files. If you find a bug in -# this program (such as generation of incorrect options), please mail -# lloyd@randombit.net with details. - -# This file is in the public domain. - -# It actually runs on a lot of 5.005 installs, but not all... require 5.006; use strict; diff --git a/misc/config/code/help.pl b/misc/config/code/help.pl index 20ded09fe..4b3d47fa3 100644 --- a/misc/config/code/help.pl +++ b/misc/config/code/help.pl @@ -13,7 +13,6 @@ Options: --debug: tune compiler flags for debugging; inferior code can result --disable-shared: disable building shared libararies --noauto: Disable autoconfiguration - --dumb-gcc: change makefile flags to support GCC 2.95.x, 3.[34].x, or 4.0.x --make-style=STYLE: override the guess as to what type of makefile to use --modules=MODS: add module(s) MODS to the library. --module-set=SET: add a pre-specified set of modules (unix|win32|beos) diff --git a/misc/config/mkconfig.pl b/misc/config/mkconfig.pl index 3d646b774..1f62fb40d 100755 --- a/misc/config/mkconfig.pl +++ b/misc/config/mkconfig.pl @@ -4,9 +4,6 @@ use strict; use DirHandle; use File::Spec::Functions; -############################################################################ -my $PROJECT_NAME = 'Botan'; - ############################################################################ # Version numbers my $MAJOR = 1; @@ -18,7 +15,6 @@ my $PATCH = 11; my $OUTPUT_FILE = '../../configure.pl'; -my $MODULES_DIR = 'modules'; my $CODE_DIR = 'code'; my $ARCH_DIR = 'arch'; my $OS_DIR = 'os'; @@ -39,9 +35,6 @@ sub q { my($s) = @_; $s =~ s/^: {0,3}//gm; $s; } print OUTPUT &q(<