X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Futilities.pm;h=dc286da5ed5e2029c0bdf56a41955870c954013a;hb=ee3b1ba801f8f731f3efee180fc224f206ffaa70;hp=4103e38f3c5c23f44a21b617ac5c052a6a03b3a5;hpb=11f4d02e7020cb5775d2b89af0e652e53cd90ed7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/utilities.pm b/make/utilities.pm
index 4103e38f3..dc286da5e 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -35,63 +35,9 @@ use File::Path;
 use Getopt::Long;
 use POSIX;
 
-our @EXPORT = qw(get_version module_installed get_cpu_count make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
+our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
 
 my %already_added = ();
-my %version = ();
-
-sub get_version {
-	return %version if %version;
-
-	# Attempt to retrieve version information from src/version.sh
-	chomp(my $vf = `sh src/version.sh 2>/dev/null`);
-	if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
-		%version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
-	}
-
-	# Attempt to retrieve missing version information from Git
-	chomp(my $gr = `git describe --tags 2>/dev/null`);
-	if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-(\w+))?$/) {
-		$version{MAJOR} = $1 unless defined $version{MAJOR};
-		$version{MINOR} = $2 unless defined $version{MINOR};
-		$version{PATCH} = $3 unless defined $version{PATCH};
-		$version{LABEL} = $4 if defined $4;
-	}
-
-	# The user is using a stable release which does not have
-	# a label attached.
-	$version{LABEL} = 'release' unless defined $version{LABEL};
-
-	# If any of these fields are missing then the user has deleted the
-	# version file and is not running from Git. Fill in the fields with
-	# dummy data so we don't get into trouble with undef values later.
-	$version{MAJOR} = '0' unless defined $version{MAJOR};
-	$version{MINOR} = '0' unless defined $version{MINOR};
-	$version{PATCH} = '0' unless defined $version{PATCH};
-
-	return %version;
-}
-
-sub module_installed($) {
-	my $module = shift;
-	eval("use $module;");
-	return !$@;
-}
-
-sub get_cpu_count {
-	my $count = 1;
-	if ($^O =~ /bsd/) {
-		$count = `sysctl -n hw.ncpu`;
-	} elsif ($^O eq 'darwin') {
-		$count = `sysctl -n hw.activecpu`;
-	} elsif ($^O eq 'linux') {
-		$count = `getconf _NPROCESSORS_ONLN`;
-	} elsif ($^O eq 'solaris') {
-		$count = `psrinfo -p`;
-	}
-	chomp($count);
-	return $count;
-}
 
 sub promptstring($$$$$)
 {