diff options
| author | JINMEI Tatuya <jinmei@isc.org> | 2011-04-29 02:46:42 +0200 |
|---|---|---|
| committer | JINMEI Tatuya <jinmei@isc.org> | 2011-04-29 02:46:42 +0200 |
| commit | ebe0c4b1e66d359227bdd1bd47395fee7b957f14 (patch) | |
| tree | a384efc1a60a17cde444fc618f6749cf49aa2440 /src/lib/cryptolink/Makefile.am | |
| parent | [master] Merge branch 'trac868' (diff) | |
| parent | [trac812] made sure libutil_io is linked from dns/tests as agreed in review. (diff) | |
| download | kea-ebe0c4b1e66d359227bdd1bd47395fee7b957f14.tar.xz kea-ebe0c4b1e66d359227bdd1bd47395fee7b957f14.zip | |
[master] Merge branch 'trac812' with fixing conflicts and regression.
Conflicts:
doc/Doxyfile
src/lib/Makefile.am
src/lib/cryptolink/cryptolink.cc
src/lib/dns/tsigkey.cc
src/lib/util/unittests/Makefile.am
Other fixes:
- cppcheck filter adjustment
- (indirect) dependency on libbotan. actually we should be able to make
the link within libcryptolink, so I chose that approach. hopefully
it doesn't break autobuild.
Diffstat (limited to 'src/lib/cryptolink/Makefile.am')
| -rw-r--r-- | src/lib/cryptolink/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am index bbb86bc262..93f34438b9 100644 --- a/src/lib/cryptolink/Makefile.am +++ b/src/lib/cryptolink/Makefile.am @@ -10,3 +10,5 @@ lib_LTLIBRARIES = libcryptolink.la libcryptolink_la_SOURCES = cryptolink.h cryptolink.cc libcryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc + +libcryptolink_la_LIBADD = ${BOTAN_LDFLAGS} ${BOTAN_RPATH} |