Check-in [9f920bf04f]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Updated to default to not setting the RPATH if we are linking statically to the SSL library
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tls-1-7
Files: files | file ages | folders
SHA1:9f920bf04f71be5a7e3cffcbc3b7c81915e51386
User & Date: rkeene 2016-12-07 19:31:47
Context
2016-12-07
19:33
Corrected logic bug with setting RPATH in the opposite case check-in: 4c474ca32b user: rkeene tags: tls-1-7
19:31
Updated to default to not setting the RPATH if we are linking statically to the SSL library check-in: 9f920bf04f user: rkeene tags: tls-1-7
19:22
Updated to detect static linking options dynamically check-in: a0dcb20ebc user: rkeene tags: tls-1-7
Changes

Changes to aclocal/shobj.m4.

87
88
89
90
91
92
93

94



95
96
97
98
99
100
101
		else
			set_rpath='yes'
		fi
	], [
		if test "$cross_compiling" = 'yes'; then
			set_rpath='no'
		else

			set_rpath='yes'



		fi
	])

	if test "$set_rpath" = 'yes'; then
		OLD_LDFLAGS="$LDFLAGS"

		AC_CACHE_CHECK([how to set rpath], [rsk_cv_link_set_rpath], [







>
|
>
>
>







87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
		else
			set_rpath='yes'
		fi
	], [
		if test "$cross_compiling" = 'yes'; then
			set_rpath='no'
		else
			ifelse($1, [], [
				set_rpath='yes'
			], [
				set_rpath='$1'
			])
		fi
	])

	if test "$set_rpath" = 'yes'; then
		OLD_LDFLAGS="$LDFLAGS"

		AC_CACHE_CHECK([how to set rpath], [rsk_cv_link_set_rpath], [

Changes to configure.in.

1
2
3
4
5
6
7
8
9
...
157
158
159
160
161
162
163

164



165
166
167
168
dnl Define ourselves
AC_INIT(tcltls, 1.7.0)

dnl Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_GNU_SOURCE

................................................................................
LIBS="${LIBS} ${TCLTLS_SSL_LIBS}"
CFLAGS="${CFLAGS} ${TCLTLS_SSL_CFLAGS}"
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



fi

dnl Produce output
AC_OUTPUT(Makefile pkgIndex.tcl)

|







 







>
|
>
>
>




1
2
3
4
5
6
7
8
9
...
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
dnl Define ourselves
AC_INIT(tcltls, 1.7.1)

dnl Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_GNU_SOURCE

................................................................................
LIBS="${LIBS} ${TCLTLS_SSL_LIBS}"
CFLAGS="${CFLAGS} ${TCLTLS_SSL_CFLAGS}"
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
	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)