bk commit into 6.0 tree (antony:1.2648) BUG#31268

[antony]

Below is the list of changes that have just been committed into a local
6.0 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-26 02:52:17-07:00, antony@stripped +1 -0
  Bug#31268
    "Build failure on host sol10-amd64-a
    Add test to check if libstdc++ really works

  storage/falcon/plug.in@stripped, 2007-10-26 02:52:10-07:00, antony@stripped +31 -1
    Bug31268
      Add test to check if libstdc++ really works

diff -Nrup a/storage/falcon/plug.in b/storage/falcon/plug.in
--- a/storage/falcon/plug.in	2007-10-17 18:10:56 -07:00
+++ b/storage/falcon/plug.in	2007-10-26 02:52:10 -07:00
@@ -14,7 +14,37 @@ AC_CACHE_CHECK([if Falcon Storage Engine
   esac
 ])
 
-if test "$falcon_supported_by_machine" != "yes"; then
+# Falcon requires working libstdc++ libraries for exceptions
+AC_CACHE_CHECK([usable libstdc++ library for Falcon], falcon_stdcxx_is_good,[
+  ac_save_LDFLAGS="$LDFLAGS"
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  LDFLAGS="$LDFLAGS -fexceptions -lstdc++"
+  CXXFLAGS="$CXXFLAGS -fexceptions"
+  AC_TRY_RUN([#include <iostream>
+using namespace std;
+int main()
+{
+  try
+  {
+    cout << "";
+  }
+  catch (...)
+  {
+    // Foo
+  }
+  return 0;
+}], falcon_stdcxx_is_good=yes,
+    falcon_stdcxx_is_good=no,
+    falcon_stdcxx_is_good=no)dnl # Cross compiling: not supported
+  AC_LANG_RESTORE
+  LDFLAGS="$ac_save_LDFLAGS"  
+  CXXFLAGS="$ac_save_CXXFLAGS"
+])
+
+if test "$falcon_supported_by_machine" != "yes" -o\
+        "$falcon_stdcxx_is_good" != "yes"; then
   mysql_plugin_falcon="no"
   with_plugin_falcon="no"
 fi