hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-21 02:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #1022 from orbea/tcl"

Browse Source 
This merge breaks the default tcl build as it can't find the
This reverts commit 4d919ec454, reversing
changes made to 279bc84dfe.
This patch breaks the default tcl build as it can't find Tcl pkgconfig
configure: error: Unable to find Tcl pkgconfig
This commit is contained in:
Mike Black W9MDB 2022-05-06 23:08:47 -05:00
parent 4d919ec454
commit c774a05be4
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/Makefile.am
View File

@ -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

7
configure.ac
View File

@ -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