X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fautoconf.cfg;h=bf372573cfd135d582c47726573e2d8cbb6a8f32;hb=1d8112cb590e458baa899805908a8ac910f58163;hp=fed6f6c933906d31f7c3a6e24ed2245442a97d40;hpb=238f36749a3e861b855fd1149ccfe814116e6466;p=libucw.git

diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg
index fed6f6c9..bf372573 100644
--- a/lib/autoconf.cfg
+++ b/lib/autoconf.cfg
@@ -1,7 +1,25 @@
 # Automatic configuration of the UCW Library
-# (c) 2005 Martin Mares <mj@ucw.cz>
+# (c) 2005--2007 Martin Mares <mj@ucw.cz>
+# (c) 2006 Robert Spalek <robert@ucw.cz>
 
-### Compiler and its Options ###
+### OS ###
+
+Test("OS", "Checking on which OS we run", sub {
+	my $os = `uname`;
+	chomp $os;
+	Fail "Unable to determine OS type" if $? || $os eq "";
+	return $os;
+});
+
+if (Get("OS") eq "Linux") {
+	Set("CONFIG_LINUX");
+} elsif (Get("OS") eq "Darwin") {
+	Set("CONFIG_DARWIN");
+} else {
+	Fail "Don't know how to run on this operating system.";
+}
+
+### Compiler ###
 
 # Default compiler
 Test("CC", "Checking for C compiler", sub { return "gcc"; });
@@ -9,23 +27,156 @@ Test("CC", "Checking for C compiler", sub { return "gcc"; });
 # GCC version
 Test("GCCVER", "Checking for GCC version", sub {
 	my $gcc = Get("CC");
-	my $ver = `$gcc --version | sed '2,\$d; s/^\\(.* \\)\\?\\([0-9]*\\.[0-9]*\\).*/\\2/'`;
+	my $ver = `$gcc --version | sed '2,\$d; s/^\\(.* \\)*\\([0-9]*\\.[0-9]*\\).*/\\2/'`;
 	chomp $ver;
 	Fail "Unable to determine GCC version" if $? || $ver eq "";
 	return $ver;
 });
