[asterisk-commits] seanbright: branch 1.4 r129343 - /branches/1.4/main/editline/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jul  9 08:41:21 2008
New Revision: 129343

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129343
Log:
Look for the system installed awk instead of assuming it's at /usr/bin/awk.

Pointed out by jmls via #asterisk-dev.

Added:
    branches/1.4/main/editline/makelist.in   (contents, props changed)
      - copied, changed from r129342, branches/1.4/main/editline/makelist
Removed:
    branches/1.4/main/editline/makelist
Modified:
    branches/1.4/main/editline/Makefile.in
    branches/1.4/main/editline/configure
    branches/1.4/main/editline/configure.in

Modified: branches/1.4/main/editline/Makefile.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/editline/Makefile.in?view=diff&rev=129343&r1=129342&r2=129343
==============================================================================
--- branches/1.4/main/editline/Makefile.in (original)
+++ branches/1.4/main/editline/Makefile.in Wed Jul  9 08:41:21 2008
@@ -180,7 +180,7 @@
 	rm -f *.s *.i
 
 distclean : clean
-	rm -f config.cache config.log config.status config.h Makefile
+	rm -f config.cache config.log config.status config.h makelist Makefile
 
 #
 # Internal targets and rules.

Modified: branches/1.4/main/editline/configure.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/editline/configure.in?view=diff&rev=129343&r1=129342&r2=129343
==============================================================================
--- branches/1.4/main/editline/configure.in (original)
+++ branches/1.4/main/editline/configure.in Wed Jul  9 08:41:21 2008
@@ -18,6 +18,7 @@
 S_CFLAGS="-fPIC -DPIC"
 AC_SUBST(S_CFLAGS)
 AC_PROG_CPP
+AC_PROG_AWK
 
 dnl Platform-specific settings.  The ABI can probably be determined
 dnl programmatically, but doing so is error-prone, which makes it generally
@@ -273,4 +274,5 @@
 AC_SUBST(TCSRCS)
 
 AC_CONFIG_HEADER(config.h)
-AC_OUTPUT(Makefile)
+AC_OUTPUT([Makefile makelist])
+

Copied: branches/1.4/main/editline/makelist.in (from r129342, branches/1.4/main/editline/makelist)
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/editline/makelist.in?view=diff&rev=129343&p1=branches/1.4/main/editline/makelist&r1=129342&p2=branches/1.4/main/editline/makelist.in&r2=129343
==============================================================================
--- branches/1.4/main/editline/makelist (original)
+++ branches/1.4/main/editline/makelist.in Wed Jul  9 08:41:21 2008
@@ -39,7 +39,7 @@
 
 # makelist.sh: Automatically generate header files...
 
-AWK=/usr/bin/awk
+AWK=@AWK@
 USAGE="Usage: $0 -h|-e|-fc|-fh|-bc|-bh|-m <filenames>"
 
 if [ "x$1" = "x" ]

Propchange: branches/1.4/main/editline/makelist.in
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: branches/1.4/main/editline/makelist.in
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: branches/1.4/main/editline/makelist.in
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: branches/1.4/main/editline/makelist.in
------------------------------------------------------------------------------
    svn:mime-type = text/plain