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 /res | |
| 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 'res')
| -rw-r--r-- | res/res_config_odbc.c | 4 | ||||
| -rw-r--r-- | res/res_odbc.c | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 8de431475..3ecb70e48 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -29,11 +29,7 @@ */ /*** MODULEINFO - <depend>odbc</depend> - <depend>ltdl</depend> <depend>res_odbc</depend> - <use>unixodbc</use> - <use>iodbc</use> ***/ #include "asterisk.h" diff --git a/res/res_odbc.c b/res/res_odbc.c index 5864c7da4..165cf872b 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -30,10 +30,8 @@ */ /*** MODULEINFO - <depend>odbc</depend> + <depend>generic_odbc</depend> <depend>ltdl</depend> - <use>unixodbc</use> - <use>iodbc</use> ***/ #include "asterisk.h" |