Skip to content

Commit

Permalink
Merged revisions 69702 via svnmerge from
Browse files Browse the repository at this point in the history
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69702 | russell | 2007-06-18 11:35:02 -0500 (Mon, 18 Jun 2007) | 6 lines

To prevent 92138749238754 more reports of "I have unixodbc installed, but
still can't build *_odbc.so!", check for ltdl directly, instead of just listing
it as another library to include in the unixodbc check in the configure script.
This also makes ltdl show up as a dependency in menuselect so people know what
to go install.  (related to issue #9989, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
  • Loading branch information
russellb committed Jun 18, 2007
1 parent f4eeab6 commit 4365827
Show file tree
Hide file tree
Showing 9 changed files with 458 additions and 13 deletions.
1 change: 1 addition & 0 deletions apps/app_voicemail.c
Expand Up @@ -48,6 +48,7 @@ c-client (http://www.washington.edu/imap/
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o">
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
<depend>unixodbc</depend>
<depend>ltdl</depend>
<conflict>IMAP_STORAGE</conflict>
<defaultenabled>no</defaultenabled>
</member>
Expand Down
1 change: 1 addition & 0 deletions build_tools/menuselect-deps.in
Expand Up @@ -10,6 +10,7 @@ IKSEMEL=@PBX_IKSEMEL@
IMAP_TK=@PBX_IMAP_TK@
IXJUSER=@PBX_IXJUSER@
KDE=@PBX_KDE@
LTDL=@PBX_LTDL@
NBS=@PBX_NBS@
NETSNMP=@PBX_NETSNMP@
NEWT=@PBX_NEWT@
Expand Down
1 change: 1 addition & 0 deletions cdr/cdr_odbc.c
Expand Up @@ -30,6 +30,7 @@

/*** MODULEINFO
<depend>unixodbc</depend>
<depend>ltdl</depend>
***/

#include "asterisk.h"
Expand Down

0 comments on commit 4365827

Please sign in to comment.