diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-03-02 15:58:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-03-02 15:58:13 +0000 |
| commit | 594eaddd1157db8abe2e1c47cdf2180f027559ad (patch) | |
| tree | 3dd95f89c19098f9b20a085a04917217602fbb6c /src/libutil | |
| parent | 966ffb29a7a7de00f3521da05f325ae8c7e8e35e (diff) | |
| download | guix-594eaddd1157db8abe2e1c47cdf2180f027559ad.tar.gz | |
* 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.
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libutil/aterm-map.hh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am index bd09965433..f17236d292 100644 --- a/src/libutil/Makefile.am +++ b/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 = ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} pkginclude_HEADERS = util.hh hash.hh serialise.hh \ archive.hh aterm.hh aterm-map.hh xml-writer.hh types.hh diff --git a/src/libutil/aterm-map.hh b/src/libutil/aterm-map.hh index b732453a76..bcfefd9ee4 100644 --- a/src/libutil/aterm-map.hh +++ b/src/libutil/aterm-map.hh @@ -1,7 +1,8 @@ #ifndef __ATERM_MAP_H #define __ATERM_MAP_H -#include <aterm1.h> +typedef union _ATerm * ATerm; + #include <assert.h> |