kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

improve odbc detection

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11885 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Raymond Chandler 2009-02-11 18:51:12 +00:00
parent f0b3a9a427
commit c3cf71b448
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/config/odbc.m4
View File

@ -24,6 +24,7 @@ AC_DEFUN([ODBC_INC_WHERE], [
AC_DEFUN([ODBC_LIB_WHERE1], [ AC_DEFUN([ODBC_LIB_WHERE1], [
saved_LIBS=$LIBS saved_LIBS=$LIBS
saved_CFLAGS=$CFLAGS
case "$host" in case "$host" in
*darwin*) *darwin*)
LIBS="$saved_LIBS -L$1 -lodbc -framework CoreFoundation" LIBS="$saved_LIBS -L$1 -lodbc -framework CoreFoundation"
@ -32,6 +33,7 @@ case "$host" in
LIBS="$saved_LIBS -L$1 -lodbc" LIBS="$saved_LIBS -L$1 -lodbc"
;; ;;
esac esac
CFLAGS="$saved_CFLAGS -I$ac_cv_odbc_where_inc"
AC_TRY_LINK( AC_TRY_LINK(
[#include <sql.h>], [#include <sql.h>],
[SQLHDBC con; [SQLHDBC con;
@ -39,6 +41,7 @@ SQLDisconnect(con);],
[ac_cv_found_odbc_lib=yes], [ac_cv_found_odbc_lib=yes],
ac_cv_found_odbc_lib=no) ac_cv_found_odbc_lib=no)
LIBS=$saved_LIBS LIBS=$saved_LIBS
CFLAGS=$saved_CFLAGS
]) ])
AC_DEFUN([TEST_LIBPATH], [ AC_DEFUN([TEST_LIBPATH], [
@ -115,6 +118,13 @@ AC_ARG_WITH(odbc-include,
fi fi
fi fi
if test "X$with_odbc_include" != "X"; then
ac_cv_odbc_where_inc=$with_odbc_include
fi
if test "X$ac_cv_odbc_where_inc" = "X"; then
ODBC_INC_WHERE(/usr/include /usr/local/include)
fi
if test "X$with_odbc_lib" != "X"; then if test "X$with_odbc_lib" != "X"; then
ac_cv_odbc_where_lib=$with_odbc_lib ac_cv_odbc_where_lib=$with_odbc_lib
fi fi
@ -124,13 +134,6 @@ AC_ARG_WITH(odbc-include,
]) ])
fi fi
if test "X$with_odbc_include" != "X"; then
ac_cv_odbc_where_inc=$with_odbc_include
fi
if test "X$ac_cv_odbc_where_inc" = "X"; then
ODBC_INC_WHERE(/usr/include /usr/local/include)
fi
AC_MSG_CHECKING(whether to include odbc) AC_MSG_CHECKING(whether to include odbc)
if test "X$ac_cv_odbc_where_lib" = "X" -a "X$ac_cv_odbc_where_inc" = "X"; then if test "X$ac_cv_odbc_where_lib" = "X" -a "X$ac_cv_odbc_where_inc" = "X"; then
ac_cv_found_odbc=no ac_cv_found_odbc=no
@ -138,9 +141,9 @@ AC_ARG_WITH(odbc-include,
else else
ac_cv_found_odbc=yes ac_cv_found_odbc=yes
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
ODBC_INC_DIR=$ac_cv_pcap_where_inc ODBC_INC_DIR=$ac_cv_odbc_where_inc
ODBC_LIB_DIR=$ac_cv_pcap_where_lib ODBC_LIB_DIR=$ac_cv_odbc_where_lib
ODBC_INC_FLAGS="-I$ac_cv_pcap_where_inc" ODBC_INC_FLAGS="-I$ac_cv_odbc_where_inc"
ODBC_LIB_FLAGS="-Wl,-lodbc" ODBC_LIB_FLAGS="-Wl,-lodbc"
case "$host" in case "$host" in
*darwin*) *darwin*)