diff options
author | Sebastian Hegler <sebastian.hegler@tu-dresden.de> | 2010-10-13 11:03:38 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2010-10-13 11:05:39 +0200 |
commit | c0667c82a84b287e456a953a81a46bcdf5b1d103 (patch) | |
tree | 2e48154466d4642155a3a061d4e477265285baa1 /m4/ax_boost_base.m4 | |
parent | c6781f664d1a2efb31ace4aea1bac17d44d847ba (diff) | |
download | autoconf-archive-c0667c82a84b287e456a953a81a46bcdf5b1d103.tar.gz |
AX_BOOST_BASE: improved BOOST_LDFLAGS detection
The macro optimistically assembled BOOST_LDFLAGS from an empty variable,
resulting in a wrong value for BOOST_LDFLAGS, making all following
ax_boost* macros fail.
See <http://savannah.gnu.org/patch/?7337> for further details.
Diffstat (limited to 'm4/ax_boost_base.m4')
-rw-r--r-- | m4/ax_boost_base.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 index 8f935f6..ec23a0a 100644 --- a/m4/ax_boost_base.m4 +++ b/m4/ax_boost_base.m4 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 17 +#serial 18 AC_DEFUN([AX_BOOST_BASE], [ @@ -98,8 +98,13 @@ if test "x$want_boost" = "xyes"; then dnl this location ist chosen if boost libraries are installed with the --layout=system option dnl or if you install boost with RPM if test "$ac_boost_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_path/$libsubdir" BOOST_CPPFLAGS="-I$ac_boost_path/include" + for ac_boost_path_tmp in $libsubdirs; do + if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then + BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp" + break + fi + done elif test "$cross_compiling" != yes; then for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then |