Remove timer stuff left over from m_safelist

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index ef17e9bb350024db87fde6295a916e427c671daf..d4cdd579e31ad5303d80e81a3eab9ddee9cb5bc7 100755 (executable)
--- a/configure
+++ b/configure
@@ -52,6 +52,8 @@ $config{MAX_KICK}           = "255";                                          # max kick message size
 $config{MAX_GECOS}          = "128";                                           # max GECOS size
 $config{MAX_AWAY}           = "200";                                           # max AWAY size
 
+$no_svn = 0;
+
 $config{HAS_OPENSSL} =~ /OpenSSL (\S+) \d+ \S+ \d{4}/;
 $config{HAS_OPENSSL} = $1;
 
@@ -101,6 +103,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()) {
@@ -223,6 +240,7 @@ system("clear");
 show_splash();
 chomp($wholeos = `uname -mnr`);
 
+my $rev = getrevision();
 # Display Introduction Message..
 print "
 Welcome to the InspIRCd Configuration program!
@@ -237,7 +255,12 @@ Press \033[1m<RETURN>\033[0m to accept the default for any option, or enter
 a new value. Please note: You will \033[1mHAVE\033[0m to read the docs
 dir, otherwise you won't have a config file!
 
-Your operating system is: \033[1;32m$config{OSNAME}\033[0m ($wholeos), fdmax: $config{MAX_CLIENT_T}\n\n";
+Your operating system is: \033[1;32m$config{OSNAME}\033[0m ($wholeos), fdmax: $config{MAX_CLIENT_T}
+Your InspIRCd revision ID is \033[1;32mr$rev\033[0m";
+if ($rev eq "r0") {
+       print " (Non-SVN build)";
+}
+print ".\n\n";
 
 $config{CHANGE_COMPILER} = "n";
 print "I have detected the following compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.$config{GCC34}\033[0m)\n";
@@ -863,14 +886,32 @@ sub getmodules {
        closedir(DIRHANDLE);
 }
 
+sub getrevision {
+       if ($no_svn) {
+               return "0";
+       }
+       my $data = `svn info`;
+       if ($data eq "") {
+               $no_svn = 1;
+               $rev = "0";
+               return $rev;
+       }
+       $data =~ /Revision: (\d+)/;
+       my $rev = $1;
+       if (!defined($rev)) {
+               $rev = "0";
+       }
+       return $rev;
+}
+
 sub writefiles {
        print "Writing \033[1;32minspircd_config.h\033[0m\n";
        # First File.. inspircd_config.h
        chomp(my $incos = `uname -n -s -r`);
        chomp(my $version = `sh ./src/version.sh`);
-        chomp(my $revision = `./src/svn-rev.sh`);
+        chomp(my $revision = getrevision());
        $version = "$version(r$revision)";
-       chomp(my $revision2 = `./src/svn-rev.sh`);
+       chomp(my $revision2 = getrevision());
        open(FILEHANDLE, ">include/inspircd_config.h");
        my $NL = $config{NICK_LENGT}+1;
        my $CL = $config{CHAN_LENGT}+1;