X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=a384be0813984e296abc8a07f344262d0de8e224;hb=bdfde49fb6d9a8787c072b759d4af27584308e1b;hp=c4f0dffc79eb53afff9dc02ca49353ad988c6f93;hpb=7404ba8b66083c2fbb19c638da85c252551792a2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index c4f0dffc7..a384be081 100755 --- a/configure +++ b/configure @@ -27,9 +27,10 @@ BEGIN { - require 5.8.0; + require 5.10.0; } +use feature ':5.10'; use strict; use warnings FATAL => qw(all); @@ -42,10 +43,12 @@ use POSIX qw(getgid getuid); use make::common; use make::configure; use make::console; +use make::directive; my ($opt_binary_dir, $opt_config_dir, $opt_data_dir, + $opt_development, $opt_disable_interactive, $opt_distribution_label, $opt_gid, @@ -71,6 +74,7 @@ GetOptions( 'help' => \&cmd_help, 'update' => \&cmd_update, + 'development' => \$opt_development, 'disable-interactive' => \$opt_disable_interactive, 'distribution-label=s' => \$opt_distribution_label, 'binary-dir=s' => \$opt_binary_dir, @@ -107,6 +111,7 @@ our $interactive = !( defined $opt_binary_dir || defined $opt_config_dir || defined $opt_data_dir || + defined $opt_development || defined $opt_disable_interactive || defined $opt_distribution_label || defined $opt_gid || @@ -120,7 +125,7 @@ our $interactive = !( ); my %version = get_version(); -print_format "<|BOLD Configuring InspIRCd $version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL} on $^O.|>\n"; +print_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>\n"; our %config; if ($interactive) { @@ -134,7 +139,7 @@ if ($interactive) { } } -$config{CXX} = find_compiler($config{CXX} || $ENV{CXX}); +$config{CXX} = find_compiler($config{CXX} // $ENV{CXX}); unless ($config{CXX}) { print "A suitable C++ compiler could not be detected on your system!\n"; print "Set the CXX environment variable to the compiler binary path if this is incorrect.\n"; @@ -146,24 +151,24 @@ $config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, $config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp'); if ($config{HAS_EPOLL} = run_test 'epoll', test_header($config{CXX}, 'sys/epoll.h')) { - $config{SOCKETENGINE} ||= 'epoll'; + $config{SOCKETENGINE} //= 'epoll'; } if ($config{HAS_KQUEUE} = run_test 'kqueue', test_file($config{CXX}, 'kqueue.cpp')) { - $config{SOCKETENGINE} ||= 'kqueue'; + $config{SOCKETENGINE} //= 'kqueue'; } if ($config{HAS_PORTS} = run_test 'Solaris IOCP', test_header($config{CXX}, 'port.h')) { - $config{SOCKETENGINE} ||= 'ports'; + $config{SOCKETENGINE} //= 'ports'; } if ($config{HAS_POLL} = run_test 'poll', test_header($config{CXX}, 'poll.h')) { - $config{SOCKETENGINE} ||= 'poll'; + $config{SOCKETENGINE} //= 'poll'; } # Select is available on all platforms $config{HAS_SELECT} = 1; -$config{SOCKETENGINE} ||= 'select'; +$config{SOCKETENGINE} //= 'select'; if (defined $opt_socketengine) { my $cfgkey = 'HAS_' . uc $opt_socketengine; @@ -188,21 +193,21 @@ if (defined $opt_distribution_label) { } if (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{LOG_DIR} = $opt_module_dir || '/var/log/inspircd'; - $config{MANUAL_DIR} = $opt_manual_dir || '/usr/share/man/man1'; - $config{MODULE_DIR} = $opt_module_dir || '/usr/lib/inspircd'; + $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{LOG_DIR} = $opt_module_dir // '/var/log/inspircd'; + $config{MANUAL_DIR} = $opt_manual_dir // '/usr/share/man/man1'; + $config{MODULE_DIR} = $opt_module_dir // '/usr/lib/inspircd'; } else { - $config{BASE_DIR} = $opt_prefix || $config{BASE_DIR} || rel2abs 'run'; - $config{BINARY_DIR} = $opt_binary_dir || $config{BINARY_DIR} || rel2abs $config{BASE_DIR} . '/bin'; - $config{CONFIG_DIR} = $opt_config_dir || $config{CONFIG_DIR} || rel2abs $config{BASE_DIR} . '/conf'; - $config{DATA_DIR} = $opt_data_dir || $config{DATA_DIR} || rel2abs $config{BASE_DIR} . '/data'; - $config{LOG_DIR} = $opt_log_dir || $config{LOG_DIR} || rel2abs $config{BASE_DIR} . '/logs'; - $config{MANUAL_DIR} = $opt_manual_dir || $config{MANUAL_DIR} || rel2abs $config{BASE_DIR} . '/manuals'; - $config{MODULE_DIR} = $opt_module_dir || $config{MODULE_DIR} || rel2abs $config{BASE_DIR} . '/modules'; + $config{BASE_DIR} = $opt_prefix // $config{BASE_DIR} // rel2abs 'run'; + $config{BINARY_DIR} = $opt_binary_dir // $config{BINARY_DIR} // rel2abs $config{BASE_DIR} . '/bin'; + $config{CONFIG_DIR} = $opt_config_dir // $config{CONFIG_DIR} // rel2abs $config{BASE_DIR} . '/conf'; + $config{DATA_DIR} = $opt_data_dir // $config{DATA_DIR} // rel2abs $config{BASE_DIR} . '/data'; + $config{LOG_DIR} = $opt_log_dir // $config{LOG_DIR} // rel2abs $config{BASE_DIR} . '/logs'; + $config{MANUAL_DIR} = $opt_manual_dir // $config{MANUAL_DIR} // rel2abs $config{BASE_DIR} . '/manuals'; + $config{MODULE_DIR} = $opt_module_dir // $config{MODULE_DIR} // rel2abs $config{BASE_DIR} . '/modules'; } # Parse --gid=123 or --gid=foo and extract the group id. @@ -211,7 +216,7 @@ if (defined $opt_gid) { @group = $opt_gid =~ /^\d+$/ ? getgrgid($opt_gid) : getgrnam($opt_gid); print_error "there is no '$opt_gid' group on this system!" unless @group; } else { - @group = $opt_system ? getgrnam('irc') : getgrgid($config{GID} || getgid()); + @group = $opt_system ? getgrnam('irc') : getgrgid($config{GID} // getgid()); print_error "you need to specify a group to run as using '--gid [id|name]'!" unless @group; } $config{GROUP} = $group[0]; @@ -223,7 +228,7 @@ if (defined $opt_uid) { @user = $opt_uid =~ /^\d+$/ ? getpwuid($opt_uid) : getpwnam($opt_uid); print_error "there is no '$opt_uid' user on this system!" unless @user; } else { - @user = $opt_system ? getpwnam('irc') : getpwuid($config{UID} || getuid()); + @user = $opt_system ? getpwnam('irc') : getpwuid($config{UID} // getuid()); print_error "you need to specify a user to run as using '--uid [id|name]'!" unless @user; } $config{USER} = $user[0]; @@ -233,7 +238,7 @@ $config{UID} = $user[2]; system 'tput', 'clear' if $interactive; # Check that the user actually wants this version. -if ($version{LABEL} ne 'release' && $interactive) { +if ($version{LABEL} ne 'release') { print_warning <<'EOW'; You are building a development version. This contains code which has not been tested as heavily and may contain various faults which could seriously @@ -242,9 +247,11 @@ version instead. You can obtain the latest stable version from http://www.inspircd.org/ or by running `git checkout insp20` if you are installing from Git. - EOW -exit 1 unless prompt_bool $interactive, 'I understand this warning and want to continue anyway.', !$interactive; + if (!prompt_bool $interactive, 'I understand this warning and want to continue anyway.', $opt_development // 0) { + say STDERR 'If you understand this warning and still want to continue pass the --development flag.' unless $interactive; + exit 1; + } } # Configure directory settings. @@ -267,10 +274,10 @@ if (prompt_bool $interactive, $question, 0) { foreach my $key (qw(BINARY_DIR CONFIG_DIR DATA_DIR LOG_DIR MANUAL_DIR MODULE_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}; + $config{BINARY_DIR} = prompt_dir $interactive, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR}; $config{CONFIG_DIR} = prompt_dir $interactive, 'In what directory are configuration files to be stored?', $config{CONFIG_DIR}; - $config{DATA_DIR} = prompt_dir $interactive, 'In what directory are variable data files to be stored?', $config{DATA_DIR}; - $config{LOG_DIR} = prompt_dir $interactive, 'In what directory are log files to be stored?', $config{LOG_DIR}; + $config{DATA_DIR} = prompt_dir $interactive, 'In what directory are variable data files to be stored?', $config{DATA_DIR}; + $config{LOG_DIR} = prompt_dir $interactive, 'In what directory are log files to be stored?', $config{LOG_DIR}; $config{MANUAL_DIR} = prompt_dir $interactive, 'In what directory are manual pages to be placed?', $config{MANUAL_DIR}; $config{MODULE_DIR} = prompt_dir $interactive, 'In what directory are modules to be placed?', $config{MODULE_DIR}; } @@ -291,8 +298,9 @@ if (prompt_bool $interactive, $question, 0) { } else { # TODO: finish modulemanager rewrite and replace this code with: # system './modulemanager', 'enable', '--auto'; - enable_extras 'm_ssl_gnutls.cpp' unless system 'gnutls-cli --version >/dev/null 2>&1'; - enable_extras 'm_ssl_openssl.cpp' unless system 'openssl --version >/dev/null 2>&1'; + enable_extras 'm_ssl_gnutls.cpp' unless system 'pkg-config --exists gnutls >/dev/null 2>&1'; + enable_extras 'm_ssl_mbedtls.cpp' if -e '/usr/include/mbedtls/ssl.h'; + enable_extras 'm_ssl_openssl.cpp' unless system 'pkg-config --exists openssl >/dev/null 2>&1'; } # Generate SSL certificates. @@ -300,7 +308,7 @@ if ( && prompt_bool $interactive, 'Would you like to ge system './tools/genssl', 'auto'; } -write_configure_cache %config if $interactive; +write_configure_cache %config; parse_templates \%config, \%compiler, \%version; print_format <<"EOM"; @@ -312,10 +320,15 @@ Configuration is complete! You have chosen to build with the following settings: <|GREEN Name:|> $compiler{NAME} <|GREEN Version:|> $compiler{VERSION} -<|GREEN Extra Modules:|> <> - * m_foo - * m_bar - * m_baz +<|GREEN Extra Modules:|> +EOM + +for my $file () { + my $module = basename $file, '.cpp'; + say " * $module" if -l $file; +} + +print_format <<"EOM"; <|GREEN Paths:|> <|GREEN Base:|> $config{BASE_DIR} @@ -397,7 +410,7 @@ EXTRA: for my $extra (@extras) { for my $extra (keys(%extras)) { next unless $extras{$extra} =~ m/enabled/; # only process enabled extras. my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra); - my @deps = split /\s+/, get_property($abs_extra, 'ModDep'); + my @deps = split /\s+/, get_directive($abs_extra, 'ModDep', ''); for my $dep (@deps) { if (exists($extras{$dep})) { my $ref = \$extras{$dep}; # Take reference. @@ -444,7 +457,7 @@ sub enable_extras (@) { next; } # Get dependencies, and add them to be processed. - my @deps = split /\s+/, get_property($extrapath, 'ModDep'); + my @deps = split /\s+/, get_directive($extrapath, 'ModDep', ''); for my $dep (@deps) { next if scalar(grep { $_ eq $dep } (@extras)) > 0; # Skip if we're going to be enabling it anyway. if (!-e "src/modules/$dep" && !-e "include/$dep") { @@ -480,7 +493,7 @@ EXTRA: for my $extra (@extras) { } # Check if anything needs this. for my $file (@files) { - my @deps = split /\s+/, get_property("src/modules/extra/$file", 'ModDep'); + my @deps = split /\s+/, get_directive("src/modules/extra/$file", 'ModDep', ''); # File depends on this extra... if (scalar(grep { $_ eq $extra } @deps) > 0) { # And is both enabled and not about to be disabled.