Improve manually enabling extra modules.

- Allow modules to be specified without their prefix and extensions
  in --{disable,enable}-extras.
- Allow modules to be space delimited in --{disable,enable}-extras.

1 files changed, 6 insertions, 2 deletions

diff --git a/configure b/configure
index a53d0ee6d..326f69e93 100755
--- a/configure
+++ b/configure
@@ -106,8 +106,8 @@ exit 1 unless GetOptions(
 );
 
 if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
-	@opt_enableextras = split /,/, join(',', @opt_enableextras);
-	@opt_disableextras = split /,/, join(',', @opt_disableextras);
+	@opt_enableextras = split /[, ]+/, join(',', @opt_enableextras);
+	@opt_disableextras = split /[, ]+/, join(',', @opt_disableextras);
 	enable_extras(@opt_enableextras);
 	disable_extras(@opt_disableextras);
 	list_extras;
@@ -534,6 +534,8 @@ EXTRA:	for my $extra (@extras) {
 sub enable_extras (@) {
 	my (@extras) = @_;
 	for my $extra (@extras) {
+		$extra = "m_$extra" unless $extra =~ /^m_/;
+		$extra = "$extra.cpp" unless $extra =~ /\.cpp$/;
 		my $extrapath = "src/modules/extra/$extra";
 		if (!-e $extrapath) {
 			print STDERR "Cannot enable \e[32;1m$extra\e[0m : No such file or directory in src/modules/extra\n";
@@ -569,6 +571,8 @@ sub disable_extras (@)
 	closedir $dd;
 	my (@extras) = @_;
 EXTRA:	for my $extra (@extras) {
+		$extra = "m_$extra" unless $extra =~ /^m_/;
+		$extra = "$extra.cpp" unless $extra =~ /\.cpp$/;
 		my $extrapath = "src/modules/extra/$extra";
 		my $source = "src/modules/$extra";
 		if (!-e $extrapath) {