From 613f156da4fd92c7a0b46ca3dedf43dad4c5b2c1 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Fri, 31 Jan 2014 22:36:34 +0000 Subject: [PATCH] Revert "Fix configure ODBC logic" This reverts commit 46501075cd147790159e4c5f9240dd7e3a40da39. --- configure.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index ec448ca124..a811482646 100644 --- a/configure.in +++ b/configure.in @@ -397,17 +397,15 @@ 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="yes"],[enable_core_odbc_support="no"]) + [AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],,[enable_core_odbc_support="no"]) if test "x$enable_core_odbc_support" != "xno"; then 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" - else - 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" + elif test "x$enable_core_odbc_support" = "xyes" ; then + AC_MSG_ERROR([no usable libodbc; please install unixodbc devel package or equivalent]) fi fi