diff options
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 6 insertions, 11 deletions
@@ -4548,7 +4548,9 @@ RPKITOOLS_TOP_BUILDDIR=`pwd` # any program that wants to use them. We also have to sort out whether # the linker is going to require shared libraries. Feh. # -# Don't bother with this unless we're building OpenSSL. +# The -rpath insanity will need to change once we install this stuff. +# +# Don't bother with any of this unless we're building OpenSSL. if test $build_openssl = yes then @@ -4576,16 +4578,11 @@ $as_echo "$OPENSSL_CONFIG_COMMAND" >&6; } if test $need_openssl_shared = yes then OPENSSL_SHARED_LIBRARIES='enable-shared' - - # This -rpath insanity will need to change once we install this stuff LDFLAGS="$LDFLAGS -Wl,-rpath,$RPKITOOLS_TOP_BUILDDIR/openssl/openssl" - else OPENSSL_SHARED_LIBRARIES='disable-shared' fi - { $as_echo "$as_me:$LINENO: result: $OPENSSL_SHARED_LIBRARIES" >&5 -$as_echo "$OPENSSL_SHARED_LIBRARIES" >&6; } fi # Sort out which interpreter POW-using Python programs should use. diff --git a/configure.ac b/configure.ac index 562f0906..699b5d5f 100644 --- a/configure.ac +++ b/configure.ac @@ -249,7 +249,9 @@ AC_SUBST(RPKITOOLS_TOP_BUILDDIR) # any program that wants to use them. We also have to sort out whether # the linker is going to require shared libraries. Feh. # -# Don't bother with this unless we're building OpenSSL. +# The -rpath insanity will need to change once we install this stuff. +# +# Don't bother with any of this unless we're building OpenSSL. if test $build_openssl = yes then @@ -274,15 +276,11 @@ then if test $need_openssl_shared = yes then OPENSSL_SHARED_LIBRARIES='enable-shared' - - # This -rpath insanity will need to change once we install this stuff LDFLAGS="$LDFLAGS -Wl,-rpath,$RPKITOOLS_TOP_BUILDDIR/openssl/openssl" - else OPENSSL_SHARED_LIBRARIES='disable-shared' fi AC_SUBST(OPENSSL_SHARED_LIBRARIES) - AC_MSG_RESULT([$OPENSSL_SHARED_LIBRARIES]) fi # Sort out which interpreter POW-using Python programs should use. |