X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=a384be0813984e296abc8a07f344262d0de8e224;hb=d4f84b8e30915c73630ae753b5b2ba1dc5ab46e6;hp=ef6846e50ad6545e60225e7542d1fc1b79142657;hpb=860b5f5920107e933cf9467941d8b193e6d193a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index ef6846e50..a384be081 100755
--- a/configure
+++ b/configure
@@ -43,6 +43,7 @@ use POSIX                 qw(getgid getuid);
 use make::common;
 use make::configure;
 use make::console;
+use make::directive;
 
 my ($opt_binary_dir,
     $opt_config_dir,
@@ -124,7 +125,7 @@ our $interactive = !(
 );
 
 my %version = get_version();
-print_format "<|BOLD Configuring InspIRCd $version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL} on $^O.|>\n";
+print_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>\n";
 
 our %config;
 if ($interactive) {
@@ -298,6 +299,7 @@ if (prompt_bool $interactive, $question, 0) {
 	# 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';
 }
 
@@ -408,7 +410,7 @@ EXTRA:	for my $extra (@extras) {
 	for my $extra (keys(%extras)) {
 		next unless $extras{$extra} =~ m/enabled/; # only process enabled extras.
 		my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra);
-		my @deps = split /\s+/, get_property($abs_extra, 'ModDep');
+		my @deps = split /\s+/, get_directive($abs_extra, 'ModDep', '');
 		for my $dep (@deps) {
 			if (exists($extras{$dep})) {
 				my $ref = \$extras{$dep}; # Take reference.
@@ -455,7 +457,7 @@ sub enable_extras (@) {
 			next;
 		}
 		# Get dependencies, and add them to be processed.
-		my @deps = split /\s+/, get_property($extrapath, 'ModDep');
+		my @deps = split /\s+/, get_directive($extrapath, 'ModDep', '');
 		for my $dep (@deps) {
 			next if scalar(grep { $_ eq $dep } (@extras)) > 0; # Skip if we're going to be enabling it anyway.
 			if (!-e "src/modules/$dep" && !-e "include/$dep") {
@@ -491,7 +493,7 @@ EXTRA:	for my $extra (@extras) {
 		}
 		# Check if anything needs this.
 		for my $file (@files) {
-			my @deps = split /\s+/, get_property("src/modules/extra/$file", 'ModDep');
+			my @deps = split /\s+/, get_directive("src/modules/extra/$file", 'ModDep', '');
 			# File depends on this extra...
 			if (scalar(grep { $_ eq $extra } @deps) > 0) {
 				# And is both enabled and not about to be disabled.