diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-15 20:18:53 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-15 20:18:53 +0000 |
| commit | fe480759d927d3b4576af945a36d6afc5113884e (patch) | |
| tree | 3764b7db8fba602dfed1ff89b7de5a45b07403d9 /cdr | |
| parent | 9c759ce0bc8e43f332abeb95894a26f02425ab08 (diff) | |
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
this stops modules from being linked against both sets of libraries on systems that have both installed
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@168734 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_adaptive_odbc.c | 5 | ||||
| -rw-r--r-- | cdr/cdr_odbc.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c index 6b9b090f3..6c72d19c7 100644 --- a/cdr/cdr_adaptive_odbc.c +++ b/cdr/cdr_adaptive_odbc.c @@ -25,9 +25,8 @@ */ /*** MODULEINFO - <depend>odbc</depend> - <use>unixodbc</use> - <use>iodbc</use> + <depend>generic_odbc</depend> + <depend>ltdl</depend> ***/ #include "asterisk.h" diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index 1b497661b..8af2edc20 100644 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -29,10 +29,8 @@ */ /*** MODULEINFO - <depend>odbc</depend> + <depend>generic_odbc</depend> <depend>ltdl</depend> - <use>unixodbc</use> - <use>iodbc</use> ***/ #include "asterisk.h" |