[svn-commits] tilghman: branch 1.6.2 r267973 - in /branches/1.6.2: ./ autoconf/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jun  4 11:33:10 2010
New Revision: 267973

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

................
  r267972 | tilghman | 2010-06-04 11:31:25 -0500 (Fri, 04 Jun 2010) | 9 lines
  
  Merged revisions 267971 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r267971 | tilghman | 2010-06-04 11:27:02 -0500 (Fri, 04 Jun 2010) | 2 lines
    
    As-fixiate the build process
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/autoconf/libcurl.m4
    branches/1.6.2/configure
    branches/1.6.2/configure.ac

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

Modified: branches/1.6.2/autoconf/libcurl.m4
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/autoconf/libcurl.m4?view=diff&rev=267973&r1=267972&r2=267973
==============================================================================
--- branches/1.6.2/autoconf/libcurl.m4 (original)
+++ branches/1.6.2/autoconf/libcurl.m4 Fri Jun  4 11:33:10 2010
@@ -55,6 +55,7 @@
   AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
   AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
   AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
+  AC_SUBST(PBX_CURL)
 
   AC_ARG_WITH(libcurl,
      AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=267973&r1=267972&r2=267973
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Fri Jun  4 11:33:10 2010
@@ -296,7 +296,6 @@
 AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
 AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec])
 AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
-AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
 AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
 AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography], [crypto])
 AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])