From bac02a28005f06a7ea872cf8a7a6718bb2099f70 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Fri, 5 Jul 2013 08:07:52 +0100
Subject: Replace arguments for toggling socketengines  with --socketengine.

---
 make/calcdep.pl   |  4 ++--
 make/configure.pm | 29 +++++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'make')

diff --git a/make/calcdep.pl b/make/calcdep.pl
index e578f585c..26be367f5 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -78,7 +78,7 @@ END
 	for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
 		my $out = find_output $file;
 		dep_cpp $file, $out, 'gen-o';
-		next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
+		next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
 		push @core_deps, $out;
 	}
 
@@ -148,7 +148,7 @@ END
 			mkdir "$ENV{BUILDPATH}/obj/$1";
 		}
 		dep_cpp $file, $out, 'gen-o';
-		next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
+		next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
 		push @deps, $out;
 		push @srcs, $file;
 	}
diff --git a/make/configure.pm b/make/configure.pm
index 95499720f..abb706ddd 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -271,11 +271,9 @@ sub dumphash()
 	print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
 	print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
 	print "\e[0mCompiler:\e[1;32m\t\t\t$main::cxx{NAME} $main::cxx{VERSION}\e[0m\n";
-	print "\e[0mGnuTLS Support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
-	print "\e[0mOpenSSL Support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n\n";
-	print "\e[1;32mImportant note: The maximum length values are now configured in the\e[0m\n";
-	print "\e[1;32m                configuration file, not in ./configure! See the <limits>\e[0m\n";
-	print "\e[1;32m                tag in the configuration file for more information.\e[0m\n\n";
+	print "\e[0mSocket engine:\e[1;32m\t\t\t$main::config{SOCKETENGINE}\e[0m\n";
+	print "\e[0mGnuTLS support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
+	print "\e[0mOpenSSL support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n";
 }
 
 sub is_dir
@@ -297,6 +295,12 @@ sub is_dir
 sub showhelp
 {
 	chomp(my $PWD = `pwd`);
+	my (@socketengines, $SELIST);
+	foreach (<src/socketengines/socketengine_*.cpp>) {
+		s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
+		push(@socketengines, $1);
+	}
+	$SELIST = join(", ", @socketengines);
 	print <<EOH;
 Usage: configure [options]
 
@@ -321,12 +325,8 @@ InspIRCd 1.0.x, are also allowed.
   --clean                      Remove .config.cache file and go interactive
   --enable-gnutls              Enable GnuTLS module [no]
   --enable-openssl             Enable OpenSSL module [no]
-  --enable-epoll               Enable epoll() where supported [set]
-  --enable-kqueue              Enable kqueue() where supported [set]
-  --disable-epoll              Do not enable epoll(), fall back
-                               to select() [not set]
-  --disable-kqueue             Do not enable kqueue(), fall back
-                               to select() [not set]
+  --socketengine=[name]        Sets the socket engine to be used. Possible values are
+                               $SELIST.
   --prefix=[directory]         Base directory to install into (if defined,
                                can automatically define config, module, bin
                                and library dirs as subdirectories of prefix)
@@ -334,9 +334,10 @@ InspIRCd 1.0.x, are also allowed.
   --config-dir=[directory]     Config file directory for config and SSL certs
                                [$PWD/conf]
   --log-dir=[directory]	       Log file directory for logs
-			       [$PWD/logs]
-  --data-dir=[directory]       Data directory for variable data, such as the permchannel configuration and the XLine database
-			       [$PWD/data]
+                               [$PWD/logs]
+  --data-dir=[directory]       Data directory for variable data, such as the permchannel
+                               configuration and the XLine database
+                               [$PWD/data]
   --module-dir=[directory]     Modules directory for loadable modules
                                [$PWD/modules]
   --binary-dir=[directory]     Binaries directory for core binary
-- 
cgit v1.2.3