From 0fc595caac348944f1154cc7dabf44e206e58bf5 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 27 Oct 2018 04:27:16 +0100 Subject: Enable as many extra modules as possible when running configure. --- configure | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 3badba2c6..08022d5ec 100755 --- a/configure +++ b/configure @@ -299,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. -- cgit v1.2.3