fix odbc build on osx

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11634 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index 823454a784221773137d4d054ae90d2e1b7f9066..83fc966439f58e66c1e814b3a36a3c8a8fe27bff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,9 +186,9 @@ CORE_LIBS      += libs/libedit/src/.libs/libedit.a
 endif
 
 if ADD_ODBC
-CORE_CFLAGS    += -DSWITCH_HAVE_ODBC
+CORE_CFLAGS    += -DSWITCH_HAVE_ODBC $(ODBC_INC_FLAGS)
 libfreeswitch_la_SOURCES += src/switch_odbc.c
-libfreeswitch_la_LDFLAGS     += -Wl,-lodbc
+libfreeswitch_la_LDFLAGS     += $(ODBC_LIB_FLAGS)
 endif
 
 bin_SCRIPTS = scripts/gentls_cert scripts/fsxs

diff --git a/build/config/odbc.m4 b/build/config/odbc.m4
index ec70b46adb473df82bbc662f6cb6e19f5b098d81..099ba778d109e9d233d8623a4a67ecad88b3f3f5 100644 (file)
--- a/build/config/odbc.m4
+++ b/build/config/odbc.m4
@@ -24,9 +24,18 @@ AC_DEFUN([ODBC_INC_WHERE], [
 
 AC_DEFUN([ODBC_LIB_WHERE1], [
 saved_LIBS=$LIBS
-LIBS="$saved_LIBS -L$1 -lodbc"
-AC_TRY_LINK(,
-[SQLHDBC con;SQLDisconnect(con);],
+case "$host" in
+     *darwin*)
+       LIBS="$saved_LIBS -L$1 -lodbc -framework CoreFoundation"
+     ;;
+     *)
+       LIBS="$saved_LIBS -L$1 -lodbc"
+     ;;
+esac
+AC_TRY_LINK(
+[#include <sql.h>],
+[SQLHDBC con;
+SQLDisconnect(con);],
 [ac_cv_found_odbc_lib=yes],
 ac_cv_found_odbc_lib=no)
 LIBS=$saved_LIBS
@@ -130,7 +139,14 @@ AC_ARG_WITH(odbc-include,
          ODBC_INC_DIR=$ac_cv_pcap_where_inc
          ODBC_LIB_DIR=$ac_cv_pcap_where_lib
          ODBC_INC_FLAGS="-I${ODBC_INC_DIR}"
-         ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc"
+         case "$host" in
+              *darwin*)
+                       ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc -framework CoreFoundation"
+               ;;
+               *)
+                       ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc"
+               ;;
+         esac
          AC_SUBST(ODBC_INC_DIR)
          AC_SUBST(ODBC_LIB_DIR)
          AC_SUBST(ODBC_INC_FLAGS)