From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 23 Jul 2014 09:34:58 +0000 (+0200)
Subject: Actually check if libcrypto++ is installed
X-Git-Tag: auth-3.4.0-rc1~28^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1617%2Fhead;p=thirdparty%2Fpdns.git

Actually check if libcrypto++ is installed
---

diff --git a/m4/pdns_with_cryptopp.m4 b/m4/pdns_with_cryptopp.m4
index 1e4cbefa41..10d59e12b7 100644
--- a/m4/pdns_with_cryptopp.m4
+++ b/m4/pdns_with_cryptopp.m4
@@ -8,8 +8,11 @@ AC_DEFUN([PDNS_WITH_CRYPTOPP],[
   AC_MSG_RESULT([$enable_cryptopp])
   AM_CONDITIONAL([CRYPTOPP], [test "x$enable_cryptopp" != "xno"])
 
-  AS_IF([test "x$enable_cryptopp" != "xno"],
-    [AC_DEFINE([HAVE_CRYPTOPP], [1], [Define to 1 if you have crypto++])]
-  )
+  AS_IF([test "x$enable_cryptopp" != "xno"], [
+    PKG_CHECK_MODULES([CRYPTOPP], [libcrypto++],
+      [AC_DEFINE([HAVE_CRYPTOPP], [1], [Define to 1 if you have crypto++])],
+      [AC_MSG_ERROR([Could not find crypto++])]
+    )
+  ])
 ])
 
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 430fb671f4..a1d7236361 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -84,7 +84,7 @@ endif
 
 if CRYPTOPP
 pdns_server_SOURCES += cryptoppsigners.cc
-pdns_server_LDADD += -lcryptopp
+pdns_server_LDADD += $(CRYPTOPP_LIBS)
 endif
 
 if SQLITE3