X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure;h=7dbccadf238b19e9190108782dd806a247d0fed7;hb=c6610ad5da14ea4a1f45f0fc85d42c86975cb2a0;hp=fd00ff89c04ace244a996c09f27d0463a2f0fe0f;hpb=e6601069038c35c546fd3f3dce95024b0d13f1b4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index fd00ff89c..7dbccadf2 100755
--- a/configure
+++ b/configure
@@ -28,6 +28,7 @@
 
 BEGIN {
 	require 5.8.0;
+	push @INC, '.';
 }
 
 use strict;
@@ -965,6 +966,9 @@ EOF
 	my @dotfiles = qw(main.mk inspircd);
 	push @dotfiles, 'org.inspircd.plist' if $config{OSNAME} eq 'darwin';
 
+	# HACK: we need to know if we are on GCC6 to disable the omission of `this` null pointer checks.
+	$config{GCC6} = `$config{CC} --version 2>/dev/null` =~ /gcc/i && $config{GCCVER} ge "6" ? "true" : "false";
+
 	foreach my $file (@dotfiles) {
 		open(FILEHANDLE, "make/template/$file") or die "Can't open make/template/$file: $!";
 		$_ = join '', <FILEHANDLE>;
@@ -974,7 +978,7 @@ EOF
 
 		for my $var (qw(
 			CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
-			STARTSCRIPT DESTINATION SOCKETENGINE LOG_DIR
+			STARTSCRIPT DESTINATION SOCKETENGINE LOG_DIR GCC6
 		)) {
 			s/\@$var\@/$config{$var}/g;
 		}