Added support for reporting TEA-like info via pkg-config. [Patch 2243962]

4 files changed, 33 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a7646c4..ca2ffb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-14  Donal K. Fellows  <dkf@users.sf.net>
+
+	* unix/tk.pc.in (new file):		[Patch 2243962] (hat0)
+	* unix/configure.in, unix/Makefile.in: Added support for reporting
+	Tk's public build configuration via the pkg-config system. TEA is
+	still the official mechanism though, in part because pkg-config is not
+	universally supported across all Tk's supported platforms.
+
 2009-03-10  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/event.n: Tidy up and improve examples.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c4a8637..5b50f8a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.149 2009/01/20 03:39:06 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.150 2009/03/14 17:35:04 dkf Exp $
 
 # Current Tk version;  used in various names.
 
@@ -736,6 +736,9 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
 	    @INSTALL_STUB_LIB@ ; \
 	fi
 	@EXTRA_INSTALL_BINARIES@
+	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
+	@mkdir -p $(LIB_INSTALL_DIR)/pkgconfig
+	@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
 
 install-libraries: libraries
 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
@@ -885,7 +888,7 @@ clean:
 
 distclean: clean
 	rm -rf Makefile config.status config.cache config.log tkConfig.sh \
-		$(PACKAGE).* prototype tkConfig.h *.plist Tk.framework
+		$(PACKAGE).* prototype tkConfig.h *.plist Tk.framework tk.pc
 
 depend:
 	makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)
@@ -1521,7 +1524,7 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
 $(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoheader; touch $@
 
-dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure genstubs
+dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure genstubs
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
 	cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
@@ -1531,7 +1534,7 @@ dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure
 		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
 		$(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \
 		$(UNIX_DIR)/README $(UNIX_DIR)/installManPage \
-		$(UNIX_DIR)/tkConfig.h.in $(DISTDIR)/unix
+		$(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(DISTDIR)/unix
 	chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
 	chmod +x $(DISTDIR)/unix/install-sh
 	mkdir $(DISTDIR)/bitmaps
diff --git a/unix/configure.in b/unix/configure.in
index 5810e21..b51b287 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.162 2009/01/16 20:55:12 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.163 2009/03/14 17:35:04 dkf Exp $
 
 AC_INIT([tk],[8.6])
 AC_PREREQ(2.59)
@@ -749,5 +749,6 @@ AC_SUBST(REZ_FLAGS)
 AC_CONFIG_FILES([
     Makefile:../unix/Makefile.in
     tkConfig.sh:../unix/tkConfig.sh.in
+    tk.pc:../unix/tk.pc.in
 ])
 AC_OUTPUT
diff --git a/unix/tk.pc.in b/unix/tk.pc.in
new file mode 100644
index 0000000..01d3b0c
--- /dev/null
+++ b/unix/tk.pc.in
@@ -0,0 +1,16 @@
+# tk pkg-config source file
+# $Id: tk.pc.in,v 1.1 2009/03/14 17:35:03 dkf Exp $
+
+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}