[svn-commits] kpfleming: branch 1.6.0 r151244 - in /branches/1.6.0: ./ autoconf/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Oct 20 00:03:58 2008
New Revision: 151244

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151244
Log:
Merged revisions 151242-151243 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r151242 | kpfleming | 2008-10-20 07:59:04 +0300 (Mon, 20 Oct 2008) | 9 lines
  
  Merged revisions 151240 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r151240 | kpfleming | 2008-10-20 07:45:56 +0300 (Mon, 20 Oct 2008) | 3 lines
    
    break up acinclude.m4 into individual files, which will make it easier to maintain, easier to add new macros (less patching) and will ease maintenance of these macros across Asterisk branches
  ........
................
  r151243 | kpfleming | 2008-10-20 08:00:56 +0300 (Mon, 20 Oct 2008) | 9 lines
  
  Merged revisions 151241 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r151241 | kpfleming | 2008-10-20 07:57:33 +0300 (Mon, 20 Oct 2008) | 2 lines
    
    rename this macro to properly reflect what it does
  ........
................

Added:
    branches/1.6.0/autoconf/
      - copied from r151243, trunk/autoconf/
    branches/1.6.0/autoconf/acx_pthread.m4
      - copied unchanged from r151243, trunk/autoconf/acx_pthread.m4
    branches/1.6.0/autoconf/ast_c_compile_check.m4
      - copied unchanged from r151243, trunk/autoconf/ast_c_compile_check.m4
    branches/1.6.0/autoconf/ast_c_define_check.m4
      - copied unchanged from r151243, trunk/autoconf/ast_c_define_check.m4
    branches/1.6.0/autoconf/ast_check_gnu_make.m4
      - copied unchanged from r151243, trunk/autoconf/ast_check_gnu_make.m4
    branches/1.6.0/autoconf/ast_check_mandatory.m4
      - copied unchanged from r151243, trunk/autoconf/ast_check_mandatory.m4
    branches/1.6.0/autoconf/ast_check_openh323.m4
      - copied unchanged from r151243, trunk/autoconf/ast_check_openh323.m4
    branches/1.6.0/autoconf/ast_check_pwlib.m4
      - copied unchanged from r151243, trunk/autoconf/ast_check_pwlib.m4
    branches/1.6.0/autoconf/ast_ext_lib.m4
      - copied unchanged from r151243, trunk/autoconf/ast_ext_lib.m4
    branches/1.6.0/autoconf/ast_ext_tool_check.m4
      - copied unchanged from r151243, trunk/autoconf/ast_ext_tool_check.m4
    branches/1.6.0/autoconf/ast_func_fork.m4
      - copied unchanged from r151243, trunk/autoconf/ast_func_fork.m4
    branches/1.6.0/autoconf/ast_gcc_attribute.m4
      - copied unchanged from r151243, trunk/autoconf/ast_gcc_attribute.m4
    branches/1.6.0/autoconf/ast_prog_egrep.m4
      - copied unchanged from r151243, trunk/autoconf/ast_prog_egrep.m4
    branches/1.6.0/autoconf/ast_prog_ld.m4
      - copied unchanged from r151243, trunk/autoconf/ast_prog_ld.m4
    branches/1.6.0/autoconf/ast_prog_ld_gnu.m4
      - copied unchanged from r151243, trunk/autoconf/ast_prog_ld_gnu.m4
    branches/1.6.0/autoconf/ast_prog_sed.m4
      - copied unchanged from r151243, trunk/autoconf/ast_prog_sed.m4
Removed:
    branches/1.6.0/acinclude.m4
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/bootstrap.sh
    branches/1.6.0/configure
    branches/1.6.0/configure.ac

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

Modified: branches/1.6.0/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/bootstrap.sh?view=diff&rev=151244&r1=151243&r2=151244
==============================================================================
--- branches/1.6.0/bootstrap.sh (original)
+++ branches/1.6.0/bootstrap.sh Mon Oct 20 00:03:58 2008
@@ -40,7 +40,7 @@
 
 echo "Generating the configure script ..."
 
-aclocal${MY_AM_VER} 2>/dev/null
+aclocal${MY_AM_VER} -Iautoconf
 autoconf${MY_AC_VER}
 autoheader${MY_AC_VER}
 automake${MY_AM_VER} --add-missing --copy 2>/dev/null

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=151244&r1=151243&r2=151244
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Mon Oct 20 00:03:58 2008
@@ -1332,7 +1332,7 @@
 	AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2])
 		
 	if test "${HAS_PWLIB:-unset}" != "unset"; then
-		AST_CHECK_OPENH323_PLATFORM()
+		AST_CHECK_PWLIB_PLATFORM()
 
 		PLATFORM_PWLIB="pt_${PWLIB_PLATFORM}_r"