diff options
author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-26 17:17:24 +0000 |
---|---|---|
committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-01-26 17:17:24 +0000 |
commit | ccd20043dd29c5483d893cfd223480550a8d1730 (patch) | |
tree | 1f62e5614515f87afcaaf4b08d2e92fda98530ec | |
parent | 43a207eeb069046832a42757fbd7076d293b755b (diff) |
Fix for bug #187
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6441 e03df62e-2008-0410-955e-edbf42e46eb7
-rwxr-xr-x | configure | 7 | ||||
-rw-r--r-- | make/configure.pm | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -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] |