summary refs log tree commit diff
path: root/externals
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-02-16 16:37:16 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-02-16 16:37:16 +0000
commit0dfdafdf6de4f741ff60637843f0e7900384cd9f (patch)
treed0dfc7555e007bb9d4066cd45b4eb36405c20731 /externals
parentf34de121401bb43c6cfab892b2b254e42652ba90 (diff)
downloadguix-0dfdafdf6de4f741ff60637843f0e7900384cd9f.tar.gz
* Allow linking against an external Berkeley DB / ATerm library.
Diffstat (limited to 'externals')
-rw-r--r--externals/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/externals/Makefile.am b/externals/Makefile.am
index 5f48a697d9..4819b95fea 100644
--- a/externals/Makefile.am
+++ b/externals/Makefile.am
@@ -16,16 +16,20 @@ have-db:
 	$(MAKE) $(DB)
 	touch have-db
 
+if HAVE_BDB
+build-db:
+else
 build-db: have-db
 	(pfx=`pwd` && \
 	cd $(DB)/build_unix && \
 	CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-	 ../dist/configure --prefix=$$pfx/inst \
+	 ../dist/configure --prefix=$$pfx/inst-bdb \
 	 --enable-cxx --disable-shared --disable-cryptography \
          --disable-replication --disable-verify && \
 	make && \
 	make install)
 	touch build-db
+endif
 
 
 # CWI ATerm
@@ -49,7 +53,7 @@ have-aterm:
 build-aterm: have-aterm
 	(pfx=`pwd` && \
 	cd $(ATERM) && \
-	CC="$(CC)" ./configure --prefix=$$pfx/inst \
+	CC="$(CC)" ./configure --prefix=$$pfx/inst-aterm \
      --with-cflags="-DNDEBUG -DXGC_VERBOSE -DXHASHPEM -DWITH_STATS $(CFLAGS)" && \
 	make && \
 	make install)