Skip to content

Commit f9374ca

Browse files
dertinlaanwj
authored andcommitted
Update ax_boost_system.m4 to serial 17
- Use 'ls -r' rather than non-portable tool 'tac'. Simplify filepattern in ls expression so dylib (on OSX) are also detected.
1 parent 2fb6510 commit f9374ca

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/m4/ax_boost_system.m4

Lines changed: 3 additions & 3 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 14
34+
#serial 17
3535

3636
AC_DEFUN([AX_BOOST_SYSTEM],
3737
[
@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
8383
8484
LDFLAGS_SAVE=$LDFLAGS
8585
if test "x$ax_boost_user_system_lib" = "x"; then
86-
for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
86+
for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
8787
ax_lib=${libextension}
8888
AC_CHECK_LIB($ax_lib, exit,
8989
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
9090
[link_system="no"])
9191
done
9292
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.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
93+
for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
9494
ax_lib=${libextension}
9595
AC_CHECK_LIB($ax_lib, exit,
9696
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],

0 commit comments

Comments
 (0)