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 /build_tools/menuselect-deps.in | |
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 'build_tools/menuselect-deps.in')
-rw-r--r-- | build_tools/menuselect-deps.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 2cb92f8f1..190c164bc 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.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@ |