bk commit into 6.0 tree (antony:1.2601)

[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-09-27 16:39:28-07:00, antony@stripped +1 -0
  Fix build failures on architectures not supported by Falcon

  storage/falcon/plug.in@stripped, 2007-09-27 16:39:20-07:00, antony@stripped +19 -20
    Fix build failures on architectures not supported by Falcon

diff -Nrup a/storage/falcon/plug.in b/storage/falcon/plug.in
--- a/storage/falcon/plug.in	2007-09-20 08:42:50 -07:00
+++ b/storage/falcon/plug.in	2007-09-27 16:39:20 -07:00
@@ -3,6 +3,22 @@ MYSQL_STORAGE_ENGINE(falcon, falcon, [Fa
 MYSQL_PLUGIN_DIRECTORY(falcon, [storage/falcon])
 MYSQL_PLUGIN_STATIC(falcon,   [libfalcon.a])
 MYSQL_PLUGIN_DYNAMIC(falcon,  [ha_falcon.la])
+#
+
+AC_CACHE_CHECK([if Falcon Storage Engine is supported on $MACHINE_TYPE],
+  			   falcon_supported_by_machine,[
+  case "$BASE_MACHINE_TYPE" in
+    i386)   falcon_supported_by_machine="yes" ;;
+    x86_64) falcon_supported_by_machine="yes" ;;
+    *) falcon_supported_by_machine="no" ;;
+  esac
+])
+
+if test "$falcon_supported_by_machine" != "yes"; then
+  mysql_plugin_falcon="no"	
+  with_plugin_falcon="no"	
+fi
+
 # Generate Makefile for TransformLib
 MYSQL_PLUGIN_ACTIONS(falcon,[
   AC_CONFIG_FILES(storage/falcon/TransformLib/Makefile)
@@ -22,30 +38,13 @@ MYSQL_PLUGIN_ACTIONS(falcon,[
     AC_LANG_POP([C++])
   ])
 
-  AC_CACHE_CHECK([if Falcon Storage Engine is supported on $MACHINE_TYPE],
-  			     falcon_supported_by_machine,[
-    case "$BASE_MACHINE_TYPE" in
-      i386)   falcon_supported_by_machine="yes" ;;
-      x86_64) falcon_supported_by_machine="yes" ;;
-	  *) falcon_supported_by_machine="no" ;;
-    esac
-  ])
-  
   # Falcon uses exceptions and STL
+  CXXLDFLAGS="$CXXLDFLAGS -lstdc++"
   FALCON_CXXFLAGS="$falcon_cxx_no_invalid_offsetof -fexceptions"
   case "$with_debug" in
-	yes)  FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG -DMEM_DEBUG" ;;
-	full) FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG -DMEM_DEBUG" ;;
+    yes)  FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG -DMEM_DEBUG" ;;
+    full) FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG -DMEM_DEBUG" ;;
   esac
-
-  if test "$falcon_supported_by_machine" = "yes"; then
-    CXXLDFLAGS="$CXXLDFLAGS -lstdc++"
-  else
-    plugin_falcon_static_target=""
-	plugin_falcon_shared_target=""
-	mysql_plugin_falcon="no"	
-	with_plugin_falcon="no"	
-  fi
 
   AC_SUBST([FALCON_CXXFLAGS])
 ])