Merge mysql.com:/home/jimw/my/mysql-4.0-9690

into mysql.com:/home/jimw/my/mysql-4.0-clean

configure.in

@@ -368,7 +368,7 @@ then
   # 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