X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=cd5cf425880e41141855418ef547788b835a1f75;hb=af496f1fea3f9a20607cb6d6ae0603971ba2400d;hp=dc7d113916196938c0f5d6c380d57ac292d1b9a6;hpb=e74da8e6e931326ef833c7bd5bab2fff72360382;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index dc7d11391..cd5cf4258 100755
--- a/configure
+++ b/configure
@@ -152,11 +152,11 @@ $config{BASE_DIR} = $config{ME}."/run";
 
 if (defined $opt_base_dir) {
 	$config{BASE_DIR} = $opt_base_dir;
-} elsif (defined $opt_system || defined $opt_uid) {
+} elsif (defined $opt_system) {
 	$config{BASE_DIR} = '/var/lib/inspircd';
 }
 
-if (defined $opt_system || defined $opt_uid) {
+if (defined $opt_system) {
 	$config{UID} = $opt_uid || 'ircd';
 	$config{CONFIG_DIR}	 = '/etc/inspircd';
 	$config{MODULE_DIR}	 = '/usr/lib/inspircd';
@@ -165,7 +165,7 @@ if (defined $opt_system || defined $opt_uid) {
 	$config{DATA_DIR}	 = '/var/inspircd';
 	$config{LOG_DIR}	 = '/var/log/inspircd';
 } else {
-	$config{UID} = $<;
+	$config{UID} = $opt_uid || $<;
 	$config{CONFIG_DIR}	 = resolve_directory($config{BASE_DIR}."/conf");	# Configuration Directory
 	$config{MODULE_DIR}	 = resolve_directory($config{BASE_DIR}."/modules");	# Modules Directory
 	$config{BINARY_DIR}	 = resolve_directory($config{BASE_DIR}."/bin");		# Binary Directory
@@ -273,7 +273,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} = "";
@@ -904,15 +904,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";
 		}