[svn-commits] russell: branch 1.6.1 r196947 - in /branches/1.6.1: ./ autoconf/ include/aste...

[SVN commits to the Digium repositories]

Author: russell
Date: Tue May 26 17:42:04 2009
New Revision: 196947

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

........
  r196946 | russell | 2009-05-26 17:40:34 -0500 (Tue, 26 May 2009) | 8 lines
  
  Update configure script to check for OSP toolkit 3.5.0.
  
  (closes issue #14988)
  Reported by: tzafrir
  Patches:
        configure.ac.diff uploaded by homesick (license 91)
        new_ast_check_osptk.m4 uploaded by homesick (license 91)
........

Added:
    branches/1.6.1/autoconf/ast_check_osptk.m4
      - copied unchanged from r196946, trunk/autoconf/ast_check_osptk.m4
Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configure
    branches/1.6.1/configure.ac
    branches/1.6.1/include/asterisk/autoconfig.h.in

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

Modified: branches/1.6.1/configure.ac
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/configure.ac?view=diff&rev=196947&r1=196946&r2=196947
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Tue May 26 17:42:04 2009
@@ -1490,7 +1490,7 @@
 
 if test "$PBX_OPENSSL" = "1";
 then
-    AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl])
+    AST_CHECK_OSPTK([3], [5], [0])
 fi
 
 AST_EXT_TOOL_CHECK([GMIME], [gmime], [], [], [#include <gmime/gmime.h>], [gboolean q = g_mime_check_version(0,0,0);])

Modified: branches/1.6.1/include/asterisk/autoconfig.h.in
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/autoconfig.h.in?view=diff&rev=196947&r1=196946&r2=196947
==============================================================================
--- branches/1.6.1/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.1/include/asterisk/autoconfig.h.in Tue May 26 17:42:04 2009
@@ -586,9 +586,6 @@
 
 /* Define this to indicate the ${OSPTK_DESCRIP} library */
 #undef HAVE_OSPTK
-
-/* Define to indicate the ${OSPTK_DESCRIP} library version */
-#undef HAVE_OSPTK_VERSION
 
 /* Define this to indicate the ${OSS_DESCRIP} library */
 #undef HAVE_OSS