From: Date: April 28 2005 2:14am
Subject: bk commit into 4.0 tree (jimw:1.2082) BUG#9690
List-Archive: http://lists.mysql.com/internals/24426
X-Bug: 9690
Message-Id: <20050428001455.49507A87FD@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
4.0 repository of jimw. When jimw 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
  1.2082 05/04/27 17:14:53 jimw@stripped +1 -0
  Backport fix from 4.1 for testing whether CXX is gcc. (Bug #9690)

  configure.in
    1.324 05/04/27 17:14:51 jimw@stripped +1 -1
    Use more flexible for test for CXX being gcc.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.0-9690

--- 1.323/configure.in	2005-03-29 06:34:30 -08:00
+++ 1.324/configure.in	2005-04-27 17:14:51 -07:00
@@ -368,7 +368,7 @@
   # we will gets some problems when linking static programs.
   # The following code is used to fix this problem.
 
-  if test "$CXX" = "gcc" -o "$CXX" = "ccache gcc"
+  if echo $CXX | grep gcc > /dev/null 2>&1
   then
     if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1
     then