* Allow linking against an external Berkeley DB / ATerm library.

8 files changed, 13 insertions, 15 deletions

diff --git a/src/libexpr/Makefile.am b/src/libexpr/Makefile.am
index 02269bcb8c93..f3ffb6a035f5 100644
--- a/src/libexpr/Makefile.am
+++ b/src/libexpr/Makefile.am
@@ -7,9 +7,9 @@ libexpr_a_SOURCES = nixexpr.cc nixexpr.hh parser.cc parser.hh \
 EXTRA_DIST = lexer.l parser.y
 
 AM_CXXFLAGS = \
- -I.. -I../../externals/inst/include -I../libutil -I../libstore
+ -I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore
 AM_CFLAGS = \
- -I../../externals/inst/include
+ ${aterm_include}
 
 
 # Parser generation.
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index 72126f1135c4..3c28441ca166 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -8,4 +8,4 @@ AM_CXXFLAGS = \
  -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
  -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
  -DNIX_VERSION=\"$(VERSION)\" \
- -I.. -I../../externals/inst/include -I../libutil -I../libstore
+ -I.. ${aterm_include} -I../libutil -I../libstore
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index 3e2777f6abd0..0a7b148fe267 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -7,4 +7,4 @@ libstore_a_SOURCES = \
  references.cc references.hh pathlocks.cc pathlocks.hh
 
 AM_CXXFLAGS = -Wall \
- -I.. -I../../externals/inst/include -I../libutil
+ -I.. ${bdb_include} ${aterm_include} -I../libutil
diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am
index 92c4472f8933..d5d4fcfad7ee 100644
--- a/src/libutil/Makefile.am
+++ b/src/libutil/Makefile.am
@@ -3,11 +3,11 @@ noinst_LIBRARIES = libutil.a
 libutil_a_SOURCES = util.cc util.hh hash.cc hash.hh \
  archive.cc archive.hh md5.c md5.h aterm.cc aterm.hh
 
-AM_CXXFLAGS = -DSYSTEM=\"@system@\" -Wall -I.. -I../../externals/inst/include
+AM_CXXFLAGS = -DSYSTEM=\"@system@\" -Wall -I.. ${aterm_include}
 
 check_PROGRAMS = test-aterm
 
 test_aterm_SOURCES = test-aterm.cc
 test_aterm_LDADD = ./libutil.a ../boost/format/libformat.a \
- -L../../externals/inst/lib -ldb_cxx -lATerm
+ ${aterm_lib}
 
diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am
index e4b03943c5bd..3943a9d9aca9 100644
--- a/src/nix-env/Makefile.am
+++ b/src/nix-env/Makefile.am
@@ -4,8 +4,7 @@ nix_env_SOURCES = main.cc names.cc names.hh \
  profiles.cc profiles.hh help.txt
 nix_env_LDADD = ../libmain/libmain.a ../libexpr/libexpr.a \
  ../libstore/libstore.a ../libutil/libutil.a \
- ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \
- -lATerm
+ ../boost/format/libformat.a ${bdb_lib} ${aterm_lib}
 
 main.o: help.txt.hh
 
@@ -13,7 +12,7 @@ main.o: help.txt.hh
 	../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
 
 AM_CXXFLAGS = \
- -I.. -I../../externals/inst/include -I../libutil -I../libstore \
+ -I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore \
  -I../libexpr -I../libmain
 
 install-data-local:
diff --git a/src/nix-hash/Makefile.am b/src/nix-hash/Makefile.am
index 00bf6afd6e28..7906285fe23f 100644
--- a/src/nix-hash/Makefile.am
+++ b/src/nix-hash/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-hash
 
 nix_hash_SOURCES = nix-hash.cc help.txt
 nix_hash_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
- ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
+ ../boost/format/libformat.a ${bdb_lib} ${aterm_lib}
 
 nix-hash.o: help.txt.hh
 
diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am
index 0726d1296f23..60ee09b9405e 100644
--- a/src/nix-instantiate/Makefile.am
+++ b/src/nix-instantiate/Makefile.am
@@ -3,8 +3,7 @@ bin_PROGRAMS = nix-instantiate
 nix_instantiate_SOURCES = main.cc help.txt
 nix_instantiate_LDADD = ../libmain/libmain.a ../libexpr/libexpr.a \
  ../libstore/libstore.a ../libutil/libutil.a \
- ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx \
- -lATerm
+ ../boost/format/libformat.a ${bdb_lib} ${aterm_lib}
 
 main.o: help.txt.hh
 
@@ -12,5 +11,5 @@ main.o: help.txt.hh
 	../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
 
 AM_CXXFLAGS = \
- -I.. -I../../externals/inst/include -I../libutil -I../libstore \
+ -I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore \
  -I../libexpr -I../libmain
diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am
index 76d3a6c6bedc..588d645eb67b 100644
--- a/src/nix-store/Makefile.am
+++ b/src/nix-store/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-store
 
 nix_store_SOURCES = main.cc dotgraph.cc dotgraph.hh help.txt
 nix_store_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
- ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
+ ../boost/format/libformat.a ${bdb_lib} ${aterm_lib}
 
 main.o: help.txt.hh
 
@@ -10,7 +10,7 @@ main.o: help.txt.hh
 	../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
 
 AM_CXXFLAGS = \
- -I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain
+ -I.. ${bdb_include} $(aterm_include) -I../libutil -I../libstore -I../libmain
 
 init-state-local:
 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/nix