Commit a9ff5f71 authored by Ondřej Surý's avatar Ondřej Surý

Configure rosedb build with embedded lmdb

parent 21cdee50
...@@ -349,13 +349,14 @@ AS_IF([test "$with_lmdb" != "no"],[ ...@@ -349,13 +349,14 @@ AS_IF([test "$with_lmdb" != "no"],[
]) ])
AS_IF([test "$have_lmdb" != "no"],[ AS_IF([test "$have_lmdb" != "no"],[
AC_SUBST([lmdb_CFLAGS])
AC_SUBST([lmdb_LIBS]) AC_SUBST([lmdb_LIBS])
enable_lmdb=shared enable_lmdb=shared
],[ ],[
enable_lmdb=embedded enable_lmdb=embedded
lmdb_CFLAGS='-I$(srcdir)/contrib/lmdb'
]) ])
AM_CONDITIONAL([HAVE_LMDB], test "$have_lmdb" != "no") AM_CONDITIONAL([HAVE_LMDB], test "$have_lmdb" != "no")
AC_SUBST([lmdb_CFLAGS])
# LMDB mapping sizes # LMDB mapping sizes
conf_mapsize_default=500 conf_mapsize_default=500
......
...@@ -183,19 +183,19 @@ libknot_la_SOURCES = \ ...@@ -183,19 +183,19 @@ libknot_la_SOURCES = \
libknot_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(lmdb_CFLAGS) libknot_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(lmdb_CFLAGS)
libknot_la_CFLAGS = $(AM_CFLAGS) libknot_la_CFLAGS = $(AM_CFLAGS)
libknot_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(lmdb_LIBS) $(LDFLAG_EXCLUDE_LIBS) libknot_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(lmdb_LIBS) $(LDFLAG_EXCLUDE_LIBS)
libknot_la_LIBADD = dnssec/libdnssec.la libcontrib.la libknot_la_LIBADD = dnssec/libdnssec.la libcontrib.la $(lmdb_LTLIBS)
# pkg-config # pkg-config
pkgconfig_DATA = libknot.pc pkgconfig_DATA = libknot.pc
if !HAVE_LMDB if !HAVE_LMDB
libknot_la_SOURCES += \ noinst_LTLIBRARIES += liblmdb.la
liblmdb_la_SOURCES = \
contrib/lmdb/lmdb.h \ contrib/lmdb/lmdb.h \
contrib/lmdb/mdb.c \ contrib/lmdb/mdb.c \
contrib/lmdb/midl.c \ contrib/lmdb/midl.c \
contrib/lmdb/midl.h contrib/lmdb/midl.h
libknot_la_CPPFLAGS += \ lmdb_LTLIBS = liblmdb.la
-I$(srcdir)/contrib/lmdb/
endif endif
# static: utilities shared # static: utilities shared
...@@ -380,7 +380,7 @@ libknotd_la_SOURCES = \ ...@@ -380,7 +380,7 @@ libknotd_la_SOURCES = \
knot/zone/zonefile.c \ knot/zone/zonefile.c \
knot/zone/zonefile.h knot/zone/zonefile.h
libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(systemd_CFLAGS) $(liburcu_CFLAGS) libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(systemd_CFLAGS) $(liburcu_CFLAGS) $(lmdb_CFLAGS)
libknotd_la_LDFLAGS = $(AM_LDFLAGS) $(systemd_LIBS) $(liburcu_LIBS) libknotd_la_LDFLAGS = $(AM_LDFLAGS) $(systemd_LIBS) $(liburcu_LIBS)
libknotd_la_LIBADD = libknot.la libknot-yparser.la zscanner/libzscanner.la $(liburcu_LIBS) libknotd_la_LIBADD = libknot.la libknot-yparser.la zscanner/libzscanner.la $(liburcu_LIBS)
...@@ -466,6 +466,7 @@ if HAVE_ROSEDB ...@@ -466,6 +466,7 @@ if HAVE_ROSEDB
libknotd_la_SOURCES += \ libknotd_la_SOURCES += \
knot/modules/rosedb.c \ knot/modules/rosedb.c \
knot/modules/rosedb.h knot/modules/rosedb.h
libknotd_la_LIBADD += liblmdb.la
endif # HAVE_ROSEDB endif # HAVE_ROSEDB
# Create storage and run-time directories # Create storage and run-time directories
...@@ -549,7 +550,7 @@ endif # HAVE_DNSTAP ...@@ -549,7 +550,7 @@ endif # HAVE_DNSTAP
if HAVE_ROSEDB if HAVE_ROSEDB
bin_PROGRAMS += rosedb_tool bin_PROGRAMS += rosedb_tool
rosedb_tool_SOURCES = knot/modules/rosedb_tool.c rosedb_tool_SOURCES = knot/modules/rosedb_tool.c
rosedb_tool_LDADD = libknotd.la libcontrib.la rosedb_tool_LDADD = libknotd.la libcontrib.la $(lmdb_LTLIBS)
rosedb_tool_CFLAGS = $(AM_CFLAGS) $(lmdb_CFLAGS) $(DNSTAP_CFLAGS) rosedb_tool_CFLAGS = $(AM_CFLAGS) $(lmdb_CFLAGS) $(DNSTAP_CFLAGS)
rosedb_tool_LDFLAGS = $(AM_LDFLAGS) $(lmdb_LIBS) rosedb_tool_LDFLAGS = $(AM_LDFLAGS) $(lmdb_LIBS)
endif # HAVE_ROSEDB endif # HAVE_ROSEDB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment