Skip to content

Commit bd7cf99

Browse files
committed
don't use boost_cv_inc_path to generate a test ldpath if it's not a path
boost_cv_inc_path can have values 'yes' and 'no' in addition to a real path, so don't use it to generate an ldpath if it's 'yes' or 'no'
1 parent f958f59 commit bd7cf99

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

build-aux/boost.m4

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,12 @@ for boost_rtopt_ in $boost_rtopt '' -d; do
479479
# otherwise search the "standard" places, starting with a location
480480
# based upon where the headers are.
481481
AS_IF( [ test x"$with_boost" = x ],
482-
[ boost_ldpaths=`_boost_join_path ${boost_cv_inc_path%/include} '' \
482+
[
483+
AS_IF( [ test x"$boost_cv_inc_path" = xno || test x"$boost_cv_inc_path" = xyes ],
484+
[boost_tmp_lib=],
485+
[boost_tmp_lib=${boost_cv_inc_path%/include} ]
486+
)
487+
boost_ldpaths=`_boost_join_path $boost_tmp_lib '' \
483488
/opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
484489
C:/Boost/lib /lib*` ],
485490
[ boost_ldpaths=`_boost_join_path "$with_boost" "$with_boost/lib"` ]

0 commit comments

Comments
 (0)