X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=e3aaed040f14bfaa32c15905d5f37d6360ffd075;hb=6c2b6fa23d3a65ecdcebbf9154b8daa2e55727e9;hp=a980aee98c3fa53232e87e51c258b37782d6d128;hpb=102c54990c8ae10943f4f0ac36b5e80b7b900268;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index a980aee98..e3aaed040 100755
--- a/configure
+++ b/configure
@@ -101,7 +101,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; },
@@ -308,6 +307,20 @@ 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';
@@ -371,20 +384,20 @@ if (prompt_bool $interactive, $question, 0) {
 		}
 	}
 } 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 <ldap.h>' | $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 <mbedtls/version.h>' | $config{CXX} -E -",
 		'm_ssl_openssl.cpp'     => 'pkg-config --exists openssl',
 		'm_sslrehashsignal.cpp' => undef,
 	);