build error

src/libutil/Makefile.am

@@ -3,7 +3,7 @@ pkglib_LTLIBRARIES = libutil.la
 libutil_la_SOURCES = util.cc hash.cc serialise.cc \
   archive.cc aterm.cc aterm-map.cc xml-writer.cc
 
-libutil_la_LIBADD = ../boost/format/libformat.la
+libutil_la_LIBADD = ../libstore/libstore.la ../boost/format/libformat.la
 
 pkginclude_HEADERS = util.hh hash.hh serialise.hh \
   archive.hh aterm.hh aterm-map.hh xml-writer.hh types.hh
@@ -13,4 +13,7 @@ libutil_la_SOURCES += \
  md5.c md5.h sha1.c sha1.h sha256.c sha256.h md32_common.h
 endif
 
-AM_CXXFLAGS = -Wall -I$(srcdir)/.. ${aterm_include}
+AM_CXXFLAGS = -Wall \
+ -I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libstore
+
+ 

src/libutil/util.cc

@@ -1,5 +1,9 @@
 #include "config.h"
 
+#include "util.hh"
+#include "globals.hh"
+#include "derivations.hh"
+
 #ifdef __CYGWIN__
 #include <windows.h>
 #endif
@@ -14,9 +18,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include "util.hh"
-#include "../libstore/derivations.hh"
-
 extern char * * environ;
 
 
@@ -371,6 +372,10 @@ Path createStateDirs(const DerivationStateOutputDirs & stateOutputDirs, const De
 	}
 	sort(stateDirsVector.begin(), stateDirsVector.end());
 	
+	printMsg(lvlError, format("nixStoreState: `%1%'") % nixStoreState);
+	printMsg(lvlError, format("nixStoreStateRepos: `%1%'") % nixStoreStateRepos);
+	printMsg(lvlError, format("nixSVNPath `%1%'") % nixSVNPath);
+		
 	for (vector<DerivationStateOutputDir>::iterator i = stateDirsVector.begin(); i != stateDirsVector.end(); ++i)
     {
 		DerivationStateOutputDir d = *(i);

src/libutil/util.hh

@@ -2,7 +2,7 @@
 #define __UTIL_H
 
 #include "types.hh"
-#include "../libstore/derivations.hh"
+#include "derivations.hh"
 
 #include <sys/types.h>
 #include <dirent.h>