bzr commit into mysql-6.0-sea branch (v.narayanan:2773) WL#4380

[Narayanan V]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-sea

 2773 Narayanan V	2008-08-20 [merge]
      WL#4380
      
      Merging mysql-5.1-sea -> mysql-6.0-sea
modified:
  Makefile.am
  configure.in

=== modified file 'Makefile.am'
--- a/Makefile.am	2008-08-05 12:23:37 +0000
+++ b/Makefile.am	2008-08-20 07:07:09 +0000
@@ -63,7 +63,7 @@ dist-hook:
 		--datadir=$(distdir)/win/data \
 		--srcdir=$(top_srcdir)
 
-all-local:		abi_check
+all-local:		@ABI_CHECK@	
 
 tags:
 	support-files/build-tags
@@ -270,8 +270,6 @@ 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 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

=== modified file 'configure.in'
--- a/configure.in	2008-08-20 06:48:43 +0000
+++ b/configure.in	2008-08-20 07:07:09 +0000
@@ -470,6 +470,17 @@ 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)
 AC_MSG_CHECKING("how to check if pid exists")