a bit better on the mysql detection

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

diff --git a/configure.in b/configure.in
index 19f9254c86a9e655305989f1ff6eb8b5612a9eb4..ec4d63d22725b3f353d76c1e1e8f64841874baae 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -322,7 +322,7 @@ AX_LIB_MYSQL
 
 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

diff --git a/src/mod/event_handlers/mod_cdr/Makefile.am b/src/mod/event_handlers/mod_cdr/Makefile.am
index d2277e2e676c6fcb56b39cf6da2fd26b42e2d36a..341454f8b170815dc9b0d4f69ec64a09ab28a30b 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/Makefile.am
+++ b/src/mod/event_handlers/mod_cdr/Makefile.am
@@ -14,13 +14,15 @@ MODNAME=mod_cdr
 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