summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure7
-rw-r--r--make/configure.pm5
2 files changed, 9 insertions, 3 deletions
diff --git a/configure b/configure
index 735f10ca3..0faa2917e 100755
--- a/configure
+++ b/configure
@@ -24,6 +24,7 @@ use make::configure;
GetOptions (
'enable-gnutls' => \$opt_use_gnutls,
+ 'rebuild' => \$opt_rebuild,
'enable-openssl' => \$opt_use_openssl,
'disable-interactive' => \$opt_nointeractive,
'with-nick-length=i' => \$opt_nick_length,
@@ -362,9 +363,13 @@ sub svnupdate
print "This is not an SVN copy of InspIRCd.\n";
exit;
}
+ else
+ {
+ close(FH);
+ }
system("svn update");
system("perl configure -update");
- if ($ARGV[1] eq "rebuild") {
+ if (defined $opt_rebuild) {
system("make install");
}
exit;
diff --git a/make/configure.pm b/make/configure.pm
index 7965436c2..a1a42786c 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -207,8 +207,9 @@ InspIRCd 1.0.x, are also allowed.
will disable any interactive prompting.
--update Update makefiles and dependencies
--modupdate Detect new modules and write makefiles
- --svnupdate {rebuild} Update working copy via subversion
- {and optionally rebuild it}
+ --svnupdate {--rebuild} Update working copy via subversion
+ {and optionally rebuild it if --update
+ if --rebuild is also specified}
--clean Remove .config.cache file and go interactive
--enable-gnutls Enable GnuTLS module [no]
--enable-openssl Enable OpenSSL module [no]