X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=5ccd47d9aadcb8abc512b4489c9899996eb202f6;hb=dd930143a15ce7429527f0afd52b01bc31e9ed12;hp=029d566af0b1d435285405af9f31ceab55a28596;hpb=f6b861f12d070ba931d829505bfd3229653f5df2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index 029d566af..5ccd47d9a 100755 --- a/configure +++ b/configure @@ -5,9 +5,7 @@ # Copyright (C) 2020 Nicole Kleinhoff # Copyright (C) 2020 Daniel Vassdal # Copyright (C) 2019 Matt Schatz -# Copyright (C) 2019 Anatole Denis -# Copyright (C) 2017 emerson -# Copyright (C) 2013-2020 Sadie Powell +# Copyright (C) 2013-2021 Sadie Powell # Copyright (C) 2012, 2019 Robby # Copyright (C) 2012 ChrisTX # Copyright (C) 2010 Daniel De Graaf @@ -102,7 +100,6 @@ exit 1 unless GetOptions( 'system' => \$opt_system, 'uid=s' => \$opt_uid, - # TODO: when the modulemanager rewrite is done these should be removed. 'disable-extras=s@' => \@opt_disableextras, 'enable-extras=s@' => \@opt_enableextras, 'list-extras' => sub { list_extras; exit 0; }, @@ -143,7 +140,7 @@ our $interactive = !( ); my %version = get_version $opt_distribution_label; -print_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>\n"; +say console_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>"; my %config; if ($interactive) { @@ -205,16 +202,16 @@ 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{BINARY_DIR} = $opt_binary_dir // '/usr/sbin'; - $config{CONFIG_DIR} = $opt_config_dir // '/etc/inspircd'; - $config{DATA_DIR} = $opt_data_dir // '/var/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'; - $config{MODULE_DIR} = $opt_module_dir // '/usr/lib/inspircd'; - $config{RUNTIME_DIR} = $opt_runtime_dir // '/var/run'; - $config{SCRIPT_DIR} = $opt_script_dir // '/usr/share/inspircd'; + $config{BASE_DIR} = $opt_prefix // '/'; + $config{BINARY_DIR} = $opt_binary_dir // catdir $config{BASE_DIR}, 'usr/sbin'; + $config{CONFIG_DIR} = $opt_config_dir // catdir $config{BASE_DIR}, 'etc/inspircd'; + $config{DATA_DIR} = $opt_data_dir // catdir $config{BASE_DIR}, 'var/lib/inspircd'; + $config{EXAMPLE_DIR} = $opt_example_dir // catdir $config{BASE_DIR}, 'usr/share/doc/inspircd'; + $config{LOG_DIR} = $opt_log_dir // catdir $config{BASE_DIR}, 'var/log/inspircd'; + $config{MANUAL_DIR} = $opt_manual_dir // catdir $config{BASE_DIR}, 'usr/share/man/man1'; + $config{MODULE_DIR} = $opt_module_dir // catdir $config{BASE_DIR}, 'usr/lib/inspircd'; + $config{RUNTIME_DIR} = $opt_runtime_dir // catdir $config{BASE_DIR}, 'var/run/inspircd'; + $config{SCRIPT_DIR} = $opt_script_dir // catdir $config{BASE_DIR}, 'usr/share/inspircd'; } else { $config{BASE_DIR} = rel2abs $opt_prefix // $config{BASE_DIR} // catdir $RealDir, 'run'; $config{BINARY_DIR} = $opt_binary_dir // $config{BINARY_DIR} // catdir $config{BASE_DIR}, 'bin'; @@ -300,6 +297,29 @@ and crashes. Please consider using a different OS like FreeBSD/NetBSD instead. EOW } +# Warn about Perl versions that will not be supported in the future. +if ($^V lt 'v5.26.0') { + print_warning <<"EOW"; +You are building InspIRCd with Perl $^V. This is very old and will +not be supported by the next major version of InspIRCd. Please consider updating +to Perl v5.26 or newer. +EOW +} + +# Warn about compiler versions that will not be supported in the future. +my %future_compilers = ( + AppleClang => version->parse('10.0'), + Clang => version->parse('5.0'), + GCC => version->parse('7.0'), +); +if (exists $future_compilers{$compiler{NAME}} && $compiler{VERSION} lt $future_compilers{$compiler{NAME}}) { + print_warning <<"EOW"; +You are building InspIRCd with $compiler{NAME} v$compiler{VERSION}. This is very old and +will not be supported by the next major version of InspIRCd. Please consider +updating to $compiler{NAME} v$future_compilers{$compiler{NAME}} or newer. +EOW +} + # Check that the user actually wants this version. if (defined $version{REAL_LABEL}) { print_warning <<'EOW'; @@ -322,7 +342,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 +355,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,27 +376,27 @@ 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; } } } elsif (!defined $opt_disable_auto_extras) { - # TODO: finish modulemanager rewrite and replace this code with: - # system './modulemanager', 'enable', '--auto'; my %modules = ( - # Missing: m_ldap, m_regex_stdlib, m_ssl_mbedtls 'm_argon2.cpp' => 'pkg-config --exists libargon2', 'm_geo_maxmind.cpp' => 'pkg-config --exists libmaxminddb', 'm_mysql.cpp' => 'mysql_config --version', 'm_pgsql.cpp' => 'pg_config --version', + 'm_ldap.cpp' => "echo '#include ' | $config{CXX} -E -", 'm_regex_pcre.cpp' => 'pcre-config --version', 'm_regex_posix.cpp' => undef, 'm_regex_re2.cpp' => 'pkg-config --exists re2', + 'm_regex_stdlib.cpp' => "$config{CXX} -o /dev/null -std=c++11 $RealDir/make/test/compiler.cpp", 'm_regex_tre.cpp' => 'pkg-config --exists tre', 'm_sqlite3.cpp' => 'pkg-config --exists sqlite3', 'm_ssl_gnutls.cpp' => 'pkg-config --exists gnutls', + 'm_ssl_mbedtls.cpp' => "echo '#include ' | $config{CXX} -E -", 'm_ssl_openssl.cpp' => 'pkg-config --exists openssl', 'm_sslrehashsignal.cpp' => undef, ); @@ -433,7 +452,7 @@ $config{DISTRIBUTION} = $opt_distribution_label if $opt_distribution_label; write_configure_cache %config; parse_templates \%config, \%compiler, \%version; -print_format <<"EOM"; +print console_format <<"EOM"; Configuration is complete! You have chosen to build with the following settings: @@ -453,10 +472,9 @@ my @makeargs; push @makeargs, "-C${\abs2rel $RealDir}" unless getcwd eq $RealDir; push @makeargs, "-j${\(get_cpu_count() + 1)}"; -print_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} @@ -596,7 +614,7 @@ sub enable_extras(@) { if (-e $modulepath) { print_error "unable to symlink <|GREEN ${\abs2rel $modulepath}|> to <|GREEN ${\abs2rel $extrapath}|>: the target exists and is not a symlink."; } else { - print_format "Enabling the <|GREEN $shortname|> module ...\n"; + say console_format "Enabling the <|GREEN $shortname|> module ..."; symlink $extrapath, $modulepath or print_error "unable to symlink <|GREEN ${\abs2rel $modulepath}|> to <|GREEN ${\abs2rel $extrapath}|>: $!"; } } @@ -619,7 +637,7 @@ sub disable_extras(@) { } elsif ((-e $modulepath && !-e $extrapath) || !-l $modulepath) { print_error "the <|GREEN $shortname|> module is not an extra module!"; } else { - print_format "Disabling the <|GREEN $shortname|> module ...\n"; + say console_format "Disabling the <|GREEN $shortname|> module ..."; unlink $modulepath or print_error "unable to unlink <|GREEN $extrapath|>: $!"; } }