mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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
This commit is contained in:
@@ -3,6 +3,7 @@ CRYPTO=@PBX_CRYPTO@
|
||||
CURL=@PBX_CURL@
|
||||
DAHDI=@PBX_DAHDI@
|
||||
FREETDS=@PBX_FREETDS@
|
||||
GENERIC_ODBC=@PBX_GENERIC_ODBC@
|
||||
GMIME=@PBX_GMIME@
|
||||
GNU_LD=@GNU_LD@
|
||||
GSM=@PBX_GSM@
|
||||
@@ -24,7 +25,6 @@ MISDN=@PBX_MISDN@
|
||||
NBS=@PBX_NBS@
|
||||
NETSNMP=@PBX_NETSNMP@
|
||||
NEWT=@PBX_NEWT@
|
||||
ODBC=@PBX_ODBC@
|
||||
OGG=@PBX_OGG@
|
||||
OPENH323=@PBX_OPENH323@
|
||||
OSPTK=@PBX_OSPTK@
|
||||
|
Reference in New Issue
Block a user