[svn-commits] seanbright: editline/trunk r174 - /editline/trunk/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue Jul 27 18:03:57 2010
New Revision: 174

URL: http://svnview.digium.com/svn/thirdparty?view=rev&rev=174
Log:
Merge r129344 from asterisk trunk:

Merged revisions 129343 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r129343 | seanbright | 2008-07-09 09:41:21 -0400 (Wed, 09 Jul 2008) | 4 lines

Look for the system installed awk instead of assuming it's at /usr/bin/awk.

Pointed out by jmls via #asterisk-dev.

........

Added:
    editline/trunk/makelist.in
      - copied, changed from r170, editline/trunk/makelist
Removed:
    editline/trunk/makelist
Modified:
    editline/trunk/Makefile.in
    editline/trunk/configure
    editline/trunk/configure.in

Modified: editline/trunk/Makefile.in
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/Makefile.in?view=diff&rev=174&r1=173&r2=174
==============================================================================
--- editline/trunk/Makefile.in (original)
+++ editline/trunk/Makefile.in Tue Jul 27 18:03:57 2010
@@ -167,7 +167,7 @@
 	rm -f $(TCSRCS:.c=.o) $(TEST)
 
 distclean : clean
-	rm -f config.log config.status config.cache config.h Makefile
+	rm -f config.log config.status config.cache config.h makelist Makefile
 
 #
 # Internal targets and rules.

Modified: editline/trunk/configure.in
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/configure.in?view=diff&rev=174&r1=173&r2=174
==============================================================================
--- editline/trunk/configure.in (original)
+++ editline/trunk/configure.in Tue Jul 27 18:03:57 2010
@@ -18,6 +18,7 @@
 S_CFLAGS="-fPIC -DPIC"
 AC_SUBST(S_CFLAGS)
 AC_PROG_CPP
+AC_PROG_AWK
 dnl Must do this now, otherwise it is only done for NetBSD (see 'case' below)
 
 dnl Platform-specific settings.  The ABI can probably be determined
@@ -261,4 +262,4 @@
 
 AC_CONFIG_HEADER(config.h)
 AH_BOTTOM([#include "sys.h"])
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile makelist)

Copied: editline/trunk/makelist.in (from r170, editline/trunk/makelist)
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/makelist.in?view=diff&rev=174&p1=editline/trunk/makelist&r1=170&p2=editline/trunk/makelist.in&r2=174
==============================================================================
--- editline/trunk/makelist (original)
+++ editline/trunk/makelist.in Tue Jul 27 18:03:57 2010
@@ -35,7 +35,7 @@
 
 # makelist.sh: Automatically generate header files...
 
-AWK=awk
+AWK=@AWK@
 USAGE="Usage: $0 -h|-e|-fc|-fh|-bc|-bh|-m <filenames>"
 
 if [ "x$1" = "x" ]