From: Date: November 26 2008 5:25pm Subject: bzr commit into mysql-6.0-falcon branch (hky:2919) Bug#40700 List-Archive: http://lists.mysql.com/commits/59961 X-Bug: 40700 Message-Id: <20081126162542.029901237B7@lu0011.efendi.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/hakan/work/mysql/mysql-6.0-falcon/ based on revid:hky@stripped 2919 Hakan Kuecuekyilmaz 2008-11-26 Fix for Bug#40700 aclocal warnings for missing cache-id's. Checked with autoconf 2.61 and 2.63 and aclocal 1.10.1. modified: config/ac-macros/misc.m4 storage/falcon/plug.in per-file messages: config/ac-macros/misc.m4 Cached variables must contain _cv_. storage/falcon/plug.in Cached variables must contain _cv_. === modified file 'config/ac-macros/misc.m4' --- a/config/ac-macros/misc.m4 2008-02-26 19:54:19 +0000 +++ b/config/ac-macros/misc.m4 2008-11-26 16:25:23 +0000 @@ -593,15 +593,15 @@ dnl ------------------------------------ dnl MYSQL_NEEDS_MYSYS_NEW AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW], -[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new, +[AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new, [ AC_LANG_PUSH(C++) AC_TRY_LINK([], [ class A { public: int b; }; A *a=new A; a->b=10; delete a; -], mysql_use_mysys_new=no, mysql_use_mysys_new=yes) +], mysql_cv_use_mysys_new=no, mysql_cv_use_mysys_new=yes) AC_LANG_POP(C++) ]) -if test "$mysql_use_mysys_new" = "yes" +if test "$mysql_cv_use_mysys_new" = "yes" then AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers]) fi === modified file 'storage/falcon/plug.in' --- a/storage/falcon/plug.in 2008-11-03 08:56:28 +0000 +++ b/storage/falcon/plug.in 2008-11-26 16:25:23 +0000 @@ -9,12 +9,12 @@ AC_CHECK_FUNC(atomic_cas_32, AC_DEFINE([ # Check for supported machine types. AC_CACHE_CHECK([if Falcon Storage Engine is supported on $MACHINE_TYPE], - falcon_supported_by_machine,[ + falcon_cv_supported_by_machine,[ case "$BASE_MACHINE_TYPE" in - i386) falcon_supported_by_machine="yes" ;; - amd64) falcon_supported_by_machine="yes" ;; - x86_64) falcon_supported_by_machine="yes" ;; - powerpc)falcon_supported_by_machine="yes" ;; + i386) falcon_cv_supported_by_machine="yes" ;; + amd64) falcon_cv_supported_by_machine="yes" ;; + x86_64) falcon_cv_supported_by_machine="yes" ;; + powerpc)falcon_cv_supported_by_machine="yes" ;; sparc) AC_TRY_LINK([ #include @@ -23,11 +23,11 @@ int compare= 1; int exchange= 2; ],[ #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) - /* When compiling with Sun Studio compiler we need the Solaris atomic + /* When compiling with Sun Studio compiler we need the Solaris atomic functions. These were first introduced in Solaris 10. */ #if defined(HAVE_SOLARIS_ATOMIC) return 0; -#else +#else /* Fail if the atomic functions are not available. Support for this will be added when the fix for bug 37622 is completed. */ #error Need Solaris atomic functions to use Sun Studio compiler @@ -48,14 +48,14 @@ int exchange= 2; : "memory", "cc" ) #endif /* !__SUNPRO_C && !__SUNPRO_CC */ - ], falcon_supported_by_machine="yes", - falcon_supported_by_machine="no") + ], falcon_cv_supported_by_machine="yes", + falcon_cv_supported_by_machine="no") ;; - *) falcon_supported_by_machine="no" ;; + *) falcon_cv_supported_by_machine="no" ;; esac ]) -if test "$falcon_supported_by_machine" != "yes"; then +if test "$falcon_cv_supported_by_machine" != "yes"; then mysql_plugin_falcon="no" with_plugin_falcon="no" fi @@ -67,10 +67,10 @@ MYSQL_PLUGIN_ACTIONS(falcon,[ AC_LANG_PUSH([C++]) ac_save_CXXFLAGS="$CXXFLAGS" AC_CACHE_CHECK([compiler flag to enable implicit templates], - falcon_cxx_enable_implicit_templates,[ + falcon_cv_cxx_enable_implicit_templates,[ CXXFLAGS="$ac_save_CXXFLAGS -fimplicit-templates" AC_LINK_IFELSE([AC_LANG_PROGRAM()], - falcon_cxx_enable_implicit_templates="-fimplicit-templates" + falcon_cv_cxx_enable_implicit_templates="-fimplicit-templates" ) ]) @@ -79,30 +79,30 @@ MYSQL_PLUGIN_ACTIONS(falcon,[ # doing that it should be removed from here, and the CXXLDFLAG setting below # will do the right thing for g++. AC_CACHE_CHECK([compiler flag to enable exceptions], - falcon_cxx_enable_exceptions,[ + falcon_cv_cxx_enable_exceptions,[ m4_foreach([cxxflag], [[-fexceptions -lstdc++], [-features=except]],[ CXXFLAGS="$ac_save_CXXFLAGS cxxflag" AC_LINK_IFELSE([AC_LANG_PROGRAM()], - falcon_cxx_enable_exceptions="cxxflag" + falcon_cv_cxx_enable_exceptions="cxxflag" ) ]) ]) AC_CACHE_CHECK([linker flag to enable STL], - falcon_cxx_enable_stl,[ + falcon_cv_cxx_enable_stl,[ m4_foreach([cxxflag], [-lstdc++],[ CXXFLAGS="$ac_save_CXXFLAGS cxxflag" AC_LINK_IFELSE([AC_LANG_PROGRAM()], - falcon_cxx_enable_stl="cxxflag" + falcon_cv_cxx_enable_stl="cxxflag" ) ]) ]) AC_CACHE_CHECK([compiler flag to silence offsetof warnings], - falcon_cxx_no_invalid_offsetof,[ + falcon_cv_cxx_no_invalid_offsetof,[ CXXFLAGS="$ac_save_CXXFLAGS -Wno-invalid-offsetof" AC_LINK_IFELSE([AC_LANG_PROGRAM()], - falcon_cxx_no_invalid_offsetof="-Wno-invalid-offsetof" + falcon_cv_cxx_no_invalid_offsetof="-Wno-invalid-offsetof" ) ]) @@ -110,8 +110,8 @@ MYSQL_PLUGIN_ACTIONS(falcon,[ AC_LANG_POP([C++]) # Falcon uses exceptions and STL. - CXXLDFLAGS="$CXXLDFLAGS $falcon_cxx_enable_stl" - FALCON_CXXFLAGS="$falcon_cxx_no_invalid_offsetof $falcon_cxx_enable_implicit_templates $falcon_cxx_enable_exceptions" + CXXLDFLAGS="$CXXLDFLAGS $falcon_cv_cxx_enable_stl" + FALCON_CXXFLAGS="$falcon_cv_cxx_no_invalid_offsetof $falcon_cv_cxx_enable_implicit_templates $falcon_cv_cxx_enable_exceptions" case "$with_debug" in yes) FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG" ;; full) FALCON_CXXFLAGS="$FALCON_CXXFLAGS -D_DEBUG -DMEM_DEBUG" ;; @@ -120,7 +120,7 @@ MYSQL_PLUGIN_ACTIONS(falcon,[ AC_SUBST([FALCON_CXXFLAGS]) # When compiling with Sun Studio compiler on SPARC assembly code for - # Interlock operations needs to be included. This has been implemented + # Interlock operations needs to be included. This has been implemented # as "inline templates" in a separate file FALCON_SPARC_ASSEMBLY="" case $host in