From c774a05be43622c21b28e19a7432e58737678dab Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 6 May 2022 23:08:47 -0500 Subject: [PATCH] Revert "Merge pull request #1022 from orbea/tcl" This merge breaks the default tcl build as it can't find the This reverts commit 4d919ec4546f2eb2ee15f04ce93b789824d20c4a, reversing changes made to 279bc84dfee648e8e3e248e211007400b82cfe44. This patch breaks the default tcl build as it can't find Tcl pkgconfig configure: error: Unable to find Tcl pkgconfig --- bindings/Makefile.am | 3 +-- configure.ac | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 7e2647945..f9f17d567 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -149,9 +149,8 @@ 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) $(TCL_LIBS) +hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la $(TCL_LIB_SPEC) hamlibtcl_ladir = $(tcldir) hamlibtcl_la_DATA = pkgIndex.tcl diff --git a/configure.ac b/configure.ac index 302bd72b9..f58eb0925 100644 --- a/configure.ac +++ b/configure.ac @@ -602,10 +602,6 @@ 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" @@ -621,9 +617,6 @@ 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