From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 4 Oct 2014 18:38:53 +0000 (+0200)
Subject: Replace hardcoded -llmdb with variable
X-Git-Tag: rec-3.7.0-rc1~226^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1768%2Fhead;p=thirdparty%2Fpdns.git

Replace hardcoded -llmdb with variable

and rename the variable to be consistent
with what we do for other libs
---

diff --git a/m4/pdns_with_lmdb.m4 b/m4/pdns_with_lmdb.m4
index 00156fdac0..30a0540577 100644
--- a/m4/pdns_with_lmdb.m4
+++ b/m4/pdns_with_lmdb.m4
@@ -1,8 +1,8 @@
 AC_DEFUN([PDNS_WITH_LMDB],[
     AC_CHECK_HEADERS([lmdb.h], , [AC_MSG_ERROR([lmdb header (lmdb.h) not found])])
-    AC_SUBST([LIBLMDB])
+    AC_SUBST([LMDB_LIBS])
     AC_CHECK_LIB(
         [lmdb], [mdb_env_create],
-        [AC_DEFINE([HAVE_LIBLMDB], 1, [Have -llmdb]) LIBLMDB="lmdb"]
+        [AC_DEFINE([HAVE_LIBLMDB], 1, [Have -llmdb]) LMDB_LIBS="-llmdb"]
     )
 ])
diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am
index 559e3a7f94..924e00a3e8 100644
--- a/modules/lmdbbackend/Makefile.am
+++ b/modules/lmdbbackend/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
 liblmdbbackend_la_SOURCES=lmdbbackend.cc lmdbbackend.hh
 liblmdbbackend_la_LDFLAGS=-module -avoid-version
-liblmdbbackend_la_LIBADD=-l$(LIBLMDB)
+liblmdbbackend_la_LIBADD=$(LMDB_LIBS)
diff --git a/modules/lmdbbackend/OBJECTLIBS b/modules/lmdbbackend/OBJECTLIBS
index 0c0c430855..ad4006b9f4 100644
--- a/modules/lmdbbackend/OBJECTLIBS
+++ b/modules/lmdbbackend/OBJECTLIBS
@@ -1 +1 @@
--l$(LIBLMDB)
+$(LMDB_LIBS)
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 7334fed3fb..0ef69ec2f6 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -156,7 +156,7 @@ zone2lmdb_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \
 	dns_random.cc dns.cc
 
 zone2lmdb_LDFLAGS=$(THREADFLAGS)
-zone2lmdb_LDADD= $(POLARSSL_LIBS) -llmdb
+zone2lmdb_LDADD= $(POLARSSL_LIBS) $(LMDB_LIBS)
 endif
 
 if BOTAN110