summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2014-02-26 20:19:58 +0000
committerAttila Molnar <attilamolnar@hush.com>2014-04-11 15:38:17 +0200
commit2803ae5d75e610fb821b7fdb3771777d62ac9fd3 (patch)
tree955a1f5b6547a4e9366c113e118d0b5d980e3cb4 /configure
parent557c02839bec991dd846a6dc12ce7ba52de1525c (diff)
Remove various broken/useless features from the build system.
- Removed support for changing the build directory using configure. This can still be set using make BUILDPATH=foo. - Removed support for SPLIT_CC builds. This is not documented anywhere and is quite useless as it doesn't work. - Remove STARTSCRIPT from configure; always install the perl helper.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 2 insertions, 10 deletions
diff --git a/configure b/configure
index 0a91e65c5..857541189 100755
--- a/configure
+++ b/configure
@@ -101,13 +101,12 @@ our $interactive = !(
(defined $opt_use_gnutls)
);
-our $topdir = getcwd();
our %config = read_configure_cache();
print "Checking for cache from previous configure... ";
print %config ? "found\n" : "not found\n";
-$config{BASE_DIR} = $topdir."/run";
+$config{BASE_DIR} = getcwd()."/run";
if (defined $opt_base_dir) {
$config{BASE_DIR} = $opt_base_dir;
@@ -120,7 +119,6 @@ if (defined $opt_system) {
$config{CONFIG_DIR} = '/etc/inspircd';
$config{MODULE_DIR} = '/usr/lib/inspircd';
$config{BINARY_DIR} = '/usr/sbin/';
- $config{BUILD_DIR} = $topdir."/build";
$config{DATA_DIR} = '/var/inspircd';
$config{LOG_DIR} = '/var/log/inspircd';
} else {
@@ -128,7 +126,6 @@ if (defined $opt_system) {
$config{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf");
$config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules");
$config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin");
- $config{BUILD_DIR} = rel2abs($topdir."/build");
$config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data");
$config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs");
}
@@ -164,8 +161,6 @@ if (defined $opt_use_openssl)
$config{USE_OPENSSL} = "y";
}
-$config{STARTSCRIPT} = $^O eq 'darwin' ? 'org.inspircd.plist' : 'inspircd';
-
$config{CXX} = defined $ENV{CXX} && !system("$ENV{CXX} -v > /dev/null 2>&1") ? $ENV{CXX} : find_compiler();
if ($config{CXX} eq "") {
print "A C++ compiler could not be detected on your system!\n";
@@ -312,7 +307,6 @@ EOW
$config{DATA_DIR} = prompt_dir(1, 'In what directory are variable data files to be stored?', $config{DATA_DIR});
$config{LOG_DIR} = prompt_dir(1, 'In what directory are log files to be stored?', $config{LOG_DIR});
$config{MODULE_DIR} = prompt_dir(1, 'In what directory are the modules to be placed?', $config{MODULE_DIR});
- $config{BUILD_DIR} = prompt_dir(1, 'In what directory do you want the build to take place?', $config{BUILD_DIR});
my $chose_hiperf = 0;
if ($config{HAS_KQUEUE}) {
@@ -489,13 +483,11 @@ EOF
$_ = join '', <FILEHANDLE>;
close(FILEHANDLE);
- $config{BUILD_DIR} ||= rel2abs($topdir."/build");
$config{COMPILER} = lc $cxx{NAME};
$config{SYSTEM} = lc $^O;
for my $var (qw(
- CXX COMPILER SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
- STARTSCRIPT SOCKETENGINE
+ CXX COMPILER SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR DATA_DIR UID SOCKETENGINE
)) {
s/\@$var\@/$config{$var}/g;
}