Author: mikej Date: Fri Apr 6 05:38:11 2007 New Revision: 4869 Modified: freeswitch/trunk/configure.in freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am Log: a bit better on the mysql detection Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Apr 6 05:38:11 2007 @@ -322,7 +322,7 @@ AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) AM_CONDITIONAL([ADD_ODBC],[test "x$enable_core_odbc_support" != "xno"]) -AM_CONDITIONAL([HAVE_MYSQL],[test "x$have_mysql" != "x"]) +AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"]) AC_CONFIG_FILES([Makefile src/Makefile Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am Fri Apr 6 05:38:11 2007 @@ -14,13 +14,15 @@ mod_LTLIBRARIES = mod_cdr.la mod_cdr_la_SOURCES = mod_cdr.cpp cdrcontainer.cpp basecdr.cpp baseregistry.cpp pddcdr.cpp csvcdr.cpp xmlcdr.cpp sqlitecdr.cpp mod_cdr_la_CFLAGS = $(AM_CFLAGS) +mod_cdr_la_CPPFLAGS = $(AM_CPPFLAGS) mod_cdr_la_LIBADD=$(switch_builddir)/libfreeswitch.la mod_cdr_la_LDFLAGS=-module -avoid-version -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) #Build mysqlcdr if we have mysql client if HAVE_MYSQL -mod_cdr_la_CFLAGS += -DMYSQL -mod_cdr_la_LDFLAGS += -lmysql-client +mod_cdr_la_CFLAGS += -DMYSQL $(MYSQL_CFLAGS) +mod_cdr_la_CPPFLAGS += -DMYSQL $(MYSQL_CFLAGS) +mod_cdr_la_LDFLAGS += -lmysql-client $(MYSQL_LDFLAGS) mod_cdr_la_SOURCES += mysqlcdr.cpp endif