diff options
Diffstat (limited to 'make/configure.pm')
| -rw-r--r-- | make/configure.pm | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/make/configure.pm b/make/configure.pm index dbba7a143..230bd3934 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -22,7 +22,7 @@ use POSIX; use make::utilities; our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s); -my $no_svn = 0; +my $no_git = 0; sub yesno { my ($flag,$prompt) = @_; @@ -52,29 +52,18 @@ sub resolve_directory } sub getrevision { - if ($no_svn) + if ($no_git) { return "0"; } - my $data = `svn info 2>/dev/null`; + my $data = `git describe --tags 2>/dev/null`; if ($data eq "") { - $data = `git describe --tags 2>/dev/null`; - if ($data eq "") - { - $no_svn = 1; - return '0'; - } - chomp $data; # remove \n - return $data; - } - $data =~ /Revision: (\d+)/; - my $rev = $1; - if (!defined($rev)) - { - $rev = "0"; + $no_git = 1; + return '0'; } - return $rev; + chomp $data; # remove \n + return $data; } sub getcompilerflags { @@ -239,7 +228,8 @@ sub is_dir sub showhelp { chomp(my $PWD = `pwd`); - print "Usage: configure [options] + print <<EOH; +Usage: configure [options] *** NOTE: NON-INTERACTIVE CONFIGURE IS *NOT* SUPPORTED BY THE *** *** INSPIRCD DEVELOPMENT TEAM. DO NOT ASK FOR HELP REGARDING *** @@ -258,32 +248,25 @@ InspIRCd 1.0.x, are also allowed. --disable-interactive Sets no options itself, but will disable any interactive prompting. - --disable-rpath Disable runtime paths. DO NOT USE UNLESS - YOU KNOW WHAT YOU ARE DOING! --update Update makefiles and dependencies - --modupdate Detect new modules and write makefiles - --svnupdate {--rebuild} Update working copy via subversion - {and optionally rebuild 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] - --enable-optimization=[n] Optimize using -O[n] gcc flag --enable-epoll Enable epoll() where supported [set] --enable-kqueue Enable kqueue() where supported [set] --disable-epoll Do not enable epoll(), fall back to select() [not set] --disable-kqueue Do not enable kqueue(), fall back to select() [not set] - --disable-ipv6 Do not build ipv6 native InspIRCd [not set] - --with-cc=[filename] Use an alternative g++ binary to + --disable-ipv6 Do not build IPv6 native InspIRCd [not set] + --with-cc=[filename] Use an alternative compiler to build InspIRCd [g++] --with-maxbuf=[n] Change the per message buffer size [512] DO NOT ALTER THIS OPTION WITHOUT GOOD REASON AS IT *WILL* BREAK CLIENTS!!! --prefix=[directory] Base directory to install into (if defined, can automatically define config, module, bin - and library dirs as subdirectories of prefix) + and library dirs as subdirectories of prefix) [$PWD] --config-dir=[directory] Config file directory for config and SSL certs [$PWD/conf] @@ -298,7 +281,7 @@ InspIRCd 1.0.x, are also allowed. --disable-extras=[extras] Disable the specified list of extras --help Show this help text and exit -"; +EOH exit(0); } |