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 857ad726a5279cc4761912e1e18abffb3fc1c6ff..f0b0e99bfb11f5dc3f1d222167c30e6d1e9362ae 100644 (file)
--- 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 ab4a1455d6185181c62cf592688ed8f3078c42f9..f77d60b2c2891b84ebe11894d616dab9171fecb0 100644 (file)
--- 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 f5bd4a3c832568618910d10a7bfdc08a7f3d5c92..2ab759bbf80f569b23a34111e9128b822d5115f6 100644 (file)
--- 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"