Merged revisions 217638 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r217638 | tilghman | 2009-09-10 13:17:14 -0500 (Thu, 10 Sep 2009) | 4 lines
  
  Verify support for wide ODBC character types before using them.
  (closes issue #15870)
   Reported by: nic_bellamy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-09-10 18:18:39 +00:00
parent 3205bd2c30
commit c0c763be9b
4 changed files with 8420 additions and 9103 deletions

View File

@@ -1545,6 +1545,20 @@ else
fi
AC_SUBST(EDITLINE_LIB)
if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then
# Does ODBC support wide characters?
AC_MSG_CHECKING(whether ODBC has support for Unicode types)
AC_LINK_IFELSE(
AC_LANG_PROGRAM(
[#include <sql.h>
#include <sqlext.h>],
[int foo = SQL_WCHAR]),
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_ODBC_WCHAR], [1], [Define to 1 if your ODBC library has wide (Unicode) types.]),
AC_MSG_RESULT(no)
)
fi
AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0])
AC_SUBST(PBX_H323)