From 9dfbd235af43e3cce4dc26ed75545493f1473ee4 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Fri, 6 May 2022 17:13:36 -0700
Subject: [PATCH] bindings: Fix tcl build with slibtool

---
 bindings/Makefile.am | 3 ++-
 configure.ac         | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index f9f17d567..7e2647945 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -149,8 +149,9 @@ PKG_VER = $(ABI_VERSION).$(ABI_REVISION)
 DLL = hamlibtcl-$(PKG_VER)$(TCL_SHLIB_SUFFIX)
 
 nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
+hamlibtcl_la_CFLAGS = $(TCL_CFLAGS)
 hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version
-hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC)
+hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC) $(TCL_LIBS)
 
 hamlibtcl_ladir = $(tcldir)
 hamlibtcl_la_DATA = pkgIndex.tcl
diff --git a/configure.ac b/configure.ac
index f58eb0925..302bd72b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -602,6 +602,10 @@ AS_IF([test x"${build_tcl}" = "xyes"],[
 	[AC_MSG_ERROR([Unable to find Tcl headers])])
     CPPFLAGS=$tcl_save_CPPFLAGS
 
+    PKG_CHECK_MODULES([TCL], [tcl],
+	[],
+	[AC_MSG_ERROR([Unable to find Tcl pkgconfig])])
+
     BINDING_LIST="${BINDING_LIST} tcl"
     BINDING_ALL="${BINDING_ALL} all-tcl"
     BINDING_CHECK="${BINDING_CHECK} check-tcl"
@@ -617,6 +621,9 @@ AC_SUBST([TCL_VERSION])
 AC_SUBST([TCL_LIB_SPEC])
 AC_SUBST([TCL_INCLUDE_SPEC])
 AC_SUBST([TCL_SHLIB_SUFFIX])
+dnl These variables are set once tcl.pc is found.
+AC_SUBST([TCL_LIBS])
+AC_SUBST([TCL_CFLAGS])
 
 
 dnl Check for lua availability, so we can enable HamlibLua