Index: aclocal/shobj.m4 ================================================================== --- aclocal/shobj.m4 +++ aclocal/shobj.m4 @@ -89,11 +89,15 @@ fi ], [ if test "$cross_compiling" = 'yes'; then set_rpath='no' else - set_rpath='yes' + ifelse($1, [], [ + set_rpath='yes' + ], [ + set_rpath='$1' + ]) fi ]) if test "$set_rpath" = 'yes'; then OLD_LDFLAGS="$LDFLAGS" Index: configure.in ================================================================== --- configure.in +++ configure.in @@ -1,7 +1,7 @@ dnl Define ourselves -AC_INIT(tcltls, 1.7.0) +AC_INIT(tcltls, 1.7.1) dnl Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_INSTALL @@ -159,10 +159,14 @@ CPPFLAGS="${CPPFLAGS} ${TCLTLS_SSL_CPPFLAGS}" AC_MSG_RESULT([$TCLTLS_SSL_CPPFLAGS $TCLTLS_SSL_CFLAGS $TCLTLS_SSL_LIBS]) dnl Sync the RPATH if requested if test "$TCLEXT_BUILD" != 'static'; then - DC_SYNC_RPATH + if test "$TCLEXT_TLS_STATIC_SSL" != 'yes'; then + DC_SYNC_RPATH([no]) + else + DC_SYNC_RPATH([yes]) + fi fi dnl Produce output AC_OUTPUT(Makefile pkgIndex.tcl)