Voicemail/mysql updates

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1693 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/Makefile

@@ -42,6 +42,10 @@ ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
 CFLAGS+=-DUSEPOSTGRESVM
 endif
 
+ifeq ($(USE_MYSQL_VM_INTERFACE),1)
+CFLAGS+=-DUSEMYSQLVM
+endif
+
 all: $(APPS)
 
 clean:

apps/app_voicemail2.c

@@ -38,8 +38,7 @@
 
 /* we define USESQLVM when we have MySQL or POSTGRES */
 #ifdef USEMYSQLVM
-#include <mysql.h>
-#include "mysql-vm-routines.h"
+#include <mysql/mysql.h>
 #define USESQLVM 1
 #endif
 
@@ -199,6 +198,10 @@ static void apply_options(struct ast_vm_user *vmu, char *options)
 	
 }
 
+#ifdef USEMYSQLVM
+#include "mysql-vm-routines.h"
+#endif
+
 #ifdef USEPOSTGRESVM
 
 PGconn *dbhandler;