From dbe5029ed72f406f45ec2a9d3584a828653ab34a Mon Sep 17 00:00:00 2001
From: Alexei Sheplyakov <varg@theor.jinr.ru>
Date: Sat, 13 Sep 2008 05:12:31 +0400
Subject: [PATCH] ginac.h: include parser.hpp

---
 check/Makefile.am     | 2 +-
 check/time_parser.cpp | 1 -
 ginac/ginac.h         | 6 ++++++
 tools/Makefile.am     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/check/Makefile.am b/check/Makefile.am
index 9b92a0b9..de86f5cd 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -237,6 +237,6 @@ time_parser_SOURCES = time_parser.cpp \
 time_parser_LDADD = ../ginac/libginac.la
 
 
-AM_CPPFLAGS = -I$(srcdir)/../ginac -I../ginac
+AM_CPPFLAGS = -I$(srcdir)/../ginac -I../ginac -DIN_GINAC
 
 CLEANFILES = exam.gar
diff --git a/check/time_parser.cpp b/check/time_parser.cpp
index ca35fb62..27316364 100644
--- a/check/time_parser.cpp
+++ b/check/time_parser.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 #include <stdexcept>
 #include "ginac.h"
-#include "parser/parser.hpp"
 #include "timer.h"
 extern void randomify_symbol_serials();
 using namespace std;
diff --git a/ginac/ginac.h b/ginac/ginac.h
index ad96e640..2d2a9e9d 100644
--- a/ginac/ginac.h
+++ b/ginac/ginac.h
@@ -70,6 +70,12 @@
 
 #include "excompiler.h"
 
+#ifndef IN_GINAC
+#include "parser.hpp"
+#else
+#include "parser/parser.hpp"
+#endif
+
 #ifdef __MAKECINT__
 #pragma link C++ nestedclass;
 #pragma link C++ nestedtypedef;
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 52280a3f..824d1feb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,7 @@ viewgar_LDADD = ../ginac/libginac.la
 
 bin_SCRIPTS = ginac-excompiler
 
-INCLUDES = -I$(srcdir)/../ginac -I../ginac
+AM_CPPFLAGS = -I$(srcdir)/../ginac -I../ginac -DIN_GINAC
 
 man_MANS = viewgar.1
 
-- 
2.44.0