Move the <disabled> tag out of the core to a new module.

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

diff --git a/configure b/configure
index ee11086b5d856cb792b63eb316e559ff922ddb6d..f61143974b3be57a884ad089d025dd6e320394ef 100755 (executable)
--- a/configure
+++ b/configure
@@ -244,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 insp3)|>` 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;
@@ -298,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.