* When using the included sqlite/aterm libraries, build with

--enable-shared.
* In libutil/libstore/libexpr etc., link against sqlite and aterm.
* Some more header file hygiene.

src/nix-env/Makefile.am

@@ -3,7 +3,7 @@ bin_PROGRAMS = nix-env
 nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh help.txt
 nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
  ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
+ ../boost/format/libformat.la
 
 nix-env.o: help.txt.hh
 
@@ -11,6 +11,7 @@ nix-env.o: help.txt.hh
 	../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
 
 AM_CXXFLAGS = \
- -I$(srcdir)/.. ${aterm_include} \
+ ${aterm_include} \
+ -I$(srcdir)/.. \
  -I$(srcdir)/../libutil -I$(srcdir)/../libstore \
  -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr

src/nix-env/nix-env.cc

@@ -14,6 +14,7 @@
 #include "xml-writer.hh"
 #include "store-api.hh"
 #include "util.hh"
+#include "aterm.hh"
 
 #include <cerrno>
 #include <ctime>