diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2014-07-08 08:47:37 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-07-08 08:47:37 +0200 |
| commit | 8353e06738b2428bb1714ad11acc10c5218f5a1c (patch) | |
| tree | 62af1c165c83106c78c27cd9159d5b68bd0b6f7c /m4 | |
| parent | ea99831348f2c24e9c98a603902a3614d4a58183 (diff) | |
Updates to build system
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libtool-link.m4 | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4 index 27b07a1..f02811f 100644 --- a/m4/libtool-link.m4 +++ b/m4/libtool-link.m4 @@ -10,8 +10,6 @@ dnl linking and it does this using the C++ compiler. dnl AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[ AC_LANG_SAVE -save_CXX="$CXX" -CXX="./libtool --tag=CXX --mode=link $CXX -no-install" AC_LANG(C++) if test -d .libs; then @@ -20,11 +18,29 @@ else delete_libs_dir=yes fi -AC_LINK_IFELSE([$1], [$2], [$3]) +AC_COMPILE_IFELSE([$1], +[ + ac_try='./libtool --tag=CXX --mode=link $CXX -no-install $CXXFLAGS $LDFLAGS -o conftest conftest.$OBJEXT $LIBS >&AS_MESSAGE_LOG_FD' + if _AC_DO_VAR(ac_try); then + libtool_link_ok=yes + else + libtool_link_ok=no + fi +], +[ + libtool_link_ok=no +]) -if test x"$delete_libs_dir" != xyes; then +if test x"$delete_libs_dir" = xyes; then rm -rf .libs fi -CXX="$save_CXX" +if test x"$libtool_link_ok" = xyes; then +[$2] +: +else +[$3] +: +fi + AC_LANG_RESTORE])dnl |