diff options
| -rw-r--r-- | make/configure.pm | 28 | ||||
| -rw-r--r-- | win/configure.cpp | 2 |
2 files changed, 8 insertions, 22 deletions
diff --git a/make/configure.pm b/make/configure.pm index dbba7a143..526f39d29 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 { @@ -262,9 +251,6 @@ InspIRCd 1.0.x, are also allowed. 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] diff --git a/win/configure.cpp b/win/configure.cpp index 4acd7131b..7c9a27854 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -330,7 +330,7 @@ void Run() printf("Writing inspircd_se_config.h..."); f = fopen("inspircd_se_config.h", "w"); - fprintf(f, "/* Auto generated by configure, do not modify or commit to svn! */\n"); + fprintf(f, "/* Auto generated by configure, do not modify or commit to Git! */\n"); fprintf(f, "#ifndef __CONFIGURATION_SOCKETENGINE__\n"); fprintf(f, "#define __CONFIGURATION_SOCKETENGINE__\n\n"); fprintf(f, "#include \"socketengines/socketengine_%s.h\"\n\n", "select"); |