[asterisk-commits] seanbright: branch 1.6.0 r129345 - in /branches/1.6.0: ./ main/editline/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jul  9 08:46:07 2008
New Revision: 129345

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

................
r129344 | seanbright | 2008-07-09 09:44:43 -0400 (Wed, 09 Jul 2008) | 12 lines

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:
    branches/1.6.0/main/editline/makelist.in
      - copied unchanged from r129344, trunk/main/editline/makelist.in
Removed:
    branches/1.6.0/main/editline/makelist
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://svn.digium.com/view/asterisk/branches/1.6.0/main/editline/Makefile.in?view=diff&rev=129345&r1=129344&r2=129345
==============================================================================
--- branches/1.6.0/main/editline/Makefile.in (original)
+++ branches/1.6.0/main/editline/Makefile.in Wed Jul  9 08:46:07 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.6.0/main/editline/configure.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/editline/configure.in?view=diff&rev=129345&r1=129344&r2=129345
==============================================================================
--- branches/1.6.0/main/editline/configure.in (original)
+++ branches/1.6.0/main/editline/configure.in Wed Jul  9 08:46:07 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
@@ -271,4 +272,5 @@
 AC_SUBST(TCSRCS)
 
 AC_CONFIG_HEADER(config.h)
-AC_OUTPUT(Makefile)
+AC_OUTPUT([Makefile makelist])
+