Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #17 from mistydemeo/boost_m4

fix boost macros on non-GNU systems
  • Loading branch information...
commit ba3df41306c7e188e772f8efbbc22fe91532efc7 2 parents 1bffcae + 5513b08
Andrew Caudwell authored

Showing 2 changed files with 4 additions and 4 deletions. Show diff stats Hide diff stats

  1. +2 2 m4/ax_boost_filesystem.m4
  2. +2 2 m4/ax_boost_system.m4
4 m4/ax_boost_filesystem.m4
@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
81 81 AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
82 82 BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
83 83 if test "x$ax_boost_user_filesystem_lib" = "x"; then
84   - for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;' | tac` ; do
  84 + for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
85 85 ax_lib=${libextension}
86 86 AC_CHECK_LIB($ax_lib, exit,
87 87 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
88 88 [link_filesystem="no"])
89 89 done
90 90 if test "x$link_filesystem" != "xyes"; then
91   - for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
  91 + for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
92 92 ax_lib=${libextension}
93 93 AC_CHECK_LIB($ax_lib, exit,
94 94 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
4 m4/ax_boost_system.m4
@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
83 83
84 84 LDFLAGS_SAVE=$LDFLAGS
85 85 if test "x$ax_boost_user_system_lib" = "x"; then
86   - for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
  86 + for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
87 87 ax_lib=${libextension}
88 88 AC_CHECK_LIB($ax_lib, exit,
89 89 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
90 90 [link_system="no"])
91 91 done
92 92 if test "x$link_system" != "xyes"; then
93   - for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
  93 + for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
94 94 ax_lib=${libextension}
95 95 AC_CHECK_LIB($ax_lib, exit,
96 96 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],

0 comments on commit ba3df41

Please sign in to comment.
Something went wrong with that request. Please try again.