Tk Source Code

Check-in [dad7e444]
Login

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

Overview
Comment:Fix 5bcb5026ad: Undefined autotools token @TK_LIBS@ in pkgconfig file
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: dad7e444666c18c7743dd80b201065b051d00532
User & Date: jan.nijtmans 2014-04-01 08:24:40
Context
2014-04-09
09:24
Provide full Tk patchlevel to tk.pc and move private libs to "Libs.private". check-in: 81293d2e user: jan.nijtmans tags: core-8-5-branch
2014-04-01
08:45
Fix 5bcb5026ad: Undefined autotools token @TK_LIBS@ in pkgconfig file check-in: 541c37ea user: jan.nijtmans tags: trunk
08:24
Fix 5bcb5026ad: Undefined autotools token @TK_LIBS@ in pkgconfig file check-in: dad7e444 user: jan.nijtmans tags: core-8-5-branch
2014-03-20
10:39
Fix 2f7cbd01c3: tcl8.6.1 fails to build on FreeBSD 10.0 check-in: 730a885b user: jan.nijtmans tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to unix/Makefile.in.

727
728
729
730
731
732
733



734
735
736
737
738
739
740
	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
	@if test "$(STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
	    @INSTALL_STUB_LIB@ ; \
	fi
	@EXTRA_INSTALL_BINARIES@




install-libraries: libraries
	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
		"$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \
	    do \
	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \







>
>
>







727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
	@if test "$(STUB_LIB_FILE)" != "" ; then \
	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
	    @INSTALL_STUB_LIB@ ; \
	fi
	@EXTRA_INSTALL_BINARIES@
	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
	@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc

install-libraries: libraries
	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
		"$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \
	    do \
	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
		echo "Making directory $$i"; \

Changes to unix/tk.pc.in.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
# tk pkg-config source file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: The Tk Toolkit
Description: Tk is a cross-platform graphical user interface toolkit, the standard GUI not only for Tcl, but for many other dynamic languages as well.
URL: http://www.tcl.tk/
Version: @TK_VERSION@
Requires:
Conflicts:
Libs: -L${libdir} @TK_LIBS@
Cflags: -I${includedir}











|
<
|

1
2
3
4
5
6
7
8
9
10
11
12

13
14
# tk pkg-config source file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: The Tk Toolkit
Description: Tk is a cross-platform graphical user interface toolkit, the standard GUI not only for Tcl, but for many other dynamic languages as well.
URL: http://www.tcl.tk/
Version: @TK_VERSION@
Requires: tcl

Libs: -L${libdir} @TK_LIB_FLAG@ @XFT_LIBS@ @XLIBSW@
Cflags: -I${includedir}