[svn-commits] qwell: branch 1.6.0 r259466 - in /branches/1.6.0: ./ main/editline/

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Apr 27 16:22:10 2010
New Revision: 259466

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259466
Log:
Merged revisions 259439 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r259439 | qwell | 2010-04-27 16:13:01 -0500 (Tue, 27 Apr 2010) | 5 lines
  
  Add gar to the check for AR for those silly OSes (Solaris) that don't have ar.
  
  autoconf2.13 couldn't handle AC_PROG_GREP, so I removed it.  This is fine,
  since we don't need to use anything that the configure script doesn't.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/editline/Makefile.in
    branches/1.6.0/main/editline/configure
    branches/1.6.0/main/editline/configure.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/editline/Makefile.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/editline/Makefile.in?view=diff&rev=259466&r1=259465&r2=259466
==============================================================================
--- branches/1.6.0/main/editline/Makefile.in (original)
+++ branches/1.6.0/main/editline/Makefile.in Tue Apr 27 16:22:10 2010
@@ -4,7 +4,7 @@
 
 OSTYPE=$(shell uname -s)
 define cyg_subst_sys
-	if uname -s | ${GREP} -qi cygwin; then \
+	if uname -s | grep -i cygwin > /dev/null; then \
 	cat $@ | sed -e s/"sys\.h"/"config.h"/g > $@.copy; \
 	mv --force $@.copy $@; \
 	fi

Modified: branches/1.6.0/main/editline/configure.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/editline/configure.in?view=diff&rev=259466&r1=259465&r2=259466
==============================================================================
--- branches/1.6.0/main/editline/configure.in (original)
+++ branches/1.6.0/main/editline/configure.in Tue Apr 27 16:22:10 2010
@@ -76,7 +76,7 @@
 
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_PATH_PROG(AR, ar, , $PATH)
+AC_PATH_PROGS(AR, ar gar, , $PATH)
 
 dnl Search for termcap access routines in termcap, tinfo, curses, and ncurses.
 AC_CHECK_LIB(termcap, tgetent, , \