Fix configure ODBC logic
...and rewrite entire block for better clarity of purpose.
We might want to look more closely at the AX_LIB_ODBC macro as well.
This amends commit dfd591e9f5
.
This commit is contained in:
parent
f5f4df3483
commit
ef35dc6343
12
configure.in
12
configure.in
|
@ -402,15 +402,17 @@ AM_CONDITIONAL([ENABLE_ZRTP],[test "x$enable_zrtp" != "xno"])
|
||||||
|
|
||||||
AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
|
AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
|
||||||
|
|
||||||
enable_core_odbc_support="no"
|
|
||||||
AC_ARG_ENABLE(core-odbc-support,
|
AC_ARG_ENABLE(core-odbc-support,
|
||||||
[AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],,[enable_core_odbc_support="no"])
|
[AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],[enable_core_odbc_support="yes"],[enable_core_odbc_support="no"])
|
||||||
if test "x$enable_core_odbc_support" != "xno"; then
|
if test "x$enable_core_odbc_support" != "xno"; then
|
||||||
AX_LIB_ODBC
|
AX_LIB_ODBC
|
||||||
if test "x$ac_cv_found_odbc" = "xyes" ; then
|
if test "x$ac_cv_found_odbc" = "xyes"; then
|
||||||
enable_core_odbc_support="yes"
|
enable_core_odbc_support="yes"
|
||||||
elif test "x$enable_core_odbc_support" = "xyes" ; then
|
else
|
||||||
AC_MSG_ERROR([no usable libodbc; please install unixodbc devel package or equivalent])
|
if test "x$enable_core_odbc_support" = "xyes"; then
|
||||||
|
AC_MSG_ERROR([no usable libodbc; please install unixodbc devel package or equivalent])
|
||||||
|
else
|
||||||
|
enable_core_odbc_support="no"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue