*** ./configure.ORIG	Tue Jun 21 22:45:20 2011
--- ./configure	Tue Jun 21 22:45:45 2011
***************
*** 3231,3275 ****
  
  
  
- # Set the GREP and EGREP variables to a dummy replacement for the 'grep'
- # command, so that AC_PROG_GREP and AC_PROG_EGREP don't fail when no good
- # 'grep' program is found. This makes it possible to build GNU grep on a
- # Solaris machine that has only /usr/bin/grep and no /usr/xpg4/bin/grep.
- # This function supports only restricted arguments:
- #   - No file names as arguments, process only standard input.
- #   - Only literal strings without backslashes, no regular expressions.
- #   - The only options are -e and -E (and -Ee).
- # This function also does not support long lines beyond what the shell
- # supports), and backslash-processes the input.
- fn_grep () {
-   test "$1" = -E && shift
-   case $#:$1 in
-     0:*) as_fn_error $? "fn_grep: expected pattern" "$LINENO" 5 ;;
-     1:-*) as_fn_error $? "fn_grep: invalid command line" "$LINENO" 5 ;;
-     1:*) pattern=$1 ;;
-     2:--|2:-e|2:-Ee) pattern=$2 ;;
-     *) as_fn_error $? "fn_grep: invalid command line" "$LINENO" 5 ;;
-   esac
- 
-   case $pattern in
-     *[].^$\\*[]*)       as_fn_error $? "fn_grep: regular expressions not supported" "$LINENO" 5  ;;
-   esac
- 
-   rc=1
-   while read line; do
-     case $line in
-       *$pattern*)
-         rc=0
-         $as_echo $line ;;
-     esac
-   done
-   return $rc
- }
- 
- test -n "$GREP" || GREP=fn_grep
- test -n "$EGREP" || EGREP=fn_grep
- ac_cv_path_EGREP=$EGREP
- 
  ac_aux_dir=
  for ac_dir in build-aux "$srcdir"/build-aux; do
    if test -f "$ac_dir/install-sh"; then
--- 3231,3236 ----