bk commit into 5.0 tree (acurtis:1.2135)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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.2135 06/06/21 20:27:52 acurtis@stripped +1 -0
  traditional grep does not have -q option

  config/ac-macros/compiler_flag.m4
    1.4 06/06/21 20:27:48 acurtis@stripped +1 -1
    traditional grep does not have -q option

# 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:	acurtis
# Host:	ltamd64.xiphis.org
# Root:	/home/antony/work2/p4-bug12096.2

--- 1.3/config/ac-macros/compiler_flag.m4	2006-05-31 00:07:54 -07:00
+++ 1.4/config/ac-macros/compiler_flag.m4	2006-06-21 20:27:48 -07:00
@@ -47,7 +47,7 @@ void foo (void) { }
 EOF
   if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS
 		     -S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \
-     && grep -q .note.GNU-stack conftest.s \
+     && grep .note.GNU-stack conftest.s >/dev/null \
      && AC_TRY_COMMAND([${CC-cc} $CCASFLAGS $CPPFLAGS -Wa,--noexecstack
 		       -c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD])
   then