gnucash-on-windows master: Fix boost detection with autotools

Geert Janssens gjanssens at code.gnucash.org
Wed Feb 8 05:55:59 EST 2017


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/fdf048d0 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/5de8f8be (commit)



commit fdf048d0dc234089b0dae40248c9198718d1fc13
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 8 11:50:29 2017 +0100

    Fix boost detection with autotools
    
    Turns out when BOOST_DIR is set in the environment
    the m4 macro looks for boost in BOOST_DIR/staging.
    Not what I expected. To have it look in the root
    of the installed directory, we need ac_boost_dir. However
    our cmake files do look in BOOST_DIR. So I'm simply
    setting both here.

diff --git a/install-impl.sh b/install-impl.sh
index 1fd5f5c..843b539 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1270,8 +1270,12 @@ function inst_boost() {
     fi
 
     _BOOST_UDIR=`unix_path ${BOOST_DIR}`
+    # The boost m4 macro included with gnucash looks for boost in either
+    # $BOOST_ROOT/staging (useless here) or $ac_boost_path, while the cmake build
+    # looks in $BOOST_ROOT. So we set both to support both build systems.
     set_env ${_BOOST_UDIR} BOOST_ROOT
-    export BOOST_ROOT
+    set_env ${_BOOST_UDIR} ac_boost_path
+    export BOOST_ROOT ac_boost_path
     add_to_env ${_BOOST_UDIR}/lib PATH
     if test -f ${_BOOST_UDIR}/lib/libboost_date_time.dll
     then



Summary of changes:
 install-impl.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)



More information about the gnucash-changes mailing list