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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index bca65c7a3..5401ae973 100644 --- a/configure.ac +++ b/configure.ac @@ -1319,12 +1319,6 @@ AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], []) -PBX_ODBC=0 -if test "$PBX_IODBC" = "1" -o "$PBX_UNIXODBC" = "1"; then - PBX_ODBC=1 -fi -AC_SUBST(PBX_ODBC) - AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) # Non-glibc platforms require libexecinfo for backtrace support @@ -1682,6 +1676,25 @@ if test "${USE_CURL}" != "no"; then fi fi +# build a GENERIC_ODBC result based on the presence of either UnixODBC (preferred) +# or iODBC + +PBX_GENERIC_ODBC=0 + +if test "${PBX_UNIXODBC}" = 1; then + PBX_GENERIC_ODBC=1 + GENERIC_ODBC_LIB="${UNIXODBC_LIB}" + GENERIC_ODBC_INCLUDE="${UNIXODBC_INCLUDE}" +elif test "${PBX_IODBC}" = 1; then + PBX_GENERIC_ODBC=1 + GENERIC_ODBC_LIB="${IODBC_LIB}" + GENERIC_ODBC_INCLUDE="${IODBC_INCLUDE}" +fi + +AC_SUBST([GENERIC_ODBC_LIB]) +AC_SUBST([GENERIC_ODBC_INCLUDE]) +AC_SUBST([PBX_GENERIC_ODBC]) + AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile]) AST_CHECK_MANDATORY |