Added the local copy of the regex library back.

[libucw.git] / lib / autoconf.cfg

diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg
index bf372573cfd135d582c47726573e2d8cbb6a8f32..b0e3c536eba25d2bcd05e30a24f69f12a8d62815 100644 (file)
--- a/lib/autoconf.cfg
+++ b/lib/autoconf.cfg
@@ -205,6 +205,10 @@ if ($gccver == 3000) {
        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");
+} elsif ($gccver == 4002) {
+       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 -fgnu89-inline");
 } else {
        Warn "Don't know anything about this GCC version, using default switches.\n";
 }
@@ -255,6 +259,15 @@ Set("PARTMAP_IS_MMAP") if IsSet("CPU_64BIT_POINTERS");
 # Option for lib/mempool.c
 Set("POOL_IS_MMAP");
 
+# Guess optimal bit width of the radix-sorter
+if (Get("CPU_ARCH") eq "default" || Get("CPU_ARCH") =~ /^i[345]86$/) {
+       # This should be safe everywhere
+       Set("CONFIG_UCW_RADIX_SORTER_BITS" => 10);
+} else {
+       # Use this on modern CPU's
+       Set("CONFIG_UCW_RADIX_SORTER_BITS" => 12);
+}
+
 # If debugging memory allocations:
 #LIBS+=-lefence
 #CDEBUG+=-DDEBUG_DMALLOC