X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=6336af807b44b60086f209bb64f409114c9a645b;hb=3f455b1747f822e867c37bc8902e51b5a36efba7;hp=a95cf3da4a7500f8b2f7920aed9e618321a9de0b;hpb=b1add86f04df458a75e7f2badf7ba72037d562fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index a95cf3da4..6336af807 100755
--- a/configure
+++ b/configure
@@ -47,8 +47,8 @@ GetOptions (
 	'binary-dir=s' => \$opt_binary_dir,
 	'library-dir=s' => \$opt_library_dir,
 	'help'	=> sub { showhelp(); },
-	'modupdate' => sub { update(); },
-	'update' => sub { modupdate(); },
+	'modupdate' => sub { modupdate(); },
+	'update' => sub { update(); },
 	'svnupdate' => sub { svnupdate(); },
 	'clean' => sub { clean(); },
 );
@@ -247,7 +247,7 @@ if (defined $opt_away)
 
 $no_svn = 0;
 
-$config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
+$config{HAS_OPENSSL} =~ /OpenSSL ([-[:digit:].]+)([a-z])?(\-[a-z][0-9])? (\w{3}|[0-9]+) (\w{3}|[0-9]+) [0-9]{4}/;
 $config{HAS_OPENSSL} = $1;
 
 if ($config{GCCVER} eq "") {
@@ -294,6 +294,9 @@ sub clean
 
 sub update
 {
+	chomp($topdir = getcwd());
+	$this = resolve_directory($topdir);                                             # PWD, Regardless.
+	getmodules();
 	# Does the cache file exist?
 	if (!getcache()) {
 		# No, No it doesn't.. *BASH*
@@ -313,6 +316,9 @@ sub update
 
 sub modupdate
 {
+	chomp($topdir = getcwd());
+	$this = resolve_directory($topdir);                                             # PWD, Regardless.
+	getmodules();
         # Does the cache file exist?
         if (!getcache()) {
                 # No, No it doesn't.. *BASH*
@@ -872,6 +878,17 @@ print "\033[0mIPv6 to IPv4 Links:\033[1;32m\t\t$config{SUPPORT_IP6LINKS}\033[0m\
 print "\033[0mGnuTLS Support:\033[1;32m\t\t\t$config{USE_GNUTLS}\033[0m\n";
 print "\033[0mOpenSSL Support:\033[1;32m\t\t$config{USE_OPENSSL}\033[0m\n\n";
 
+if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
+{
+	print "Sorry, but i couldn't detect gnutls. Make sure gnutls-config is in your path.\n";
+	exit(0);
+}
+if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y"))
+{
+	print "Sorry, but i couldn't detect openssl. Make sure openssl is in your path.\n";
+	exit(0);
+}
+
 if ($config{USE_GNUTLS} eq "y") {
 	$failed = 0;
 	open(TMP, "<src/modules/m_ssl_gnutls.cpp") or $failed = 1;