[asterisk-commits] kpfleming: trunk r168734 - in /trunk: ./ apps/ build_tools/ cdr/ funcs/ res/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jan 15 14:18:53 CST 2009
Author: kpfleming
Date: Thu Jan 15 14:18:53 2009
New Revision: 168734
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168734
Log:
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
Modified:
trunk/apps/app_voicemail.c
trunk/build_tools/menuselect-deps.in
trunk/cdr/cdr_adaptive_odbc.c
trunk/cdr/cdr_odbc.c
trunk/configure
trunk/configure.ac
trunk/funcs/func_odbc.c
trunk/makeopts.in
trunk/res/res_config_odbc.c
trunk/res/res_odbc.c
Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Thu Jan 15 14:18:53 2009
@@ -47,10 +47,8 @@
/*** MAKEOPTS
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so apps/app_directory.o apps/app_directory.so">
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
- <depend>odbc</depend>
+ <depend>generic_odbc</depend>
<depend>ltdl</depend>
- <use>unixodbc</use>
- <use>iodbc</use>
<conflict>IMAP_STORAGE</conflict>
<defaultenabled>no</defaultenabled>
</member>
Modified: trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/svn-view/asterisk/trunk/build_tools/menuselect-deps.in?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/build_tools/menuselect-deps.in (original)
+++ trunk/build_tools/menuselect-deps.in Thu Jan 15 14:18:53 2009
@@ -3,6 +3,7 @@
CURL=@PBX_CURL@
DAHDI=@PBX_DAHDI@
FREETDS=@PBX_FREETDS@
+GENERIC_ODBC=@PBX_GENERIC_ODBC@
GMIME=@PBX_GMIME@
GNU_LD=@GNU_LD@
GSM=@PBX_GSM@
@@ -24,7 +25,6 @@
NBS=@PBX_NBS@
NETSNMP=@PBX_NETSNMP@
NEWT=@PBX_NEWT@
-ODBC=@PBX_ODBC@
OGG=@PBX_OGG@
OPENH323=@PBX_OPENH323@
OSPTK=@PBX_OSPTK@
Modified: trunk/cdr/cdr_adaptive_odbc.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/cdr/cdr_adaptive_odbc.c?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/cdr/cdr_adaptive_odbc.c (original)
+++ trunk/cdr/cdr_adaptive_odbc.c Thu Jan 15 14:18:53 2009
@@ -25,9 +25,8 @@
*/
/*** MODULEINFO
- <depend>odbc</depend>
- <use>unixodbc</use>
- <use>iodbc</use>
+ <depend>generic_odbc</depend>
+ <depend>ltdl</depend>
***/
#include "asterisk.h"
Modified: trunk/cdr/cdr_odbc.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/cdr/cdr_odbc.c?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/cdr/cdr_odbc.c (original)
+++ trunk/cdr/cdr_odbc.c Thu Jan 15 14:18:53 2009
@@ -29,10 +29,8 @@
*/
/*** MODULEINFO
- <depend>odbc</depend>
+ <depend>generic_odbc</depend>
<depend>ltdl</depend>
- <use>unixodbc</use>
- <use>iodbc</use>
***/
#include "asterisk.h"
Modified: trunk/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/trunk/configure.ac?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jan 15 14:18:53 2009
@@ -1319,12 +1319,6 @@
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 @@
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
Modified: trunk/funcs/func_odbc.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/funcs/func_odbc.c?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/funcs/func_odbc.c (original)
+++ trunk/funcs/func_odbc.c Thu Jan 15 14:18:53 2009
@@ -27,11 +27,7 @@
*/
/*** MODULEINFO
- <depend>odbc</depend>
- <depend>ltdl</depend>
<depend>res_odbc</depend>
- <use>unixodbc</use>
- <use>iodbc</use>
***/
#define USE_ODBC
Modified: trunk/makeopts.in
URL: http://svn.digium.com/svn-view/asterisk/trunk/makeopts.in?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Thu Jan 15 14:18:53 2009
@@ -85,6 +85,9 @@
FREETDS_INCLUDE=@FREETDS_INCLUDE@
FREETDS_LIB=@FREETDS_LIB@
+GENERIC_ODBC_INCLUDE=@GENERIC_ODBC_INCLUDE@
+GENERIC_ODBC_LIB=@GENERIC_ODBC_LIB@
+
GMIME_INCLUDE=@GMIME_INCLUDE@
GMIME_LIB=@GMIME_LIB@
Modified: trunk/res/res_config_odbc.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Thu Jan 15 14:18:53 2009
@@ -29,11 +29,7 @@
*/
/*** MODULEINFO
- <depend>odbc</depend>
- <depend>ltdl</depend>
<depend>res_odbc</depend>
- <use>unixodbc</use>
- <use>iodbc</use>
***/
#include "asterisk.h"
Modified: trunk/res/res_odbc.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/res/res_odbc.c?view=diff&rev=168734&r1=168733&r2=168734
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Thu Jan 15 14:18:53 2009
@@ -30,10 +30,8 @@
*/
/*** MODULEINFO
- <depend>odbc</depend>
+ <depend>generic_odbc</depend>
<depend>ltdl</depend>
- <use>unixodbc</use>
- <use>iodbc</use>
***/
#include "asterisk.h"
More information about the asterisk-commits
mailing list