From 2dc3d23ad77e7ba70759c7ada366d43f26d8860f Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Thu, 28 Feb 2013 19:47:50 -0500
Subject: Added bbdb

---
 .emacs           |  1 +
 .gitmodules      |  3 +++
 emacsen/Makefile | 12 +++++++++++-
 emacsen/bbdb     |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 160000 emacsen/bbdb

diff --git a/.emacs b/.emacs
index 305a858..6836c42 100644
--- a/.emacs
+++ b/.emacs
@@ -7,6 +7,7 @@
 (add-to-list 'load-path "~/.emacs.d/markdown-mode")
 (add-to-list 'load-path "~/.emacs.d/proofgeneral/")
 (add-to-list 'load-path "/usr/local/share/emacs/site-lisp/vm")
+(add-to-list 'load-path "~/.emacs.d/share/emacs/site-lisp/bbdb")
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
 
 ;;;; AUCTEX
diff --git a/.gitmodules b/.gitmodules
index 9302712..56da3d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "emacsen/vm"]
 	path = emacsen/vm
 	url = git@github.com:emacsmirror/vm.git
+[submodule "emacsen/bbdb"]
+	path = emacsen/bbdb
+	url = git://git.savannah.nongnu.org/bbdb.git
diff --git a/emacsen/Makefile b/emacsen/Makefile
index e2ea22b..f13fb84 100644
--- a/emacsen/Makefile
+++ b/emacsen/Makefile
@@ -2,9 +2,11 @@ ROOT=$(shell pwd)/..
 export ROOT
 EMACSD=$(ROOT)/build/.emacs.d/
 export ELISPDIR
+EMACSEN=$(ROOT)/emacsen
 
 SUBDIRS = auto-complete \
 	  auto-indent-mode \
+	  bbdb \
 	  dictem \
 	  magit \
 	  markdown-mode \
@@ -48,11 +50,15 @@ make-auto-complete:
 	$(MAKE) -C $(@:make-%=%) -e EMACS="emacs -L ../popup/"
 	touch $@
 
+make-bbdb: make-vm
+	cd $(@:make-%=%) && autoconf && ./configure --prefix=$(EMACSD) --without-tex-dir --with-vm-dir=$(EMACSEN)/vm/lisp
+	$(MAKE) -C $(@:make-%=%)
+
 make-proofgeneral:
 	$(MAKE) -C $(@:make-%=%) compile
 
 make-vm:
-	cd $(@:make-%=%) && autoconf && ./configure --prefix=$(EMACSD)
+	cd $(@:make-%=%) && autoconf && ./configure --prefix=$(EMACSD) --with-other-dirs=$(EMACSEN)/bbdb/lisp
 	$(MAKE) -C $(@:make-%=%)
 
 install-auto-complete:
@@ -63,6 +69,10 @@ install-auto-indent-mode:
 	-mkdir -p $(EMACSD)/$(@:install-%=%)
 	cp $(@:install-%=%)/auto-indent-mode.el $(EMACSD)/$(@:install-%=%)
 
+install-bbdb:
+	-mkdir -p $(EMACSD)/$(@:install-%=%)
+	$(MAKE) -C $(@:install-%=%) -e lispdir=$(EMACSD)/$(@:install-%=%) install
+
 install-dictem:
 	-mkdir -p $(EMACSD)/$(@:install-%=%)
 	install -m 644 $(@:install-%=%)/*.el $(EMACSD)/$(@:install-%=%)
diff --git a/emacsen/bbdb b/emacsen/bbdb
new file mode 160000
index 0000000..fafcf87
--- /dev/null
+++ b/emacsen/bbdb
@@ -0,0 +1 @@
+Subproject commit fafcf8705d760539f59485fe97b4741063e7514b
-- 
cgit v1.2.3