X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=1dc6b3ef199a811b127d195d051e799e88975036;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=d18b02418864c5c16ab90b91fd9b0a2d17486b55;hpb=a23dc3de455c6224ca74ed5d155eb14fd92caf9f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index d18b02418..1dc6b3ef1 100755
--- a/configure
+++ b/configure
@@ -47,8 +47,6 @@ use Getopt::Long;
 # Utility functions for our buildsystem
 use make::utilities;
 use make::configure;
-use make::gnutlscert;
-use make::opensslcert;
 
 ###############################################################################################
 #
@@ -102,8 +100,8 @@ GetOptions (
 	'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing.
 	'enable-extras=s@' => \@opt_enableextras, # ^
 	'disable-extras=s@' => \@opt_disableextras, # ^
-	'generate-openssl-cert' => sub { make_openssl_cert(); exit(0); },
-	'generate-gnutls-cert' => sub { make_gnutls_cert(); exit(0); }
+	'generate-openssl-cert' => sub { exec './tools/genssl openssl'; },
+	'generate-gnutls-cert' => sub { exec './tools/genssl gnutls'; }
 );
 
 if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
@@ -273,7 +271,7 @@ $exec = $config{CC} . " -dumpversion | cut -c 3";
 chomp($config{GCCMINOR}		= `$exec`);
 $config{MAXBUF}			= "512";				# Max buffer size
 
-if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) {
+if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
 	$config{HAS_OPENSSL} = $1;
 } else {
 	$config{HAS_OPENSSL} = "";
@@ -692,7 +690,7 @@ if ($config{USE_GNUTLS} eq "y") {
 * few times and get that HD going :) Then answer the        *
 * Questions which follow. If you are unsure, just hit enter *
 *************************************************************\n\n";
-			$failed = make_gnutls_cert();
+			$failed = system "./tools/genssl gnutls";
 			if ($failed) {
 				print "\n\e[1;32mCertificate generation failed!\e[0m\n\n";
 			} else {
@@ -726,7 +724,7 @@ if ($config{USE_OPENSSL} eq "y") {
 * Generating the certificates may take some time, go grab a *
 * coffee, or something.	                                    *
 *************************************************************\n\n";
-			make_openssl_cert();
+			system "./tools/genssl openssl";
 			print "\nCertificate generation complete, copying to config directory... ";
 			File::Copy::move("key.pem", "$config{CONFIG_DIR}/key.pem") or print STDERR "Could not copy key.pem!\n";
 			File::Copy::move("cert.pem", "$config{CONFIG_DIR}/cert.pem") or print STDERR "Could not copy cert.pem!\n";
@@ -863,7 +861,7 @@ my ($mliflags, $mfrules, $mobjs, $mfcount) = ("", "", "", 0);
 
 sub writefiles {
 	my($writeheader) = @_;
-	# First File.. inspircd_config.h
+	# First File.. config.h
 	chomp(my $incos = `uname -n -s -r`);
 	chomp(my $version = `sh src/version.sh`);
 	chomp(my $revision2 = getrevision());
@@ -874,16 +872,16 @@ sub writefiles {
 	}
 	if ($writeheader == 1)
 	{
-		print "Writing \e[1;32minspircd_config.h\e[0m\n";
-		open(FILEHANDLE, ">include/inspircd_config.h.tmp");
+		print "Writing \e[1;32mconfig.h\e[0m\n";
+		open(FILEHANDLE, ">include/config.h.tmp");
 		print FILEHANDLE <<EOF;
 /* Auto generated by configure, do not modify! */
-#ifndef __CONFIGURATION_AUTO__
-#define __CONFIGURATION_AUTO__
+#pragma once
 
-/* this is for windows support. */
-#define CoreExport /**/
-#define DllExport /**/
+#define BRANCH "$branch"
+#define VERSION "$version"
+#define REVISION "$revision2"
+#define SYSTEM "$incos"
 
 #define CONFIG_PATH "$config{CONFIG_DIR}"
 #define DATA_PATH "$config{DATA_DIR}"
@@ -904,15 +902,6 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
 		if ($config{GCCVER} >= 3) {
 			print FILEHANDLE "#define GCC3\n";
 		}
-		if (
-			(($config{GCCVER} == 4) && ($config{GCCMINOR} >= 3))
-				||
-			($config{GCCVER} > 4)
-				|| # HACK: temporary fix for non-GCC (i.e. clang) builds
-			($config{CC} !~ /gcc/)
-		) {
-			print FILEHANDLE "#define HASHMAP_DEPRECATED\n";
-		}
 		if ($config{HAS_STRLCPY} eq "true") {
 			print FILEHANDLE "#define HAS_STRLCPY\n";
 		}
@@ -956,40 +945,30 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
 				$config{SOCKETENGINE} = "socketengine_select";
 			}
 		}
-		print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n";
+		print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n";
 		close(FILEHANDLE);
-
-		open(FILEHANDLE, ">include/inspircd_version.h.tmp");
-		print FILEHANDLE <<EOF;
-#define BRANCH "$branch"
-#define VERSION "$version"
-#define REVISION "$revision2"
-#define SYSTEM "$incos"
-EOF
-		close FILEHANDLE;
-
-		for my $file (qw(include/inspircd_config.h include/inspircd_version.h)) {
-			my $diff = 0;
-			open my $fh1, $file or $diff = 1;
-			open my $fh2, $file.'.tmp' or die "Can't read $file.tmp that we just wrote: $!";
-			while (!$diff) {
-				my $line1 = <$fh1>;
-				my $line2 = <$fh2>;
-				if (defined($line1) != defined($line2)) {
-					$diff = 1;
-				} elsif (!defined $line1) {
-					last;
-				} else {
-					$diff = ($line1 ne $line2);
-				}
-			}
-			if ($diff) {
-				unlink $file;
-				rename "$file.tmp", $file;
+		
+		my $file = 'include/config.h';
+		my $diff = 0;
+		open my $fh1, $file or $diff = 1;
+		open my $fh2, $file.'.tmp' or die "Can't read $file.tmp that we just wrote: $!";
+		while (!$diff) {
+			my $line1 = <$fh1>;
+			my $line2 = <$fh2>;
+			if (defined($line1) != defined($line2)) {
+				$diff = 1;
+			} elsif (!defined $line1) {
+				last;
 			} else {
-				unlink "$file.tmp";
+				$diff = ($line1 ne $line2);
 			}
 		}
+		if ($diff) {
+			unlink $file;
+			rename "$file.tmp", $file;
+		} else {
+			unlink "$file.tmp";
+		}
 	}
 
 	# Write all .in files.