Add a command to the cgiirc module for encoding/decoding hex idents.

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index 5d4520f31066e85ab9bedf009b3ef1ab589a6b71..346365a2ab7503bcaa0a3052e157858c738480f2 100755 (executable)
--- a/configure
+++ b/configure
@@ -205,10 +205,10 @@ if (defined $opt_portable) {
        $config{RUNTIME_DIR} = $opt_runtime_dir // $config{DATA_DIR};
        $config{SCRIPT_DIR}  = $opt_script_dir  // $config{BASE_DIR};
 } elsif (defined $opt_system) {
-       $config{BASE_DIR}    = $opt_prefix      // '/var/lib/inspircd';
+       $config{BASE_DIR}    = $opt_prefix      // '/';
        $config{BINARY_DIR}  = $opt_binary_dir  // '/usr/sbin';
        $config{CONFIG_DIR}  = $opt_config_dir  // '/etc/inspircd';
-       $config{DATA_DIR}    = $opt_data_dir    // '/var/inspircd';
+       $config{DATA_DIR}    = $opt_data_dir    // '/var/lib/inspircd';
        $config{EXAMPLE_DIR} = $opt_example_dir // '/usr/share/doc/inspircd';
        $config{LOG_DIR}     = $opt_log_dir     // '/var/log/inspircd';
        $config{MANUAL_DIR}  = $opt_manual_dir  // '/usr/share/man/man1';
@@ -322,7 +322,6 @@ EOW
 my $question = <<"EOQ";
 Currently, InspIRCd is configured with the following paths:
 
-<|BOLD Base:|>   $config{BASE_DIR}
 <|BOLD Binary:|> $config{BINARY_DIR}
 <|BOLD Config:|> $config{CONFIG_DIR}
 <|BOLD Data:|>   $config{DATA_DIR}
@@ -336,7 +335,7 @@ EOQ
 if (prompt_bool $interactive, $question, 0) {
        my $original_base_dir = $config{BASE_DIR};
        $config{BASE_DIR} = prompt_dir $interactive, 'In what directory do you wish to install the InspIRCd base?', $config{BASE_DIR};
-       foreach my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR SCRIPT_DIR)) {
+       for my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_DIR SCRIPT_DIR)) {
                $config{$key} =~ s/^\Q$original_base_dir\E/$config{BASE_DIR}/;
        }
        $config{BINARY_DIR} = prompt_dir $interactive, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR};
@@ -357,7 +356,7 @@ Currently, InspIRCd is configured to automatically enable all available extra mo
 Would you like to enable extra modules manually?
 EOQ
 if (prompt_bool $interactive, $question, 0) {
-       foreach my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
+       for my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
                my $module_name = module_shrink $extra;
                if (prompt_bool $interactive, "Would you like to enable the <|BOLD $module_name|> module?", 0) {
                        enable_extras $module_name;
@@ -453,10 +452,9 @@ my @makeargs;
 push @makeargs, "-C${\abs2rel $RealDir}" unless getcwd eq $RealDir;
 push @makeargs, "-j${\(get_cpu_count() + 1)}";
 
-say console_format <<"EOM";
+print console_format <<"EOM";
 
 <|GREEN Paths:|>
-  <|GREEN Base:|>    $config{BASE_DIR}
   <|GREEN Binary:|>  $config{BINARY_DIR}
   <|GREEN Config:|>  $config{CONFIG_DIR}
   <|GREEN Data:|>    $config{DATA_DIR}