diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18T22·54+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18T22·54+0100 |
| commit | b006a31d52b8f1cb01f3d722a6e3411dc8b98d64 (patch) | |
| tree | 4edaff4f557a20a12e8cc9be4414081d71f46dd9 /src/libstore/Makefile.am | |
| parent | 2e0322efd14df7a1658201fb443c8e90687dcfda (diff) | |
Drop the externals directory
Nix now requires SQLite and bzip2 to be pre-installed. SQLite is detected using pkg-config. We required DBD::SQLite anyway, so depending on SQLite is not a big problem. The --with-bzip2, --with-openssl and --with-sqlite flags are gone.
Diffstat (limited to 'src/libstore/Makefile.am')
| -rw-r--r-- | src/libstore/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am index 39a61233b4a7..a9e5732e215d 100644 --- a/src/libstore/Makefile.am +++ b/src/libstore/Makefile.am @@ -10,12 +10,12 @@ pkginclude_HEADERS = \ globals.hh references.hh pathlocks.hh \ worker-protocol.hh -libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} +libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la @SQLITE3_LIBS@ EXTRA_DIST = schema.sql AM_CXXFLAGS = -Wall \ - ${sqlite_include} -I$(srcdir)/.. -I$(srcdir)/../libutil \ + -I$(srcdir)/.. -I$(srcdir)/../libutil \ -DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ |