Manual merge

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

1 files changed, 21 insertions, 2 deletions

diff --git a/configure.in b/configure.in
index 8b0a0ddeb56..62098da77fc 100644
--- a/configure.in
+++ b/configure.in
@@ -123,8 +123,25 @@ AM_SANITY_CHECK
 # This is needed is SUBDIRS is set
 AC_PROG_MAKE_SET
 
-# This is need before AC_PROG_CC
-#
+##############################################################################
+# The below section needs to be done before AC_PROG_CC
+##############################################################################
+
+# Hack for OS X/Darwin and Metrowerks CodeWarrior
+AC_ARG_WITH(darwin-mwcc,
+[  --with-darwin-mwcc      Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[
+  builddir=`pwd`
+  ccwrapper="$builddir/support-files/MacOSX/mwcc-wrapper"
+  arwrapper="$builddir/support-files/MacOSX/mwar-wrapper"
+  CC="$ccwrapper"
+  CXX="$ccwrapper"
+  LD="$ccwrapper"
+  AR="$arwrapper"
+  RANLIB=:
+  export CC CXX LD AR RANLIB
+  AC_SUBST(AR)
+  AC_SUBST(RANLIB)
+])
 
 if test "x${CFLAGS-}" = x ; then
   cflags_is_set=no
@@ -144,6 +161,8 @@ else
   ldflags_is_set=yes
 fi
 
+################ End of section to be done before AC_PROG_CC #################
+
 # The following hack should ensure that configure doesn't add optimizing
 # or debugging flags to CFLAGS or CXXFLAGS
 # C_EXTRA_FLAGS are flags that are automaticly added to both