kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove the PBX_ODBC logic from the configure script, and add GENERIC_ODCB logic that includes copying the relevant LIB and INCLUDE data from either UnixODBC or iODBC, based on which was found; if both were found, prefer UnixODBC

Browse Source 
this stops modules from being linked against both sets of libraries on systems that have both installed



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@168734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-01-15 20:18:53 +00:00
parent 73694e15f1
commit 9a7efae8fd
10 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cdr/cdr_adaptive_odbc.c
View File

@@ -25,9 +25,8 @@
*/
/*** MODULEINFO
<depend>odbc</depend>
<use>unixodbc</use>
<use>iodbc</use>
<depend>generic_odbc</depend>
<depend>ltdl</depend>
***/
#include "asterisk.h"

4
cdr/cdr_odbc.c
View File

@@ -29,10 +29,8 @@
*/
/*** MODULEINFO
<depend>odbc</depend>
<depend>generic_odbc</depend>
<depend>ltdl</depend>
<use>unixodbc</use>
<use>iodbc</use>
***/
#include "asterisk.h"