diff options
| author | JINMEI Tatuya <jinmei@isc.org> | 2011-05-02 19:54:44 +0200 |
|---|---|---|
| committer | JINMEI Tatuya <jinmei@isc.org> | 2011-05-02 19:54:44 +0200 |
| commit | f0fe344b15c3e1be2604201000e6c9fbe6a910bc (patch) | |
| tree | cd10a091732bf04843679a137f4503d893e37b7b | |
| parent | [master] add missing rdata files and change some generated headers to nodist (diff) | |
| download | kea-f0fe344b15c3e1be2604201000e6c9fbe6a910bc.tar.xz kea-f0fe344b15c3e1be2604201000e6c9fbe6a910bc.zip | |
[trac890] proposed workaround fix to the botan rpath problem: specify the
rpath in the global LDFLAGS.
also remove BOTAN_RPATH from libcryptolink/Makefile.am (which is not part
of fix, but is simply unnecessary)
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/lib/cryptolink/Makefile.am | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index d3faebf336..66e62e35ee 100644 --- a/configure.ac +++ b/configure.ac @@ -410,7 +410,7 @@ if test -x "${BOTAN_CONFIG}" ; then for flag in ${BOTAN_LDFLAGS}; do BOTAN_RPATH="${BOTAN_RPATH} `echo $flag | sed -ne 's/^\(\-L\)/-R/p'`" done - AC_SUBST(BOTAN_RPATH) + LDFLAGS="$BOTAN_RPATH $LDFLAGS" fi AC_SUBST(BOTAN_LDFLAGS) @@ -419,7 +419,7 @@ fi CPPFLAGS_SAVED=$CPPFLAGS CPPFLAGS="$BOTAN_INCLUDES $CPPFLAGS" -LDFLAGS_SAVED=$LDFLAGS +LDFLAGS_SAVED="$LDFLAGS" LDFLAGS="$BOTAN_LDFLAGS $LDFLAGS" AC_CHECK_HEADERS([botan/botan.h],,AC_MSG_ERROR([Missing required header files.])) @@ -884,6 +884,7 @@ Flags: DEFS: $DEFS CPPFLAGS: $CPPFLAGS CXXFLAGS: $CXXFLAGS + LDFLAGS: $LDFLAGS B10_CXXFLAGS: $B10_CXXFLAGS dnl includes too Python: ${PYTHON_INCLUDES} diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am index 93f34438b9..c02addecdf 100644 --- a/src/lib/cryptolink/Makefile.am +++ b/src/lib/cryptolink/Makefile.am @@ -11,4 +11,4 @@ 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} +libcryptolink_la_LIBADD = ${BOTAN_LDFLAGS} |