X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=4ce4436a9b3322689e8050db11528c1b3655004e;hb=981ca37d6641404548a13623b90438f8f1c87ded;hp=389aa64066173eb7f7f455a6219f6f54c7632329;hpb=93ba2fbfbba369024ceee96a4eb4f5d228329c0e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 389aa6406..4ce4436a9 100755
--- a/configure
+++ b/configure
@@ -43,7 +43,7 @@ chomp($config{GCCVER}       = `gcc -dumpversion | cut -c 1`);   		# Major GCC Ve
 chomp($config{GCC34}        = `gcc -dumpversion | cut -c 3`);   		# Minor GCC Version
 chomp($config{OSNAME}       = `/bin/uname`);                      		# Operating System Name
 $config{CC} 		    = "g++";						# C++ compiler
-$config{MAKEORDER}	    = "ircd mods config bininst";			# build order
+$config{MAKEORDER}	    = "ircd mods";					# build order
 $config{STATICLIBS}         = "";						# library archive path
 $config{MAX_IDENT}          = "12";						# max ident size
 $config{MAX_QUIT}           = "255";						# max quit message size
@@ -101,6 +101,21 @@ if ($arg eq "-update") {
 	}
 }
 
+if ($arg eq "-svnupdate") {
+	my $fail = 0;
+	open(FH,"<.svn/entries") or $fail = 1;
+	if ($fail) {
+		print "This is not an SVN copy of InspIRCd.\n";
+		exit;
+	}
+	system("svn update");
+	system("perl configure -update");
+	if ($ARGV[1] eq "rebuild") {
+		system("make install");
+	}
+	exit;
+}
+
 if ($arg eq "-modupdate") {
 	# Does the cache file exist?
 	if (!getcache()) {
@@ -816,12 +831,12 @@ sub getosflags {
 			$config{FLAGS}  = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
-			$config{MAKEORDER} = "ircd mods config bininst";
+			$config{MAKEORDER} = "ircd mods";
 		} elsif ($config{OSNAME} eq "CYG-STATIC") {
 			$config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
-			$config{MAKEORDER} = "mods ircd config bininst";
+			$config{MAKEORDER} = "mods ircd";
 			$config{STATICLIBS} = "modules/mods.a";
 			$config{STATIC_LINK} = "yes";
 		}
@@ -869,7 +884,7 @@ sub writefiles {
 	chomp(my $incos = `uname -n -s -r`);
 	chomp(my $version = `sh ./src/version.sh`);
         chomp(my $revision = `./src/svn-rev.sh`);
-	$version = "$version (r$revision)";
+	$version = "$version(r$revision)";
 	chomp(my $revision2 = `./src/svn-rev.sh`);
 	open(FILEHANDLE, ">include/inspircd_config.h");
 	my $NL = $config{NICK_LENGT}+1;
@@ -1228,7 +1243,7 @@ EOCHEESE
 	# End Write Entry to the MakeFile
 	###
 	}
-	print FILEHANDLE "modinst:\n" . $crud;
+	print FILEHANDLE "modinst:\n	\@echo \"Installing modules...\"\n" . $crud;
 }