diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-01-15 20:18:53 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-01-15 20:18:53 +0000 |
| commit | 9a7efae8fdfb623faa62f06c700cf5682917e3d0 (patch) | |
| tree | 3764b7db8fba602dfed1ff89b7de5a45b07403d9 /apps | |
| parent | 73694e15f1af715fc6ca051f0fc5842f4da7f644 (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: https://origsvn.digium.com/svn/asterisk/trunk@168734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 20dd25cd9..04ddf1fbc 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -47,10 +47,8 @@ c-client (http://www.washington.edu/imap/ /*** MAKEOPTS <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so apps/app_directory.o apps/app_directory.so"> <member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC"> - <depend>odbc</depend> + <depend>generic_odbc</depend> <depend>ltdl</depend> - <use>unixodbc</use> - <use>iodbc</use> <conflict>IMAP_STORAGE</conflict> <defaultenabled>no</defaultenabled> </member> |