Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

1 files changed, 5 insertions, 0 deletions

diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 7c177f54258..39095f59ffa 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -18,12 +18,17 @@ autoconf
 # Default to gcc for CC and CXX
 if test -z "$CXX" ; then
   export CXX=gcc
+  # Set some required compile options
+  if test -z "$CXXFLAGS" ; then
+    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
+  fi
 fi
 
 if test -z "$CC" ; then
   export CC=gcc
 fi
 
+
 # Use ccache, if available
 if ccache -V > /dev/null 2>&1
 then