From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 23 Aug 2010 21:35:09 +0000 (+0000)
Subject: Merged revisions 283319 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2425
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20d02604df9bdc99bf7f4ede4a1c91ab9ee02e64;p=thirdparty%2Fasterisk.git

Merged revisions 283319 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r283319 | tilghman | 2010-08-23 16:33:47 -0500 (Mon, 23 Aug 2010) | 9 lines

  Merged revisions 283318 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r283318 | tilghman | 2010-08-23 16:32:14 -0500 (Mon, 23 Aug 2010) | 2 lines

    CDR drivers depend upon res_odbc, not directly on the ODBC libraries
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index 857ad726a5..f0b0e99bfb 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -25,8 +25,7 @@
  */
 
 /*** MODULEINFO
-	<depend>generic_odbc</depend>
-	<depend>ltdl</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index ab4a1455d6..f77d60b2c2 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -29,8 +29,7 @@
  */
 
 /*** MODULEINFO
-	<depend>generic_odbc</depend>
-	<depend>ltdl</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_adaptive_odbc.c b/cel/cel_adaptive_odbc.c
index f5bd4a3c83..2ab759bbf8 100644
--- a/cel/cel_adaptive_odbc.c
+++ b/cel/cel_adaptive_odbc.c
@@ -27,8 +27,7 @@
  */
 
 /*** MODULEINFO
-	<depend>generic_odbc</depend>
-	<depend>ltdl</depend>
+	<depend>res_odbc</depend>
  ***/
 
 #include "asterisk.h"