+my ($gccmaj, $gccmin) = split(/\./, Get("GCCVER"));
+my $gccver = 1000*$gccmaj + $gccmin;
+$gccver >= 3000 or Fail "GCC older than 3.0 doesn't support C99 well enough.";
+
+### CPU ###
+
+Test("ARCH", "Checking for machine architecture", sub {
+	my $mach = `uname -m`;
+	chomp $mach;
+	Fail "Unable to determine machine type" if $? || $mach eq "";
+	if ($mach =~ /^i[0-9]86$/) {
+		return "i386";
+	} elsif ($mach =~ /^(x86[_-]|amd)64$/) {
+		return "amd64";
+	} else {
+		return "unknown";
+	}
+});
+
+sub parse_cpuinfo_linux() {
+	open X, "/proc/cpuinfo" || undef;
+	my %pc = ();
+	while (<X>) {
+		chomp;
+		/^$/ && last;
+		/^([^\t]+)\t+:\s*(.*)$/ and $pc{$1}=$2;
+	}
+	close X;
+	return ($pc{'vendor_id'},
+		$pc{'cpu family'},
+		$pc{'model'});
+}
+
+sub parse_cpuinfo_darwin() {
+	@cpu = (`sysctl -n machdep.cpu.vendor`,
+		`sysctl -n machdep.cpu.family`,
+		`sysctl -n machdep.cpu.model`);
+	chomp @cpu;
+	return @cpu;
+}
+
+sub parse_cpuinfo() {
+	my @cpu;
+	if (IsSet("CONFIG_LINUX")) {
+		@cpu = parse_cpuinfo_linux();
+	} elsif (IsSet("CONFIG_DARWIN")) {
+		@cpu = parse_cpuinfo_darwin();
+	}
+	$cpu[0] = "" if !defined $cpu[0];
+	$cpu[1] = 0 if !defined $cpu[1];
+	$cpu[2] = 0 if !defined $cpu[2];
+	return @cpu;
+}
+
+Test("CPU_ARCH", "Checking for CPU architecture", sub {
+	my $mach = Get("ARCH");
+	my $arch = "";
+	if ($mach eq "i386") {
+		Set("CPU_I386");
+		UnSet("CPU_64BIT_POINTERS");
+		Set("CPU_LITTLE_ENDIAN");
+		UnSet("CPU_BIG_ENDIAN");
+		Set("CPU_ALLOW_UNALIGNED");
+		Set("CPU_STRUCT_ALIGN" => 4);
+		if (IsSet("CONFIG_EXACT_CPU")) {
+			my ($vendor, $family, $model) = parse_cpuinfo();
+			# Try to understand CPU vendor, family and model [inspired by MPlayer's configure script]
+			if ($vendor eq "AuthenticAMD") {
+				if ($family >= 6) {
+					if ($model >= 31 && $gccver >= 3004) { $arch = "athlon64"; }
+					elsif ($model >= 6 && $gccver >= 3003) { $arch = "athlon-xp"; }
+					else { $arch = "athlon"; }
+				}
+			} elsif ($vendor eq "GenuineIntel") {
+				if ($family >= 15 && $gccver >= 3003) {
+					if ($model >= 4) { $arch = "nocona"; }
+					elsif ($model >= 3) { $arch = "prescott"; }
+					else { $arch = "pentium4"; }
+				} elsif ($family == 6 && $gccver >= 3003) {
+					if ($model == 15) { $arch = "prescott"; }
+					elsif (($model == 9 || $model == 13) && $gccver >= 3004) { $arch = "pentium-m"; }
+					elsif ($model >= 7) { $arch = "pentium3"; }
+					elsif ($model >= 3) { $arch = "pentium2"; }
+				}
+			}
+
+			# No match on vendor, try the family
+			if ($arch eq "") {
+				if ($family >= 6) {
+					$arch = "i686";
+				} elsif ($family >= 3) {
+					$arch = "i${family}86";
+				}
+			}
+			Log (($arch ne "") ? "(using /proc/cpuinfo) " : "(don't understand /proc/cpuinfo) ");
+			return $arch;
+		} else {
+			return "default";
+		}
+	} elsif ($mach eq "amd64") {
+		Set("CPU_AMD64");
+		Set("CPU_64BIT_POINTERS");
+		Set("CPU_LITTLE_ENDIAN");
+		UnSet("CPU_BIG_ENDIAN");
+		Set("CPU_ALLOW_UNALIGNED");
+		Set("CPU_STRUCT_ALIGN" => 8);
+		if (IsSet("CONFIG_EXACT_CPU")) {
+			# In x86-64 world, the detection is somewhat easier so far...
+			my ($vendor, $family, $model) = parse_cpuinfo();
+			if ($vendor eq "AuthenticAMD") {
+				$arch = "athlon64";
+			} elsif ($vendor eq "GenuineIntel") {
+				$arch = "nocona";
+			}
+			Log (($arch ne "") ? "(using /proc/cpuinfo) " : "(don't understand /proc/cpuinfo) ");
+			return $arch;
+		} else {
+			return "default";
+		}
+	} else {
+		return "unknown";
+	}
+});
 
-# C flags: tell the compiler we're speaking C99
-Set("CLANG" => "-std=gnu99");
+if (Get("CPU_ARCH") eq "unknown") {
+	Warn "CPU architecture not recognized, using defaults, keep fingers crossed.\n";
+}
+
+### Compiler and its Options ###
+
+# C flags: tell the compiler we're speaking C99, and disable common symbols
+Set("CLANG" => "-std=gnu99 -fno-common");
 
 # C optimizations
-Set("COPT" => '-O2 -fstrict-aliasing -march=$(CPU_ARCH)');
+Set("COPT" => '-O2');
+if (Get("CPU_ARCH") ne "unknown" && Get("CPU_ARCH") ne "default") {
+	Append("COPT", '-march=$(CPU_ARCH)');
+}
 
 # C optimizations for highly exposed code
 Set("COPT2" => '-O3');
 
 # Warnings
 Set("CWARNS" => '-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline');
+Set("CWARNS_OFF" => '');
 
 # Linker flags
 Set("LOPT" => "");
@@ -35,18 +186,27 @@ Set("LIBS" => "");
 
 # Extra flags for compiling and linking shared libraries
 Set("CSHARED" => '-fPIC');
