Diff
Modified: freeswitch/trunk/Makefile.am (16331 => 16332)
--- freeswitch/trunk/Makefile.am 2010-01-17 00:26:29 UTC (rev 16331)
+++ freeswitch/trunk/Makefile.am 2010-01-17 03:11:56 UTC (rev 16332)
@@ -109,11 +109,11 @@
CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h
BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h
-if ADD_ODBC
+if HAVE_ODBC
CORE_CFLAGS += -DSWITCH_HAVE_ODBC $(ODBC_INC_FLAGS)
endif
-if ADD_LIBEDIT
+if HAVE_LIBEDIT
CORE_CFLAGS += -I$(switch_srcdir)/libs/libedit/src -DSWITCH_HAVE_LIBEDIT
CORE_LIBS += libs/libedit/src/.libs/libedit.a
endif
@@ -127,7 +127,7 @@
libfreeswitch_la_LIBADD = $(CORE_LIBS)
libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
-if ADD_ODBC
+if HAVE_ODBC
libfreeswitch_la_LDFLAGS += $(ODBC_LIB_FLAGS)
endif
@@ -266,7 +266,7 @@
fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include
fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS)
-if ADD_LIBEDIT
+if HAVE_LIBEDIT
fs_cli_CFLAGS += -DHAVE_EDITLINE -I$(switch_srcdir)/libs/libedit/src
fs_cli_LDADD = libs/libedit/src/.libs/libedit.a
endif
@@ -287,7 +287,7 @@
freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir)
freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
-if ADD_LIBEDIT
+if HAVE_LIBEDIT
freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
freeswitch_LDADD += libs/libedit/src/.libs/libedit.a
endif
Modified: freeswitch/trunk/configure.in (16331 => 16332)
--- freeswitch/trunk/configure.in 2010-01-17 00:26:29 UTC (rev 16331)
+++ freeswitch/trunk/configure.in 2010-01-17 03:11:56 UTC (rev 16332)
@@ -727,8 +727,8 @@
AX_CHECK_JAVA
-AM_CONDITIONAL([ADD_ODBC],[test "x$enable_core_odbc_support" != "xno"])
-AM_CONDITIONAL([ADD_LIBEDIT],[test "x$enable_core_libedit_support" != "xno"])
+AM_CONDITIONAL([HAVE_ODBC],[test "x$enable_core_odbc_support" != "xno"])
+AM_CONDITIONAL([HAVE_LIBEDIT],[test "x$enable_core_libedit_support" != "xno"])
AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"])
#
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (16331 => 16332)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am 2010-01-17 00:26:29 UTC (rev 16331)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am 2010-01-17 03:11:56 UTC (rev 16332)
@@ -32,10 +32,6 @@
mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SOFIALA)
mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -shared
-if ADD_ODBC
-mod_sofia_la_CFLAGS += -DSWITCH_HAVE_ODBC
-endif
-
if ISMAC
mod_sofia_la_LDFLAGS += -framework CoreFoundation -framework SystemConfiguration
endif