Merge commit 'addd0bd9f083cb3dab19b7f13bae56f326016dd3' into 0.0.x

Merge for release 0.0.4.

.gitignore

@@ -28,3 +28,4 @@ test_*
 blah*
 foo*
 bar*
+waf

sourceme-prefix-has-deps.sh

@@ -4,11 +4,12 @@
 # this script simplifies configuration.
 
 
-if [ "$(lsb_release -s -c)" = "xenial" ] ; then
-    echo "Setting compilers to GCC 4.9 on xenial"
-    export CC=/usr/bin/gcc-4.9
-    export CXX=/usr/bin/g++-4.9
-fi
+### latest ROOT no longer needs this workaround
+# if [ "$(lsb_release -s -c)" = "xenial" ] ; then
+#     echo "Setting compilers to GCC 4.9 on xenial"
+#     export CC=/usr/bin/gcc-4.9
+#     export CXX=/usr/bin/g++-4.9
+# fi
 
 wcb-configure () {
     local prefix="$1" ; shift
@@ -33,11 +34,15 @@ wcb-configure () {
     cd $mydir
     ./wcb configure \
 	  --prefix=$prefix \
+	  --with-eigen=$prefix \
+	  --with-jsoncpp=$prefix \
+	  --with-tbb=$prefix \
 	  --boost-includes=$prefix/include \
 	  --boost-libs=$prefix/lib \
 	  --boost-mt \
 	  --with-root=$prefix \
-	  $@
+	  --with-fftw=$prefix \
+	  "$@"
 }
 
 # setup run time environment

wscript

@@ -1,34 +1,43 @@
 #!/usr/bin/env python
 
+from waflib.Utils import to_list
+
 TOP = '.'
 APPNAME = 'WireCell'
 
 def options(opt):
     opt.load('doxygen')
+    opt.load('boost')
+
     opt.load('smplpkgs')
     opt.load('rootsys')
+    opt.load('fftw')
     opt.load('eigen')
     opt.load('jsoncpp')
     opt.load('tbb')
-    opt.load('boost')
 
-    opt.add_option('--build-debug', default='-O2',
+    opt.add_option('--build-debug', default='-O2 -ggdb3',
                    help="Build with debug symbols")
     opt.add_option('--doxygen-tarball', default=None,
                    help="Build Doxygen documentation to a tarball")
     opt.add_option('--doxygen-install-path', default="",
                    help="Build Doxygen documentation to a tarball")
 
 def configure(cfg):
+    print 'Compile options: %s' % cfg.options.build_debug
+
     cfg.load('doxygen')
+    cfg.load('boost')
+
     cfg.load('smplpkgs')
     cfg.load('rootsys')
     cfg.load('eigen')
     cfg.load('jsoncpp')
     cfg.load('tbb')
-    cfg.load('boost')
+    cfg.load('fftw')
 
-    cfg.check_boost(lib='system filesystem graph thread program_options')
+
+    cfg.check_boost(lib='system filesystem graph thread program_options iostreams')
 
     cfg.check_cxx(header_name="boost/pipeline.hpp", use='BOOST',
                   define_name='BOOST_PIPELINE', mandatory=False)
@@ -38,14 +47,16 @@ def configure(cfg):
 
     cfg.check(features='cxx cxxprogram', lib=['pthread'], uselib_store='PTHREAD')
 
-    cfg.env.CXXFLAGS += [cfg.options.build_debug]
+    cfg.env.CXXFLAGS += to_list(cfg.options.build_debug)
+    cfg.env.CXXFLAGS += ['-DEIGEN_FFTW_DEFAULT=1']
+
     cfg.env.SUBDIRS = 'util iface gen alg sst bio rootvis apps sigproc'.split()
 
     if 'BOOST_PIPELINE=1' in cfg.env.DEFINES:
         cfg.env.SUBDIRS += ['dfp'] # fixme: rename, make B.P specific
 
     if 'HAVE_TBB_TBB_H=1' in cfg.env.DEFINES:
-        cfg.env.SUBDIRS += ['tbb'] 
+        cfg.env.SUBDIRS += ['tbb']
 
     #print cfg.env