From 9a9ba4c37efd8162049048af79bbd58ccab4f28d Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 20 Jan 2009 21:55:27 +0000 Subject: [PATCH] try to fix osx build when you --enable-core-odbc-support git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11323 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 2 +- configure.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f87764f2eb..4644c82276 100644 --- a/Makefile.am +++ b/Makefile.am @@ -153,7 +153,7 @@ CORE_LIBS += libs/srtp/libsrtp.la $(RESAMPLE_LIB) lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) -libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) +libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_DEPLIBS) libfreeswitch_la_LIBADD = $(CORE_LIBS) libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES) nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h diff --git a/configure.in b/configure.in index ae58753672..c58d4f3cf9 100644 --- a/configure.in +++ b/configure.in @@ -175,11 +175,15 @@ fi AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) ESL_LDFLAGS= +PLATFORM_CORE_DEPLIBS= # tweak platform specific flags case "$host" in *darwin*) APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX) APR_REMOVEFROM(SWITCH_AM_CFLAGS, -fPIC) + if test "x$enable_core_odbc_support" != "xno"; then + APR_ADDTO(PLATFORM_CORE_DEPLIBS, --framework CoreFoundation) + fi ;; *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) @@ -196,6 +200,7 @@ AC_SUBST(SWITCH_AM_CFLAGS) AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS) AC_SUBST(ESL_LDFLAGS) +AC_SUBST(PLATFORM_CORE_DEPLIBS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN)