From 7b68cce99672ee06fd8cb5d2d506ffc7ecab207f Mon Sep 17 00:00:00 2001 From: cdfrey Date: Thu, 28 Jun 2007 20:20:09 +0000 Subject: [PATCH] - applied patch from Brian Edginton for better boost detection in configure.ac --- ChangeLog | 2 ++ configure.ac | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbe820cc..9e9fac98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Release: version 0.8 - 2007/05/?? ------------------------------------------------------------------------------ 2007/06/28 - minor adjustment to ctags building in buildgen.sh + - applied patch from Brian Edginton for better boost detection + in configure.ac 2007/06/21 - more porting of OpenSync module to 0.30 - added ctags build for opensync source tree to buildgen.sh diff --git a/configure.ac b/configure.ac index 290ac974..2e6a1c12 100644 --- a/configure.ac +++ b/configure.ac @@ -28,12 +28,21 @@ AC_ARG_WITH(libusb, []) AC_ARG_WITH(boost, - [ --with-boost= root path of boost installation (default=no boost)], - [BOOST_LIB_PATH="$with_boost/lib" - BOOST_INC_PATH="$with_boost/include" - BOOST_ENABLED="true"], - [BOOST_LIB_PATH="/usr/lib" - BOOST_INC_PATH="/usr/include"]) + AC_HELP_STRING(--with-boost[=path], + [root path of boost installation (no arg defaults to 'yes' and uses system path]), + use_boost=$withval, use_boost=no ) + +if test x"$use_boost" != "xyes" ; then + if test x"$use_boost" != "xno" ; then + BOOST_LIB_PATH=$use_boost/lib + BOOST_INC_PATH=$use_boost/include + BOOST_ENABLED="true" + fi +else + BOOST_LIB_PATH="/usr/lib" + BOOST_INC_PATH="/usr/include" + BOOST_ENABLED="true" +fi PKG_CHECK_MODULES([OPENSSL], [openssl]) -- 2.11.4.GIT