Minor fixes for Mac OS Mavericks

diff --git a/config/boost.m4 b/config/boost.m4
index 8eb1b7b1848d4bb7b63a4d0b4fcc4ed87d6ca9e3..80a696881884bc43a49e295afe6055ffd7c7bea4 100644 (file)
--- a/config/boost.m4
+++ b/config/boost.m4
@@ -406,7 +406,7 @@ dnl generated only once above (before we start the for loops).
       LDFLAGS=$boost_save_LDFLAGS
       LIBS=$boost_save_LIBS
       if test x"$Boost_lib" = xyes; then
-        Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath"
+        Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-rpath -Wl,$boost_ldpath"
         Boost_lib_LDPATH="$boost_ldpath"
         break 6
       else

diff --git a/configure.ac b/configure.ac
index 1aad3ab6c99f64040567a9d1cb641d4da49e6d95..43f3325e5052211264627b4e6276f6386307bee2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -766,8 +766,8 @@ typedef pb_ds::priority_queue<void, void, void> pq;])],
 
 If you're using a non-GCC compiler (such as clang), you may need to explicitly
 use the GNU standard C++ library by passing:
-    CXXFLAGS='-stdlib=libstdc++'
-as an argument to this configure script.
+    CXXFLAGS='-stdlib=libstdc++' CPPFLAGS='-stdlib=libstdc++'
+as arguments to this configure script.
 This is the case on Mac OS Mavericks, for example.])])])
 AC_LANG_POP([C++])
 AC_MSG_RESULT([$CVC4_PB_DS_NAMESPACE])