[asterisk-commits] tilghman: trunk r267972 - in /trunk: ./ autoconf/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jun  4 11:31:25 2010
New Revision: 267972

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267972
Log:
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:
    trunk/   (props changed)
    trunk/autoconf/libcurl.m4
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/autoconf/libcurl.m4
URL: http://svnview.digium.com/svn/asterisk/trunk/autoconf/libcurl.m4?view=diff&rev=267972&r1=267971&r2=267972
==============================================================================
--- trunk/autoconf/libcurl.m4 (original)
+++ trunk/autoconf/libcurl.m4 Fri Jun  4 11:31:25 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: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=267972&r1=267971&r2=267972
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Jun  4 11:31:25 2010
@@ -304,7 +304,6 @@
 AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec])
 AST_EXT_LIB_SETUP([BLUETOOTH], [Bluetooth], [bluetooth])
 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])