Fix detection of the ldap, regex_stdlib, and ssl_mbedtls module deps.

I am so sorry for writing this cursed magic.

1 files changed, 3 insertions, 6 deletions

diff --git a/configure b/configure
index ccf6cbd6a..de9e93777 100755
--- a/configure
+++ b/configure
@@ -385,22 +385,19 @@ if (prompt_bool $interactive, $question, 0) {
 	}
 } elsif (!defined $opt_disable_auto_extras) {
 	my %modules = (
-		# We can't automatically enable the following modules because there is
-		# no way to autodetect their dependencies:
-		#
-		#  * ldap (no pkg-config support)
-		#  * regex_stdlib (no C++11 compiler detection)
-		#  * ssl_mbedtls (no pkg-config support)
 		'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,
 	);