X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=cd5cf425880e41141855418ef547788b835a1f75;hb=af496f1fea3f9a20607cb6d6ae0603971ba2400d;hp=d18b02418864c5c16ab90b91fd9b0a2d17486b55;hpb=98b4025af9bbbb40cf74552016972247605e0e1e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index d18b02418..cd5cf4258 100755 --- a/configure +++ b/configure @@ -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"; }