|
31 | 31 | # and this notice are preserved. This file is offered as-is, without any
|
32 | 32 | # warranty.
|
33 | 33 |
|
34 |
| -#serial 21 |
| 34 | +#serial 26 |
35 | 35 |
|
36 | 36 | AC_DEFUN([AX_BOOST_FILESYSTEM],
|
37 | 37 | [
|
@@ -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.*\)\.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 |
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 |
| - 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 |
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],
|
|
0 commit comments