[Asterisk-cvs] asterisk/apps Makefile,1.24,1.25 app_voicemail2.c,1.58,1.59

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv12155/apps

Modified Files:
	Makefile app_voicemail2.c 
Log Message:
Voicemail/mysql updates


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	26 Oct 2003 18:50:49 -0000	1.24
+++ Makefile	5 Nov 2003 05:42:23 -0000	1.25
@@ -42,6 +42,10 @@
 CFLAGS+=-DUSEPOSTGRESVM
 endif
 
+ifeq ($(USE_MYSQL_VM_INTERFACE),1)
+CFLAGS+=-DUSEMYSQLVM
+endif
+
 all: $(APPS)
 
 clean:

Index: app_voicemail2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail2.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- app_voicemail2.c	22 Oct 2003 03:12:17 -0000	1.58
+++ app_voicemail2.c	5 Nov 2003 05:42:23 -0000	1.59
@@ -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
 
@@ -198,6 +197,10 @@
 	}
 	
 }
+
+#ifdef USEMYSQLVM
+#include "mysql-vm-routines.h"
+#endif
 
 #ifdef USEPOSTGRESVM