bk commit into 6.0 tree (hakank:1.2615)

[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-16 12:32:07+02:00, hakank@lu0011.(none) +4 -0
  Fix for 
  CXXFLAGS is a user variable, you should not override it;
  use AM_CXXFLAGS instead.
  
  Thanks to Timothy, who fixed this issue.

  configure.in@stripped, 2008-04-16 12:32:03+02:00, hakank@lu0011.(none) +3 -0
    Fix for 
    CXXFLAGS is a user variable, you should not override it;
    use AM_CXXFLAGS instead.

  storage/falcon/Makefile.am@stripped, 2008-04-16 12:32:03+02:00, hakank@lu0011.(none) +1 -1
    Fix for 
    CXXFLAGS is a user variable, you should not override it;
    use AM_CXXFLAGS instead.

  storage/falcon/TransformLib/Makefile.am@stripped, 2008-04-16 12:32:03+02:00, hakank@lu0011.(none) +1 -1
    Fix for 
    CXXFLAGS is a user variable, you should not override it;
    use AM_CXXFLAGS instead.

  storage/falcon/plug.in@stripped, 2008-04-16 12:32:03+02:00, hakank@lu0011.(none) +30 -7
    Fix for 
    CXXFLAGS is a user variable, you should not override it;
    use AM_CXXFLAGS instead.

diff -Nrup a/configure.in b/configure.in
--- a/configure.in	2008-04-07 17:26:34 +02:00
+++ b/configure.in	2008-04-16 12:32:03 +02:00
@@ -2753,6 +2753,9 @@ case $SYSTEM_TYPE in
 esac
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
+# Ensure that $(MYSQL_EXTRA_CXXFLAGS) is last
+CXXFLAGS="$CXXFLAGS \$(MYSQL_EXTRA_CXXFLAGS)"
+
 # Output results
 if test -d "$srcdir/pstack" ; then
   AC_CONFIG_FILES(pstack/Makefile pstack/aout/Makefile)
diff -Nrup a/storage/falcon/Makefile.am b/storage/falcon/Makefile.am
--- a/storage/falcon/Makefile.am	2008-02-29 20:02:47 +01:00
+++ b/storage/falcon/Makefile.am	2008-04-16 12:32:03 +02:00
@@ -16,7 +16,7 @@
 SUBDIRS= TransformLib
 
 # Re-enable implicit templates and exceptions
-CXXFLAGS= @CXXFLAGS@ -fimplicit-templates @FALCON_CXXFLAGS@
+MYSQL_EXTRA_CXXFLAGS = @FALCON_CXXFLAGS@
 
 DEFS= @DEFS@ \
       -D_REENTRANT -D_PTHREADS -DENGINE -DSTORAGE_ENGINE -DNAMESPACE=Nfs
diff -Nrup a/storage/falcon/TransformLib/Makefile.am b/storage/falcon/TransformLib/Makefile.am
--- a/storage/falcon/TransformLib/Makefile.am	2007-09-30 23:11:01 +02:00
+++ b/storage/falcon/TransformLib/Makefile.am	2008-04-16 12:32:03 +02:00
@@ -14,7 +14,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # Re-enable implicit templates and exceptions
-CXXFLAGS= @CXXFLAGS@ -fimplicit-templates -fexceptions
+MYSQL_EXTRA_CXXFLAGS = @FALCON_CXXFLAGS@
 
 INCLUDES= -I$(srcdir)/.. @ZLIB_INCLUDES@
 
diff -Nrup a/storage/falcon/plug.in b/storage/falcon/plug.in
--- a/storage/falcon/plug.in	2008-03-11 16:16:31 +01:00
+++ b/storage/falcon/plug.in	2008-04-16 12:32:03 +02:00
@@ -47,24 +47,47 @@ fi
 MYSQL_PLUGIN_ACTIONS(falcon,[
   AC_CONFIG_FILES(storage/falcon/TransformLib/Makefile)
 
+  AC_LANG_PUSH([C++])
+  ac_save_CXXFLAGS="$CXXFLAGS"
+  AC_CACHE_CHECK([compiler flag to enable implicit templates],
+                 falcon_cxx_enable_implicit_templates,[
+    CXXFLAGS="$ac_save_CXXFLAGS -fimplicit-templates"
+    AC_TRY_COMPILE([],
+      [int i = 0;
+       i++;],
+      falcon_cxx_enable_implicit_templates="-fimplicit-templates",
+      falcon_cxx_enable_implicit_templates=""
+    )
+  ])
+
+  AC_CACHE_CHECK([compiler flag to enable exceptions],
+                 falcon_cxx_enable_exceptions,[
+    CXXFLAGS="$ac_save_CXXFLAGS -fexceptions"
+    AC_TRY_COMPILE([],
+      [int i = 0;
+       i++;],
+      falcon_cxx_enable_exceptions="-fexceptions",
+      falcon_cxx_enable_exceptions=""
+    )
+  ])
+
   AC_CACHE_CHECK([compiler flag to silence offsetof warnings],
                  falcon_cxx_no_invalid_offsetof,[
-    AC_LANG_PUSH([C++])
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS -Wno-invalid-offsetof"
+    CXXFLAGS="$ac_save_CXXFLAGS -Wno-invalid-offsetof"
     AC_TRY_COMPILE([],
       [int i = 0;
        i++;],
       falcon_cxx_no_invalid_offsetof="-Wno-invalid-offsetof",
       falcon_cxx_no_invalid_offsetof=""
     )
-    CXXFLAGS=$ac_save_CXXFLAGS
-    AC_LANG_POP([C++])
   ])
 
+  CXXFLAGS=$ac_save_CXXFLAGS
+  AC_LANG_POP([C++])
+
   # Falcon uses exceptions and STL.
-  CXXLDFLAGS="$CXXLDFLAGS -fexceptions -lstdc++"
-  FALCON_CXXFLAGS="$falcon_cxx_no_invalid_offsetof -fexceptions"
+  CXXLDFLAGS="$CXXLDFLAGS $falcon_cxx_enable_exceptions -lstdc++"
+  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" ;;
     full) FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG -DMEM_DEBUG" ;;