m4/ax_boost_locale.m4 | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 82207d6967349de3e4df880a5279b0efe3319f9a
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Thu Feb 7 11:58:54 2019 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Tue Mar 5 17:19:15 2019 -0400
m4: fix 'char exit()' conflicts with built-in declaration 'void exit(int)'
Change-Id: I87a12ac12511e044851e3189ede9c5cb76be26c5
diff --git a/m4/ax_boost_locale.m4 b/m4/ax_boost_locale.m4
index adaedf09e..30e763e78 100644
--- a/m4/ax_boost_locale.m4
+++ b/m4/ax_boost_locale.m4
@@ -84,14 +84,16 @@ AC_DEFUN([AX_BOOST_LOCALE],
if test "x$ax_boost_user_locale_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_locale*.so*
$BOOSTLIBDIR/libboost_locale*.dylib* $BOOSTLIBDIR/libboost_locale*.a*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_locale.*\)\.so.*$;\1;' -e
's;^lib\(boost_locale.*\)\.dylib.*$;\1;' -e
's;^lib\(boost_locale.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
+LDFLAGS="$LDFLAGS_SAVE -l$ax_lib"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include<boost/locale.hpp>],[boost::locale::pgettext("test","test");])],
[BOOST_LOCALE_LIB="-l$ax_lib";
AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
[link_locale="no"])
done
if test "x$link_locale" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_locale*.dll*
$BOOSTLIBDIR/boost_locale*.a* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_locale.*\)\.dll.*$;\1;' -e 's;^\(boost_locale.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
+LDFLAGS="$LDFLAGS_SAVE -l$ax_lib"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include<boost/locale.hpp>],[boost::locale::pgettext("test","test");])],
[BOOST_LOCALE_LIB="-l$ax_lib";
AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
[link_locale="no"])
done
@@ -99,7 +101,8 @@ AC_DEFUN([AX_BOOST_LOCALE],
else
for ax_lib in $ax_boost_user_locale_lib
boost_locale-$ax_boost_user_locale_lib; do
- AC_CHECK_LIB($ax_lib, exit,
+LDFLAGS="$LDFLAGS_SAVE -l$ax_lib"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include<boost/locale.hpp>],[boost::locale::pgettext("test","test");])],
[BOOST_LOCALE_LIB="-l$ax_lib";
AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
[link_locale="no"])
done
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
