Browse files

add libboost-iostreams dependency to configure and fix some libboost …

…readme / console innacuracies
  • Loading branch information...
1 parent 5ee138c commit a256e0d40cb20f7d67a25069aa7fdfaa9b9e3c41 @lloucas-imvu lloucas-imvu committed Mar 3, 2014
Showing with 24 additions and 6 deletions.
  1. +1 −1 Makefile
  2. +1 −1 README.md
  3. +22 −4 configure
View
2 Makefile
@@ -42,7 +42,7 @@ OPT := -O2
endif
CXXFLAGS:=-pipe $(OPT) -g -Iinclude -MMD -D_LARGEFILE64_SOURCE -Wall -Werror
SYS_LIBS:=$(BOOST_SYSTEM) $(BOOST_THREAD) -lboost_signals -lpthread $(STATGRAB) \
- $(BOOST_FILESYSTEM) -lboost_iostreams -lboost_date_time $(LIBRT)
+ $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS) -lboost_date_time $(LIBRT)
all: $(DIR_DEPS) $(LIB_DEPS) $(BINS) tests ftests
View
2 README.md
@@ -29,7 +29,7 @@ Quickstart:
Then open localhost:18011 in a browser.
-You may need to install libboost-dev-all (or whatever the boost headers
+You may need to install libboost-all-dev (or whatever the boost headers
and libraries are called on your system) and libstatgrab-dev for the
build to succeed.
View
26 configure
@@ -24,6 +24,7 @@ echo "# makevars.config for istatd generated on " `date` > makevars.config
BOOST_SYSTEM=""
BOOST_FILESYSTEM=""
BOOST_THREAD=""
+BOOST_IOSTREAMS=""
STATGRAB=""
LIBRT=""
DESTDIR=""
@@ -45,6 +46,10 @@ while [ $# -gt 0 ]; do
shift
BOOST_THREAD="$1"
;;
+ --boost_iostreams)
+ shift
+ BOOST_IOSTREAMS="$1"
+ ;;
--statgrab)
shift
STATGRAB="$1"
@@ -74,6 +79,7 @@ while [ $# -gt 0 ]; do
echo "--boost_system -lboost_system-mt What is the boost_system library name?"
echo "--boost_filesystem -lboost_filesystem-mt What is the boost_filesystem library name?"
echo "--boost_thread -lboost_thread-mt What is the boost_thread library name?"
+ echo "--boost_iostreams -lboost_iostreams-mt What is the boost_iostreams library name?"
echo "--statgrab -lstatgrab What is the statgrab library name?"
echo "--librt -lrt What is the librt library name (if any)?"
echo "--prefix / What is the root of the install?"
@@ -89,7 +95,7 @@ done
# see if we need to install boost
if [ ! -d /usr/include/boost -a ! -d /usr/local/include/boost ]; then
- echo "You need to install libboost-dev-all for your distribution."
+ echo "You need to install libboost-all-dev for your distribution."
exit 1
fi
@@ -119,7 +125,7 @@ if [ -z "$BOOST_SYSTEM" ]; then
BOOST_SYSTEM=`findone -lboost_system -lboost_system-mt`
if [ -z "$BOOST_SYSTEM" ]; then
echo "Cannot find boost_system-mt.so (or boost_system.so)"
- echo "Specify it with --boost_system or install libboost-dev-all."
+ echo "Specify it with --boost_system or install libbost-all-dev."
exit 1
fi
fi
@@ -128,7 +134,7 @@ if [ -z "$BOOST_FILESYSTEM" ]; then
BOOST_FILESYSTEM=`findone -lboost_filesystem -lboost_filesystem-mt`
if [ -z "$BOOST_FILESYSTEM" ]; then
echo "Cannot find boost_filesystem-mt.so (or boost_filesystem.so)"
- echo "Specify it with --boost_filesystem or install libboost-dev-all."
+ echo "Specify it with --boost_filesystem or install libbost-all-dev."
exit 1
fi
fi
@@ -138,7 +144,16 @@ if [ -z "$BOOST_THREAD" ]; then
BOOST_THREAD=`findone -lboost_thread -lboost_thread-mt`
if [ -z "$BOOST_THREAD" ]; then
echo "Cannot find boost_thread-mt.so (or boost_thread.so)"
- echo "Specify it with --boost_thread or install libboost-dev-all."
+ echo "Specify it with --boost_thread or install libbost-all-dev."
+ exit 1
+ fi
+fi
+
+if [ -z "$BOOST_IOSTREAMS" ]; then
+ BOOST_IOSTREAMS=`findone -lboost_iostreams -lboost_iostreams-mt`
+ if [ -z "$BOOST_IOSTREAMS" ]; then
+ echo "Cannot find boost_iostreams-mt.so (or boost_iostreams.so)"
+ echo "Specify it with --boost_iostreams or install libbost-all-dev."
exit 1
fi
fi
@@ -175,6 +190,9 @@ fi
if [ ! -z "$BOOST_THREAD" ]; then
echo "BOOST_THREAD=$BOOST_THREAD" >> makevars.config
fi
+if [ ! -z "$BOOST_IOSTREAMS" ]; then
+ echo "BOOST_IOSTREAMS=$BOOST_IOSTREAMS" >> makevars.config
+fi
if [ ! -z "$STATGRAB" ]; then
echo "STATGRAB=$STATGRAB" >> makevars.config
fi

0 comments on commit a256e0d

Please sign in to comment.