X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=08022d5ec4b8609be85469dddd286c106e8eeac1;hb=b30988ee6069a6ebe0805fb79a057d7e05688bc6;hp=db0464d19733d8635c3fc563aa61062cdec727cd;hpb=27e92622b5655c3ecf3182bc511adfb8a07b8722;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index db0464d19..08022d5ec 100755
--- a/configure
+++ b/configure
@@ -159,6 +159,7 @@ unless ($config{CXX}) {
 }
 my %compiler = get_compiler_info($config{CXX});
 
+$config{HAS_ARC4RANDOM_BUF} = run_test 'arc4random_buf()', test_file($config{CXX}, 'arc4random_buf.cpp');
 $config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, 'clock_gettime.cpp', $^O eq 'darwin' ? undef : '-lrt');
 $config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp');
 
@@ -243,7 +244,8 @@ affect the running of your server. It is recommended that you use a stable
 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.
+running `<|GREEN git checkout $(git describe --abbrev=0 --tags insp20)|>` if you are
+installing from Git.
 EOW
 	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;
@@ -297,9 +299,25 @@ 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 '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';
+	my %modules = (
+		# Missing: m_ldap, m_regex_stdlib, m_ssl_mbedtls
+		'm_geoip.cpp'           => 'pkg-config --exists geoip',
+		'm_mysql.cpp'           => 'mysql_config --version',
+		'm_pgsql.cpp'           => 'pg_config --version',
+		'm_regex_pcre.cpp'      => 'pcre-config --version',
+		'm_regex_posix.cpp'     => undef,
+		'm_regex_re2.cpp'       => 'pkg-config --exists re2',
+		'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_openssl.cpp'     => 'pkg-config --exists openssl',
+		'm_sslrehashsignal.cpp' => undef,
+	);
+	while (my ($module, $command) = each %modules) {
+		unless (defined $command && system "$command 1>/dev/null 2>/dev/null") {
+			enable_extras $module;
+		}
+	}
 }
 
 # Generate SSL certificates.