Some fixes to the new session dialog.

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 3930c1198bfee37abf6c6743036bf571273abf2c..807643df6ee974a6ff1b5a7aea6b31337dc2653e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -35,7 +35,8 @@ opts.AddOptions(
     EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
     BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
     BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
-    BoolOption('SURFACES', 'Build support for control surfaces', 0)
+    BoolOption('SURFACES', 'Build support for control surfaces', 0),
+    BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0)
   )
 
 #----------------------------------------------------------------------
@@ -372,6 +373,9 @@ libraries['jack'].ParseConfig('pkg-config --cflags --libs jack')
 libraries['xml'] = LibraryInfo()
 libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0')
 
+libraries['xslt'] = LibraryInfo()
+libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt')
+
 libraries['glib2'] = LibraryInfo()
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')
@@ -414,6 +418,23 @@ else:
     
 libraries['usb'] = conf.Finish ()
 
+#
+# Check for dmalloc
+
+libraries['dmalloc'] = LibraryInfo ()
+
+#
+# look for the threaded version
+#
+
+conf = Configure (libraries['dmalloc'])
+if conf.CheckLib ('dmallocth', 'dmalloc_shutdown'):
+    have_libdmalloc = True
+else:
+    have_libdmalloc = False
+    
+libraries['dmalloc'] = conf.Finish ()
+
 #
 
 #
@@ -560,6 +581,8 @@ if os.environ.has_key('DISTCC_HOSTS'):
 final_prefix = '$PREFIX'
 install_prefix = '$DESTDIR/$PREFIX'
 
+subst_dict['INSTALL_PREFIX'] = install_prefix;
+
 if env['PREFIX'] == '/usr':
     final_config_prefix = '/etc'
 else: