X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=896ded1c40fd79dee2575fc1c468cbfd32d4a051;hb=131f659d91953c51823ef70c8314aa3170ce7a7e;hp=2170828463efc088a7b8df82600473b8fa20f7e4;hpb=651413bbc57da7b9a30d99d1dfabdaf49dfd3604;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 217082846..896ded1c4 100755
--- a/configure
+++ b/configure
@@ -147,7 +147,7 @@ print_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>\n";
 my %config;
 if ($interactive) {
 	%config = read_config_file(CONFIGURE_CACHE_FILE);
-	run_test CONFIGURE_CACHE_FILE, %config;
+	run_test abs2rel(CONFIGURE_CACHE_FILE, $RealDir), %config;
 	if (!defined $config{VERSION}) {
 		$config{VERSION} = CONFIGURE_CACHE_VERSION;
 	} elsif ($config{VERSION} != CONFIGURE_CACHE_VERSION) {
@@ -355,7 +355,7 @@ if (prompt_bool $interactive, $question, 0) {
 	foreach my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
 		my $module_name = basename $extra, '.cpp';
 		if (prompt_bool $interactive, "Would you like to enable $module_name?", 0) {
-			enable_extras "$module_name.cpp";
+			enable_extras $module_name;
 		}
 	}
 } elsif (!defined $opt_disable_auto_extras) {
@@ -363,6 +363,7 @@ if (prompt_bool $interactive, $question, 0) {
 	# 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',
@@ -393,9 +394,10 @@ EOQ
 
 if (<$RealDir/src/modules/m_ssl_*.cpp>) {
 	if (prompt_bool $interactive, $question, $interactive) {
-		system './tools/genssl', 'auto';
+		create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!";
+		system './tools/genssl', 'auto', CONFIGURE_DIRECTORY;
 	} else {
-		my @pems = <$RealDir/{cert,csr,dhparams,key}.pem>;
+		my @pems = <${\CONFIGURE_DIRECTORY}/{cert,csr,dhparams,key}.pem>;
 		$question = <<EOQ;
 The following self-signed files were previously generated and will be installed
 when you run Make. Do you want to delete them?