Commits

Anonymous committed 00927c7 Merge

rmcg:00408: merged changes to boost and build script

Comments (0)

Files changed (4)

   if test "x$BOOST_GRAPH_LIB" != "x"; then
     # boost_graph_lib_info and boost_includes_info are paths
     # now look for the headers
-    BOOST_LIBS=$BOOST_GRAPH_LIB
+    BOOST_LIBS="$BOOST_GRAPH_LIB ${BOOST_GRAPH_LIB/graph/regex}"
     qualify_path with_boost_includes
 
 result=$with_boost_includes
   if test "x$BOOST_GRAPH_LIB" != "x"; then
     # boost_graph_lib_info and boost_includes_info are paths
     # now look for the headers
-    BOOST_LIBS=$BOOST_GRAPH_LIB
+    BOOST_LIBS="$BOOST_GRAPH_LIB ${BOOST_GRAPH_LIB/graph/regex}"
     qualify_path with_boost_includes
     LOCAL_CHECK_APPEND_PATHS([$with_boost_includes], [..], [boost/config.hpp], [BOOST_INCLUDES_DIR], [boost_state=warn])
     if ! test -f $BOOST_GRAPH_LIB; then boost_state=warn; fi
 #!/bin/sh
 
-./configure --with-gengetopt=../extlib/gengetopt-2.22/bin/gengetopt --with-log4cpp=../extlib/log4cpp-1.0/ --with-smile=../extlib/smile_1_1_linux64_gcc_4_1_2/ --with-svm-perf=../extlib/svm_perf/ --with-boost-includes=../extlib/boost_1_34_1/include/boost-1_34_1/ --with-boost-graph-lib=../extlib/boost_1_34_1/lib/libboost_graph-gcc41-mt.a --with-vowpal-wabbit=../extlib/vowpal_wabbit_v4.1/ LDFLAGS=-static
+./configure --with-gengetopt=../extlib/gengetopt-2.22/bin/gengetopt \
+	--with-log4cpp=../extlib/log4cpp-1.0/ \
+	--with-smile=../extlib/smile_1_1_linux64_gcc_4_1_2/ \
+	--with-svm-perf=../extlib/svm_perf/ \
+	--with-boost-includes=../extlib/boost_1_42_0/include/boost/ \
+	--with-boost-graph-lib=../extlib/boost_1_42_0/lib/libboost_graph.a \
+	--with-vowpal-wabbit=../extlib/vowpal_wabbit_v4.1/ \
+	LDFLAGS=-static
 # CXXFLAGS=-fno-threadsafe-statics

scripts/slp.hg.chgrp.sh

 echo $PWD >> $MSGFILE;
 
 hg -v tip >> $MSGFILE;
-
 mail -s "Sleipnir: Hg Changegroup Received" hut-dev@hsphsun3.harvard.edu < $MSGFILE;
+rm -f $MSGFILE