[master] Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

configure.ac

@@ -410,7 +410,6 @@ 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
-        BOTAN_RPATH="${PYTHON_LDFLAGS} ${python_rpath}"
         AC_SUBST(BOTAN_RPATH)
     fi