LibreOffice/online
1
0
Fork 0
mirror of https://github.com/LibreOffice/online.git synced 2025-08-16 17:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "m4: fix 'char exit()' conflicts with built-in declaration 'void exit(int)'"

Browse Source 
This reverts commit 82207d6967.
This commit is contained in:
Jan Holesovsky
2019-03-15 17:28:01 +01:00
parent 95f4d70ea7
commit c2aebb05f2
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
m4/ax_boost_locale.m4
View File

@ -84,16 +84,14 @@ 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}
LDFLAGS="$LDFLAGS_SAVE -l$ax_lib"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include<boost/locale.hpp>],[boost::locale::pgettext("test","test");])],
AC_CHECK_LIB($ax_lib, exit,
[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}
LDFLAGS="$LDFLAGS_SAVE -l$ax_lib"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include<boost/locale.hpp>],[boost::locale::pgettext("test","test");])],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
[link_locale="no"])
done
@ -101,8 +99,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include<boost/locale.hpp>],[boost::locale::pge
else
for ax_lib in $ax_boost_user_locale_lib boost_locale-$ax_boost_user_locale_lib; do
LDFLAGS="$LDFLAGS_SAVE -l$ax_lib"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include<boost/locale.hpp>],[boost::locale::pgettext("test","test");])],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
[link_locale="no"])
done