Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -406,10 +406,11 @@
distclean: clean
-rm -f *.tab.c
-rm -f $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log config.status
+ -rm -R autom4te.cache
#========================================================================
# Install binary object libraries. On Windows this includes both .dll and
# .lib files. Because the .lib files are not explicitly listed anywhere,
# we need to deduce their existence from the .dll file of the same name.
Index: acinclude.m4
==================================================================
--- acinclude.m4
+++ acinclude.m4
@@ -83,10 +83,12 @@
$5
fi
])
AC_DEFUN([TCLTLS_SSL_OPENSSL], [
+ AC_CHECK_TOOL([PKGCONFIG], [pkg-config], [false])
+
openssldir=''
opensslpkgconfigdir=''
AC_ARG_WITH([openssl-dir],
AS_HELP_STRING(
[--with-openssl-dir=
],
@@ -113,12 +115,17 @@
fi
TCLTLS_SSL_CFLAGS="-I$openssldir/include"
TCLTLS_SSL_CPPFLAGS="-I$openssldir/include"
fi
+ AC_MSG_CHECKING([for OpenSSL config])
+ AC_MSG_RESULT($openssldir)
+ AC_MSG_CHECKING([for OpenSSL pkgconfig])
+ AC_MSG_RESULT($opensslpkgconfigdir)
+
pkgConfigExtraArgs=''
- if test "${SHARED_BUILD}" != "1" -o "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then
+ if test "${SHARED_BUILD}" == 0 -o "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then
pkgConfigExtraArgs='--static'
fi
dnl Use pkg-config to find the libraries
dnl Temporarily update PKG_CONFIG_PATH
Index: configure
==================================================================
--- configure
+++ configure
@@ -8970,12 +8970,21 @@
fi
TCLTLS_SSL_CFLAGS="-I$openssldir/include"
TCLTLS_SSL_CPPFLAGS="-I$openssldir/include"
fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL config" >&5
+printf %s "checking for OpenSSL config... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $openssldir" >&5
+printf "%s\n" "$openssldir" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL pkgconfig" >&5
+printf %s "checking for OpenSSL pkgconfig... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $opensslpkgconfigdir" >&5
+printf "%s\n" "$opensslpkgconfigdir" >&6; }
+
pkgConfigExtraArgs=''
- if test "${SHARED_BUILD}" != "1" -o "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then
+ if test "${SHARED_BUILD}" == 0 -o "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then
pkgConfigExtraArgs='--static'
fi
PKG_CONFIG_PATH_SAVE="${PKG_CONFIG_PATH}"
if test -n "${opensslpkgconfigdir}"; then
@@ -8999,11 +9008,11 @@
if test -z "$TCLTLS_SSL_CPPFLAGS"; then
TCLTLS_SSL_CPPFLAGS="`"${PKGCONFIG}" openssl --cflags-only-I $pkgConfigExtraArgs`" || as_fn_error $? "Unable to get OpenSSL Configuration" "$LINENO" 5
fi
PKG_CONFIG_PATH="${PKG_CONFIG_PATH_SAVE}"
- if test "${SHARED_BUILD}" != "1"; then
+ if test "${SHARED_BUILD}" == 0; then
rm -f tcltls.${AREXT}.linkadd
printf "%s\n" "$TCLTLS_SSL_LIBS" > tcltls.${AREXT}.linkadd
fi
if test "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then