Skip to content

Commit 41276b4

Browse files
dertinlaanwj
authored andcommitted
Update ax_boost_filesystem.m4 to serial 26
- Fixed cut-and-paste error. - See http://savannah.gnu.org/patch/?7576 for further details. - Use 'ls -r' rather than non-portable tool 'tac'. - Simplify filepattern in ls expression so dylib (on OSX) are also detected.
1 parent 3f06448 commit 41276b4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/m4/ax_boost_filesystem.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# and this notice are preserved. This file is offered as-is, without any
3232
# warranty.
3333

34-
#serial 21
34+
#serial 26
3535

3636
AC_DEFUN([AX_BOOST_FILESYSTEM],
3737
[
@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
8181
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
8282
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
8383
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.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.dylib$;\1;'` ; do
84+
for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
8585
ax_lib=${libextension}
8686
AC_CHECK_LIB($ax_lib, exit,
8787
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
8888
[link_filesystem="no"])
8989
done
90-
if test "x$link_program_options" != "xyes"; then
91-
for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
90+
if test "x$link_filesystem" != "xyes"; then
91+
for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
9292
ax_lib=${libextension}
9393
AC_CHECK_LIB($ax_lib, exit,
9494
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],

0 commit comments

Comments
 (0)