Commit: 76ce1f5dc5f6bccf226a51cfed60877b4901e0fa - MolDS (git)

Commit MetaInfo

• Revision: 76ce1f5dc5f6bccf226a51cfed60877b4901e0fa (tree)
• Time: 2013-01-02 04:03:28
• Author: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Log Message

Fix a bug in testing -rpath flag for ld. #28588

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/automake@1231 1136aad2-a195-0410-b898-f5ea1d11b9d8

Change Summary

• modified: src/configure.ac

Incremental Difference

--- a/src/configure.ac
+++ b/src/configure.ac
@@ -167,11 +167,14 @@ AX_BOOST_BASE([1.48],,[AC_MSG_FAILURE([boost library is too old!])])
 dnl Check whether ld accepts -rpath option
 AC_CACHE_CHECK([whether ld accepts -rpath option],[molds_cv_ld_accepts_rpath],
                [LDFLAGS_save=$LDFLAGS]
+               [LIBS_save=$LIBS]
                [LDFLAGS="-Wl,-rpath=$BOOST_LIBDIR"]
-               [AC_LINK_IFELSE([AC_LANG_SOURCE([return 0;])],
+               [LIBS=""]
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM(,[return 0;])],
                                [molds_cv_ld_accepts_rpath=yes],
                                [molds_cv_ld_accepts_rpath=no])]
-               [LDFLAGS=$LDFLAGS_save])
+               [LDFLAGS=$LDFLAGS_save]
+               [LIBS=$LIBS_save])
 
 AS_IF([test x$molds_cv_ld_accepts_rpath == xyes],
       [BOOST_LDFLAGS="$BOOST_LDFLAGS -Wl,-rpath=$BOOST_LIBDIR"])