bk commit into 6.0 tree (hakank:1.2641)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank 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, 2008-04-23 19:44:00+02:00, hakank@lu0011.(none) +1 -0
  Hand merged from release build to fix Solaris build issues.

  storage/falcon/plug.in@stripped, 2008-04-23 19:43:58+02:00, hakank@lu0011.(none) +6 -6
    Hand merged from release build to fix Solaris build issues.

diff -Nrup a/storage/falcon/plug.in b/storage/falcon/plug.in
--- a/storage/falcon/plug.in	2008-04-16 12:32:03 +02:00
+++ b/storage/falcon/plug.in	2008-04-23 19:43:58 +02:00
@@ -52,7 +52,7 @@ MYSQL_PLUGIN_ACTIONS(falcon,[
   AC_CACHE_CHECK([compiler flag to enable implicit templates],
                  falcon_cxx_enable_implicit_templates,[
     CXXFLAGS="$ac_save_CXXFLAGS -fimplicit-templates"
-    AC_TRY_COMPILE([],
+    AC_TRY_LINK([],
       [int i = 0;
        i++;],
       falcon_cxx_enable_implicit_templates="-fimplicit-templates",
@@ -62,11 +62,11 @@ MYSQL_PLUGIN_ACTIONS(falcon,[
 
   AC_CACHE_CHECK([compiler flag to enable exceptions],
                  falcon_cxx_enable_exceptions,[
-    CXXFLAGS="$ac_save_CXXFLAGS -fexceptions"
-    AC_TRY_COMPILE([],
+    CXXFLAGS="$ac_save_CXXFLAGS -fexceptions -lstdc++"
+    AC_TRY_LINK([],
       [int i = 0;
        i++;],
-      falcon_cxx_enable_exceptions="-fexceptions",
+      falcon_cxx_enable_exceptions="-fexceptions -lstdc++",
       falcon_cxx_enable_exceptions=""
     )
   ])
@@ -74,7 +74,7 @@ MYSQL_PLUGIN_ACTIONS(falcon,[
   AC_CACHE_CHECK([compiler flag to silence offsetof warnings],
                  falcon_cxx_no_invalid_offsetof,[
     CXXFLAGS="$ac_save_CXXFLAGS -Wno-invalid-offsetof"
-    AC_TRY_COMPILE([],
+    AC_TRY_LINK([],
       [int i = 0;
        i++;],
       falcon_cxx_no_invalid_offsetof="-Wno-invalid-offsetof",
@@ -86,7 +86,7 @@ MYSQL_PLUGIN_ACTIONS(falcon,[
   AC_LANG_POP([C++])
 
   # Falcon uses exceptions and STL.
-  CXXLDFLAGS="$CXXLDFLAGS $falcon_cxx_enable_exceptions -lstdc++"
+  CXXLDFLAGS="$CXXLDFLAGS $falcon_cxx_enable_exceptions"
   FALCON_CXXFLAGS="$falcon_cxx_no_invalid_offsetof $falcon_cxx_enable_implicit_templates $falcon_cxx_enable_exceptions"
   case "$with_debug" in
     yes)  FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG" ;;