Add openldap submodule with a symlink for liblmdb.

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..6a39abf
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "openldap"]
+       path = openldap
+       url = git://git.openldap.org/openldap.git

diff --git a/deps/Makefile b/deps/Makefile
index d58ee5681ba6a4adf93442db041d58749747fad5..910911d72844c5b6e6202eea2ad97dc6b7fe4319 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -34,6 +34,7 @@ endif
 
 distclean:
        -(cd hiredis && $(MAKE) clean) > /dev/null || true
 
 distclean:
        -(cd hiredis && $(MAKE) clean) > /dev/null || true

+       -(cd liblmdb && $(MAKE) clean) > /dev/null || true

        -(cd linenoise && $(MAKE) clean) > /dev/null || true
        -(cd lua && $(MAKE) clean) > /dev/null || true
        -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
        -(cd linenoise && $(MAKE) clean) > /dev/null || true
        -(cd lua && $(MAKE) clean) > /dev/null || true
        -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true


@@ -47,6 +48,12 @@ hiredis: .make-prerequisites
 
 .PHONY: hiredis
 
 
 .PHONY: hiredis
 

+liblmdb: .make-prerequisites
+       @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+       cd liblmdb && $(MAKE) all
+
+.PHONY: liblmdb
+

 linenoise: .make-prerequisites
        @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
        cd linenoise && $(MAKE)
 linenoise: .make-prerequisites
        @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
        cd linenoise && $(MAKE)

diff --git a/deps/liblmdb b/deps/liblmdb
new file mode 120000 (symlink)
index 0000000..160a5bb
--- /dev/null
+++ b/deps/liblmdb
@@ -0,0 +1 @@
+../openldap/libraries/liblmdb
\ No newline at end of file

diff --git a/openldap b/openldap
new file mode 160000 (submodule)
index 0000000..057e068
--- /dev/null
+++ b/openldap
@@ -0,0 +1 @@
+Subproject commit 057e0686303444d56f29a7bee0536e261fdf0b6a

diff --git a/src/Makefile b/src/Makefile
index 204a27148437fd936444c3a09a72d1bce6e4af01..4049442b38a94594de4039fc2d863fd4424baac2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,7 +15,7 @@
 release_hdr := $(shell sh -c './mkreleasehdr.sh')
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 OPTIMIZATION?=-O2
 release_hdr := $(shell sh -c './mkreleasehdr.sh')
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 OPTIMIZATION?=-O2

-DEPENDENCY_TARGETS=hiredis linenoise lua
+DEPENDENCY_TARGETS=hiredis liblmdb linenoise lua

 
 # Default settings
 STD= -std=c99 -pedantic
 
 # Default settings
 STD= -std=c99 -pedantic