Parcourir la source

[trac890] re-added BOTAN_RPATH to cryptolink/Makefile.am.
according to the libtool manual,
http://www.gnu.org/software/libtool/manual/html_node/Link-mode.html
the intent seems to propagate -R from a library's dependency_libs to
the program that uses the library. On our systems libtool doesn't do
this propagation and we needed the global rpath, but if the documentation
is correct, there may be a version of libtool that works.

JINMEI Tatuya il y a 14 ans
Parent
commit
677cebce17
2 fichiers modifiés avec 2 ajouts et 1 suppressions
  1. 1 0
      configure.ac
  2. 1 1
      src/lib/cryptolink/Makefile.am

+ 1 - 0
configure.ac

@@ -410,6 +410,7 @@ if test -x "${BOTAN_CONFIG}" ; then
         for flag in ${BOTAN_LDFLAGS}; do
         for flag in ${BOTAN_LDFLAGS}; do
                 BOTAN_RPATH="${BOTAN_RPATH} `echo $flag | sed -ne 's/^\(\-L\)/-R/p'`"
                 BOTAN_RPATH="${BOTAN_RPATH} `echo $flag | sed -ne 's/^\(\-L\)/-R/p'`"
         done
         done
+	AC_SUBST(BOTAN_RPATH)
         LDFLAGS="$BOTAN_RPATH $LDFLAGS"
         LDFLAGS="$BOTAN_RPATH $LDFLAGS"
     fi
     fi
 
 

+ 1 - 1
src/lib/cryptolink/Makefile.am

@@ -11,4 +11,4 @@ lib_LTLIBRARIES = libcryptolink.la
 libcryptolink_la_SOURCES = cryptolink.h cryptolink.cc
 libcryptolink_la_SOURCES = cryptolink.h cryptolink.cc
 libcryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc
 libcryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc
 
 
-libcryptolink_la_LIBADD = ${BOTAN_LDFLAGS}
+libcryptolink_la_LIBADD = ${BOTAN_LDFLAGS} ${BOTAN_RPATH}