-Set("LSHARED" => '-shared -Wl,-soname,lib/$(@F)');
+if (IsSet("CONFIG_DARWIN")) {
+	Set("LSHARED" => '-dynamiclib -install_name lib/$(@F) -undefined dynamic_lookup');
+} else {
+	Set("LSHARED" => '-shared -Wl,-soname,lib/$(@F)');
+}
 
 # Extra switches depending on GCC version:
-if (Get("GCCVER") eq "3.0") {
-} elsif (Get("GCCVER") eq "3.3") {
+if ($gccver == 3000) {
+	Append("COPT" => "-fstrict-aliasing");
+} elsif ($gccver == 3003) {
 	Append("CWARNS" => "-Wundef -Wredundant-decls");
 	Append("COPT" => "-finline-limit=20000 --param max-inline-insns-auto=1000");
-} elsif (Get("GCCVER") eq "3.4") {
+} elsif ($gccver == 3004) {
 	Append("CWARNS" => "-Wundef -Wredundant-decls");
+	Append("COPT" => "-finline-limit=2000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
+} elsif ($gccver == 4000 || $gccver == 4001) {
+	Append("CWARNS" => "-Wundef -Wredundant-decls -Wno-pointer-sign -Wdisabled-optimization -Wno-missing-field-initializers");
+	Append("CWARNS_OFF" => "-Wno-pointer-sign");
 	Append("COPT" => "-finline-limit=5000 --param large-function-insns=5000 --param inline-unit-growth=200 --param large-function-growth=400");
 } else {
-	Log "WARNING: Don't know anything about this GCC version, using default switches.\n";
+	Warn "Don't know anything about this GCC version, using default switches.\n";
 }
 
 if (IsSet("CONFIG_DEBUG")) {
@@ -60,24 +220,45 @@ if (IsSet("CONFIG_DEBUG")) {
 	Append("LOPT" => "-s");
 }
 
-# If debugging memory allocations:
-#LIBS+=-lefence
-#CDEBUG+=-DDEBUG_DMALLOC
-#LIBS+=-ldmalloc
+if (IsSet("CONFIG_DARWIN")) {
+	# gcc-4.0 on Darwin doesn't set this in the gnu99 mode
+	Append("CLANG" => "-fnested-functions");
+	# Directory hierarchy of the fink project
+	Append("LIBS" => "-L/sw/lib");
+	Append("COPT" => "-I/sw/include");
+	# Fill in some constants not found in the system header files
+	Set("SOL_TCP" => 6);		# missing in /usr/include/netinet/tcp.h
+}
 
-### CPU Type and Features ###
+# Determine page size
+Test("CPU_PAGE_SIZE", "Determining page size", sub {
+	my $p;
+	if (IsSet("CONFIG_DARWIN")) {
+		$p = `sysctl -n hw.pagesize`;
+		defined $p or Fail "sysctl hw.pagesize failed";
+	} elsif (IsSet("CONFIG_LINUX")) {
+		$p = `getconf PAGE_SIZE`;
+		defined $p or Fail "getconf PAGE_SIZE failed";
+	}
+	chomp $p;
+	return $p;
+});
+
+if (IsSet("CONFIG_LARGE_FILES") && IsSet("CONFIG_LINUX")) {
+	# Use 64-bit versions of file functions
+	Set("CONFIG_LFS");
+}
 
-Set("CPU_ARCH" => 'i686') if !IsSet("CPU_ARCH");
-Set("CPU_I386");
-Set("CPU_LITTLE_ENDIAN");
-#CPU_BIG_ENDIAN=1
-Set("CPU_ALLOW_UNALIGNED");
-Set("CPU_STRUCT_ALIGN" => 4);
-Set("CPU_64BIT_POINTERS");
+# Decide how will lib/partmap.c work
+Set("PARTMAP_IS_MMAP") if IsSet("CPU_64BIT_POINTERS");
 
-### OS Type ###
+# Option for lib/mempool.c
+Set("POOL_IS_MMAP");
 
-Set("CONFIG_LINUX");
+# If debugging memory allocations:
+#LIBS+=-lefence
+#CDEBUG+=-DDEBUG_DMALLOC
+#LIBS+=-ldmalloc
 
 # Return success
 1;