bzr commit into mysql-6.0-falcon branch (vvaintroub:2817)

[Vladislav Vaintroub]

#At file:///G:/bzr/mysql-6.0-falcon-team/

 2817 Vladislav Vaintroub	2008-09-11 [merge]
      merge 6.0->6.0-falcon-team
modified:
  Makefile.am
  configure.in

=== modified file 'Makefile.am'
--- a/Makefile.am	2008-09-11 16:28:29 +0000
+++ b/Makefile.am	2008-09-11 18:36:05 +0000
@@ -64,8 +64,8 @@ dist-hook:
 		--srcdir=$(top_srcdir)
 	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
 
-# TODO: uncomment abi_check (next line) if you get a merge conflict here.
-#all-local:		abi_check
+
+all-local:		@ABI_CHECK@	
 
 tags:
 	support-files/build-tags
@@ -272,12 +272,10 @@ TEST_PREPROCESSOR_HEADER = $(top_srcdir)
 #    to prevent seeing these messages.
 # 2) sed the output to 
 #    2.1) remove blank lines and lines that begin with "# "
-#         (The header information is retained to enable easy
-#         analysis of abi diffs at a later stage).
-#    2.2) When gcc -E is run in the Mac OS it introduces a line of output 
-#         that results in showing up as a difference between the .pp and 
-#         .out files. Remove this OS specific preprocessor text inserted by
-#         the preprocessor in the MAC OS. 
+#    2.2) When gcc -E is run on the Mac OS  and solaris sparc platforms it 
+#         introduces a line of output that shows up as a difference between
+#         the .pp and .out files. Remove these OS specific preprocessor text
+#         inserted by the preprocessor. 
 # 3) diff the generated file and the canons (.pp files already in
 #    the repository).
 # 4) delete the .out file that is generated.
@@ -317,7 +315,8 @@ do_abi_check:
 	                                 $$file 2>/dev/null | \
 	                  @SED@ -e '/^# /d' \
 	                            -e '/^[ 	]*$$/d' \
-	                            -e '/^#pragma GCC set_debug_pwd/d' > \
+	                            -e '/^#pragma GCC set_debug_pwd/d' \
+	                            -e '/^#ident/d' > \
 	                                       $(top_builddir)/abi_check.out; \
 	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
 	                  @RM@ $(top_builddir)/abi_check.out; \

=== modified file 'configure.in'
--- a/configure.in	2008-09-11 16:28:29 +0000
+++ b/configure.in	2008-09-11 18:36:05 +0000
@@ -9,7 +9,7 @@ AC_CANONICAL_SYSTEM
 # remember to also update version.c in ndb
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 6.0.7-alpha)
+AM_INIT_AUTOMAKE(mysql, 6.0.8-alpha)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 NDB_VERSION_MAJOR=6
@@ -469,6 +469,17 @@ fi
 AC_SUBST(HOSTNAME)
 AC_SUBST(PERL)
 AC_SUBST(PERL5)
+
+# Enable the abi_check rule only if gcc is available
+
+if expr "$CC" : ".*gcc.*"
+then
+  ABI_CHECK="abi_check"
+else
+  ABI_CHECK=""
+fi
+
+AC_SUBST(ABI_CHECK)
 
 # Lock for PS
 AC_PATH_PROG(PS, ps, ps)