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 /makeopts.in | |
| 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 'makeopts.in')
| -rw-r--r-- | makeopts.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/makeopts.in b/makeopts.in index 09020e59b..3cdb62e27 100644 --- a/makeopts.in +++ b/makeopts.in @@ -85,6 +85,9 @@ EDITLINE_LIB=@EDITLINE_LIB@ FREETDS_INCLUDE=@FREETDS_INCLUDE@ FREETDS_LIB=@FREETDS_LIB@ +GENERIC_ODBC_INCLUDE=@GENERIC_ODBC_INCLUDE@ +GENERIC_ODBC_LIB=@GENERIC_ODBC_LIB@ + GMIME_INCLUDE=@GMIME_INCLUDE@ GMIME_LIB=@GMIME_LIB@ |