[svn-commits] qwell: trunk r259439 - /trunk/main/editline/

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Apr 27 16:13:01 2010
New Revision: 259439

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259439
Log:
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:
    trunk/main/editline/Makefile.in
    trunk/main/editline/configure
    trunk/main/editline/configure.in

Modified: trunk/main/editline/Makefile.in
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/Makefile.in?view=diff&rev=259439&r1=259438&r2=259439
==============================================================================
--- trunk/main/editline/Makefile.in (original)
+++ trunk/main/editline/Makefile.in Tue Apr 27 16:13:01 2010
@@ -1,12 +1,10 @@
 #
 # Generic Makefile for libedit.
 #
-
-GREP=@GREP@
 
 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: trunk/main/editline/configure.in
URL: http://svnview.digium.com/svn/asterisk/trunk/main/editline/configure.in?view=diff&rev=259439&r1=259438&r2=259439
==============================================================================
--- trunk/main/editline/configure.in (original)
+++ trunk/main/editline/configure.in Tue Apr 27 16:13:01 2010
@@ -76,8 +76,7 @@
 
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_PATH_PROG(AR, ar, , $PATH)
-AC_PROG_GREP
+AC_PATH_PROGS(AR, ar gar, , $PATH)
 
 dnl Search for termcap access routines in termcap, tinfo, curses, and ncurses.
 AC_CHECK_LIB(termcap, tgetent, , \