[cig-commits] commit: Merge.

[Mercurial]

changeset:   231:4a2d946e79dc
branch:      1.4.x
parent:      230:c1852fe9c345
parent:      223:ed8cec66db3f
user:        JericoRevote
date:        Wed Jan 06 15:13:19 2010 +1100
files:       SConfigure
description:
Merge.


diff -r c1852fe9c345 -r 4a2d946e79dc SConfigure
--- a/SConfigure	Wed Jan 06 13:06:42 2010 +1100
+++ b/SConfigure	Wed Jan 06 15:13:19 2010 +1100
@@ -8,12 +8,12 @@ options = [
 options = [
     ('--prefix', 'prefix', 'Installation prefix.', None),
     ('--build-dir', 'build_dir', 'Sandbox location.', 'build'),
-    ('--with-debug', 'with_debug', 'Build with debugging', 0, 'int'),
+    ('--with-debugging', 'with_debugging', 'Build with debugging', 1, 'int'),
     ('--lib-type', 'lib_type', 'Library type (shared or static)', 'shared'),
     ('--cc', 'CC', 'C compiler', None),
     ('--cflags', 'CFLAGS', 'Flags for the C compiler', None),
     ('--with-glucifer', 'with_glucifer', 'Enable gLucifer', 1, 'int'),
-    ('--with-experimental', 'with_experimental', 'Enable Experimental Repository compile', 0, 'int'),
+    ('--with-experimental', 'with_experimental', 'Enable Experimental Repository compile', os.path.isdir("Experimental"), 'int'),
     ('--with-osmesa', 'with_osmesa', 'Enable OSMesa output', 1, 'int'),
     ('--with-sdl', 'with_sdl', 'Enable SDL output', 1, 'int'),
     ('--with-x11', 'with_x11', 'Enable X11 output', 1, 'int'),
@@ -71,7 +71,11 @@ if not (GetOption('help') or GetOption('
 
     # confirm with_experimental configure
     if env.get('with_experimental', None):
-        print("Enable Experimental build... yes");
+        if os.path.isdir("Experimental"):
+            print("Checking for Experimental... yes");
+        else:
+            print("Experimental not found");
+            env.Exit()
 
     if env.get('with_memory_stats', None):
         env.MergeFlags('-DMEMORY_STATS')
@@ -79,7 +83,7 @@ if not (GetOption('help') or GetOption('
     if env.get('with_cautious_mode', None):
         env.MergeFlags('-DCAUTIOUS')
 
-    if env.get('with_debug', None):
+    if env.get('with_debugging', None):
         env.MergeFlags('-g -DDEBUG')
     else:
         env.MergeFlags('-O3 -DNDEBUG')