X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure;h=f3aea791f38a5b8aa29998d1d2680669d3060413;hb=39ddf2fb7a4d030fc29a7d421e09394cd70dc9bf;hp=2eba9edb11b5f1b5f67a4ba79afe2c0927764ec5;hpb=e5cfa9c0c295596f688a18f5562cbb73b8e3997c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 2eba9edb1..f3aea791f 100755
--- a/configure
+++ b/configure
@@ -28,6 +28,7 @@
 
 BEGIN {
 	require 5.8.0;
+	push @INC, '.';
 }
 
 use strict;
@@ -268,10 +269,9 @@ if (defined $opt_cc)
 {
 	$config{CC} = $opt_cc;
 }
-our $exec = $config{CC} . " -dumpversion | cut -c 1";
-chomp($config{GCCVER}		= `$exec`);				# Major GCC Version
-$exec = $config{CC} . " -dumpversion | cut -c 3";
-chomp($config{GCCMINOR}		= `$exec`);
+`$config{CC} -dumpversion` =~ /^(\d+)(?:\.(\d+))?/;
+$config{GCCVER} = defined $1 ? $1 : '';
+$config{GCCMINOR} = defined $2 ? $2 : '0';
 $config{MAXBUF}			= "512";				# Max buffer size
 
 if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
@@ -347,20 +347,13 @@ print ($cache_loaded ? "found\n" : "not found\n");
 $config{SYSTEM} = lc $^O;
 print "Checking operating system version... $config{SYSTEM}\n";
 
-$exec = $config{CC} . " -dumpversion | cut -c 1";
-chomp($config{GCCVER}		= `$exec`);				# Major GCC Version
-$exec = $config{CC} . " -dumpversion | cut -c 3";
-chomp($config{GCCMINOR}		= `$exec`);
+`$config{CC} -dumpversion` =~ /^(\d+)(?:\.(\d+))?/;
+$config{GCCVER} = defined $1 ? $1 : '';
+$config{GCCMINOR} = defined $2 ? $2 : '0';
 
 printf "Checking if stdint.h exists... ";
-$config{HAS_STDINT} = "true";
-our $fail = 0;
-open(STDINT, "</usr/include/stdint.h") or $config{HAS_STDINT} = "false";
-if ($config{HAS_STDINT} eq "true") {
-	close(STDINT);
-}
-print "yes\n" if $config{HAS_STDINT} eq "true";
-print "no\n" if $config{HAS_STDINT} eq "false";
+$config{HAS_STDINT} = test_compile('stdint');
+print $config{HAS_STDINT} ? "yes\n" : "no\n";
 
 printf "Checking if strlcpy exists... ";
 $config{HAS_STRLCPY} = test_compile('strlcpy');
@@ -375,8 +368,8 @@ $has_epoll = test_compile('epoll');
 print $has_epoll ? "yes\n" : "no\n";
 
 printf "Checking for eventfd support... ";
-$config{HAS_EVENTFD} = test_compile('eventfd') ? 'true' : 'false';
-print $config{HAS_EVENTFD} eq 'true' ? "yes\n" : "no\n";
+$config{HAS_EVENTFD} = test_compile('eventfd');
+print $config{HAS_EVENTFD} ? "yes\n" : "no\n";
 
 printf "Checking if Solaris I/O completion ports are available... ";
 $has_ports = 0;
@@ -494,8 +487,9 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 			}
 			chomp(my $foo = `$config{CC} -dumpversion | cut -c 1`);
 			if ($foo ne "") {
-				chomp($config{GCCVER}       = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change compilers
-				chomp($config{GCCMINOR}     = `$config{CC} -dumpversion | cut -c 3`);
+				`$config{CC} -dumpversion` =~ /^(\d+)(?:\.(\d+))?/;
+				$config{GCCVER} = defined $1 ? $1 : '';
+				$config{GCCMINOR} = defined $2 ? $2 : '0';
 				print "Queried compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.$config{GCCMINOR}\e[0m)\n";
 				if ($config{GCCVER} < 3) {
 					print "\e[1;32mGCC 2.x WILL NOT WORK!\e[0m. Let's try that again, shall we?\n";
@@ -722,7 +716,7 @@ if (($config{USE_GNUTLS} eq "y") || ($config{USE_OPENSSL} eq "y")) {
 	print "Please note: for \e[1;32mSSL support\e[0m you will need to load required\n";
 	print "modules in your config. This configure script has added those modules to the\n";
 	print "build process. For more info, please refer to:\n";
-	print "\e[1;32mhttp://wiki.inspircd.org/Installation_From_Tarball\e[0m\n";
+	print "\e[1;32mhttps://wiki.inspircd.org/Installation_From_Tarball\e[0m\n";
 }
 print "*** \e[1;32mRemember to edit your configuration files!!!\e[0m ***\n\n\n";
 if (($config{OSNAME} eq "OpenBSD") && ($config{CC} ne "eg++")) {
@@ -739,6 +733,14 @@ to a newer 3.x or 4.x (or whatever is available currently) version.
 FOO2
 }
 
+if ($^O eq 'openbsd') {
+	print <<__OPENBSD_WARNING__;
+\e[1;32mWARNING!\e[0m OpenBSD 6.5 changed Make to no longer look for BSDmakefile when
+searching for the makefile. If the version of OpenBSD you are using is 6.5 or
+newer then you will need to run '\e[1;32mmake -f BSDmakefile\e[0m' or '\e[1;32mgmake\e[0m' instead.
+__OPENBSD_WARNING__
+}
+
 ################################################################################
 #			      HELPER FUNCTIONS				#
 ################################################################################
@@ -845,8 +847,8 @@ sub writefiles {
 		open(FILEHANDLE, ">include/inspircd_config.h.tmp");
 		print FILEHANDLE <<EOF;
 /* Auto generated by configure, do not modify! */
-#ifndef __CONFIGURATION_AUTO__
-#define __CONFIGURATION_AUTO__
+#ifndef INSPIRCD_CONFIG_H
+#define INSPIRCD_CONFIG_H
 
 /* this is for windows support. */
 #define CoreExport /**/
@@ -871,17 +873,21 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
 		if ($config{GCCVER} >= 3) {
 			print FILEHANDLE "#define GCC3\n";
 		}
-		if ($config{HAS_STRLCPY} eq "true") {
+		if ($config{HAS_STRLCPY}) {
 			print FILEHANDLE "#define HAS_STRLCPY\n";
 		}
-		if ($config{HAS_STDINT} eq "true") {
+		if ($config{HAS_STDINT}) {
 			print FILEHANDLE "#define HAS_STDINT\n";
 		}
-		if ($config{HAS_EVENTFD} eq 'true') {
+		if ($config{HAS_EVENTFD}) {
 			print FILEHANDLE "#define HAS_EVENTFD\n";
 		}
 		if ($config{OSNAME} !~ /DARWIN/i) {
 			print FILEHANDLE "#define HAS_CLOCK_GETTIME\n";
+		} else {
+			print FILEHANDLE "#ifdef MAC_OS_X_VERSION_10_12\n";
+			print FILEHANDLE "# define HAS_CLOCK_GETTIME\n";
+			print FILEHANDLE "#endif\n";
 		}
 		my $use_hiperf = 0;
 		if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
@@ -971,6 +977,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>;
@@ -980,7 +989,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;
 		}