- Add missing include files

- Add config option for xml macros and templates basedir

1 files changed, 3 insertions, 1 deletions

diff --git a/server/src/macroparser.cc b/server/src/macroparser.cc
index 582c90c..ae7f648 100644
--- a/server/src/macroparser.cc
+++ b/server/src/macroparser.cc
@@ -25,6 +25,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 #include "macroparser.h"
+#include "configuration.h"
 
 // For assert
 #include <assert.h>
@@ -44,6 +45,7 @@
 #endif/*XML*/
 
 #include <errno.h>
+#include <string.h>
 
 #include "exception.h"
 
@@ -70,7 +72,7 @@ MacroParser::MacroParser(std::string macro)
   current_map = NULL;
   current_script = NULL;
 
-  file = XML"/macros/" + macro + ".xml";
+  file = Conf::xml_basedir + "/macros/" + macro + ".xml";
 
   printf("Using macro file: %s\n", file.c_str());