From 2f64af3e06a518b93f7ca2c30a9d0aeb2c947031 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <kheafiel@cluster01.lti.ece.cmu.local>
Date: Sat, 12 May 2012 15:18:29 -0400
Subject: with-google-hash option, more respect for environment variables

---
 Jamroot | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'Jamroot')

diff --git a/Jamroot b/Jamroot
index b5b786cd..f873db68 100644
--- a/Jamroot
+++ b/Jamroot
@@ -1,10 +1,21 @@
+#cdec compilation with bjam
+#
+#--with-boost=/usr/include
+#--with-google-hash=/usr/include so that $with-google-hash/google/dense_hash_map exists
+#
+#-a forces the build to run from scratch
+#-jN parallelizes just like make
+#
+#Respects CXXFLAGS, CFLAGS, and LDFLAGS environment variables.  
+
 path-constant TOP : . ;
 include $(TOP)/jam-files/sanity.jam ;
 boost 104400 ;
 external-lib z ;
 
-if [ test_header google/dense_hash_map ] {
-  requirements += <define>HAVE_SPARSEHASH ;
+with-google-hash = [ option.get "with-google-hash" ] ;
+if [ test_header google/dense_hash_map ] || $(with-google-hash) {
+  requirements += <define>HAVE_SPARSEHASH <include>$(with-google-hash) ;
 }
 
 if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serialization ] {
-- 
cgit v1.2.3