From 418dd166438bb1762963d738db75fb5d175b6ae9 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Fri, 31 Jan 2014 22:36:51 +0000 Subject: [PATCH] Revert "Improve configure ODBC handling" This reverts commit 60c56109bc57ec2b73dcced346ec3e7db8a18325, reversing changes made to d7d5847ddaf5f9f85ed51b68f2b94db55e697f8d. --- configure.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index a811482646..f8db4899e2 100644 --- a/configure.in +++ b/configure.in @@ -397,16 +397,14 @@ AM_CONDITIONAL([ENABLE_ZRTP],[test "x$enable_zrtp" != "xno"]) AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) -enable_core_odbc_support="no" AC_ARG_ENABLE(core-odbc-support, [AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],,[enable_core_odbc_support="no"]) +AX_LIB_ODBC +if test "$ac_cv_found_odbc" = "yes" ; then + enable_core_odbc_support="yes" +fi if test "x$enable_core_odbc_support" != "xno"; then - AX_LIB_ODBC - if test "x$ac_cv_found_odbc" = "xyes" ; then - enable_core_odbc_support="yes" - elif test "x$enable_core_odbc_support" = "xyes" ; then - AC_MSG_ERROR([no usable libodbc; please install unixodbc devel package or equivalent]) - fi + AC_CHECK_LIB([odbc], [SQLDisconnect],, AC_MSG_ERROR([no usable libodbc; please install unixodbc devel package or equivalent])) fi CHECK_LIBUUID