Check-in [8083f26fa7]

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

Overview
Comment:Better support for searching for how to link statically to LibSSL
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tls-1-7
Files: files | file ages | folders
SHA1:8083f26fa7cff63daccdeb66064ec085a85e6870
User & Date: rkeene 2016-12-07 23:00:34
Context
2016-12-08
04:01
Updated header with a link to the homepage check-in: 41aaeb0607 user: rkeene tags: tls-1-7
2016-12-07
23:00
Better support for searching for how to link statically to LibSSL check-in: 8083f26fa7 user: rkeene tags: tls-1-7
21:34
TclTLS 1.7.3 check-in: ce64f41aec user: rkeene tags: tls-1-7, tls-1-7-3
Changes

Changes to aclocal/shobj.m4.

   231    231                   define([VAR_TO_UPDATE], [LIBS])
   232    232           ], [
   233    233                   define([VAR_TO_UPDATE], [$3])
   234    234           ])  
   235    235   
   236    236   
   237    237   	AC_MSG_CHECKING([for how to statically link to $1])
          238  +
          239  +	trylink_ADD_LDFLAGS=''
          240  +	for arg in $VAR_TO_UPDATE; do
          241  +		case "${arg}" in
          242  +			-L*)
          243  +				trylink_ADD_LDFLAGS="${arg}"
          244  +				;;
          245  +		esac
          246  +	done
   238    247   
   239    248   	SAVELIBS="$LIBS"
   240    249   	staticlib=""
   241    250   	found="0"
   242    251   	dnl HP/UX uses -Wl,-a,archive ... -Wl,-a,shared_archive
   243    252   	dnl Linux and Solaris us -Wl,-Bstatic ... -Wl,-Bdynamic
   244    253   	AC_LANG_PUSH([C])
................................................................................
   245    254   	for trylink in "-Wl,-a,archive $2 -Wl,-a,shared_archive" "-Wl,-Bstatic $2 -Wl,-Bdynamic" "$2"; do
   246    255   		if echo " ${LDFLAGS} " | grep ' -static ' >/dev/null; then
   247    256   			if test "${trylink}" != "$2"; then
   248    257   				continue
   249    258   			fi
   250    259   		fi
   251    260   
   252         -		LIBS="${SAVELIBS} ${trylink}"
          261  +		LIBS="${SAVELIBS} ${trylink_ADD_LDFLAGS} ${trylink}"
   253    262   
   254    263   		AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [
   255    264   			staticlib="${trylink}"
   256    265   			found="1"
   257    266   
   258    267   			break
   259    268   		])

Changes to aclocal/tcltls_openssl.m4.

    80     80   		dnl Don't bother doing this if we aren't actually doing the runtime linking
    81     81   		if test "$TCLEXT_BUILD" != "static"; then
    82     82   			dnl Split the libraries into SSL and non-SSL libraries
    83     83   			new_TCLTLS_SSL_LIBS_normal=''
    84     84   			new_TCLTLS_SSL_LIBS_static=''
    85     85   			for arg in $TCLTLS_SSL_LIBS; do
    86     86   				case "${arg}" in
    87         -					-ldl|-lrt|-lc|-lpthread|-lm|-lcrypt|-lidn|-lresolv|-lgcc|-lgcc_s|-L*)
           87  +					-L*)
           88  +						new_TCLTLS_SSL_LIBS_normal="${new_TCLTLS_SSL_LIBS_normal} ${arg}"
           89  +						new_TCLTLS_SSL_LIBS_static="${new_TCLTLS_SSL_LIBS_static} ${arg}"
           90  +						;;
           91  +					-ldl|-lrt|-lc|-lpthread|-lm|-lcrypt|-lidn|-lresolv|-lgcc|-lgcc_s)
    88     92   						new_TCLTLS_SSL_LIBS_normal="${new_TCLTLS_SSL_LIBS_normal} ${arg}"
    89     93   						;;
    90     94   					-l*)
    91     95   						new_TCLTLS_SSL_LIBS_static="${new_TCLTLS_SSL_LIBS_static} ${arg}"
    92     96   						;;
    93     97   					*)
    94     98   						new_TCLTLS_SSL_LIBS_normal="${new_TCLTLS_SSL_LIBS_normal} ${arg}"