From 9a7efae8fdfb623faa62f06c700cf5682917e3d0 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 15 Jan 2009 20:18:53 +0000
Subject: 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: https://origsvn.digium.com/svn/asterisk/trunk@168734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 configure | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 1b6d730f3..40575e9b9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 166058 .
+# From configure.ac Revision: 168522 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -1013,6 +1013,9 @@ CONFIG_SDL
 CONFIG_GTK
 PKGCONFIG
 CURL_CONFIG
+GENERIC_ODBC_LIB
+GENERIC_ODBC_INCLUDE
+PBX_GENERIC_ODBC
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -52491,6 +52494,25 @@ _ACEOF
    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_config_files="$ac_config_files build_tools/menuselect-deps makeopts channels/h323/Makefile"
 
 
@@ -53706,10 +53728,13 @@ CONFIG_SDL!$CONFIG_SDL$ac_delim
 CONFIG_GTK!$CONFIG_GTK$ac_delim
 PKGCONFIG!$PKGCONFIG$ac_delim
 CURL_CONFIG!$CURL_CONFIG$ac_delim
+GENERIC_ODBC_LIB!$GENERIC_ODBC_LIB$ac_delim
+GENERIC_ODBC_INCLUDE!$GENERIC_ODBC_INCLUDE$ac_delim
+PBX_GENERIC_ODBC!$PBX_GENERIC_ODBC$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-- 
cgit v1.2.3