[SCM] Minimal buy-in FITS library and utility package branch, master, updated. 05b9d526382e0912cb3e0186d2ef3cca3d5704cd

[Ole Streicher]

The following commit has been merged in the master branch:
commit eadde5ef4e3c2470c5962d6f3820adfea93795cd
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Feb 4 12:38:15 2012 +0100

    Link tcl libraries to libtclfun.so

diff --git a/debian/patches/build_tclfun.patch b/debian/patches/build_tclfun.patch
index 4bf69c7..7f770b7 100644
--- a/debian/patches/build_tclfun.patch
+++ b/debian/patches/build_tclfun.patch
@@ -1,6 +1,8 @@
---- funtools-1.4.4.orig/Makefile.in
-+++ funtools-1.4.4/Makefile.in
-@@ -38,6 +38,7 @@ INSTALL_ROOT = $(DESTDIR)
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Build the Tcl extension as a shared library.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -38,6 +38,7 @@ INSTALL_ROOT =
  
  # Directory in which to install the .a or .so binary for the FUNTOOLS library:
  LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
@@ -8,12 +10,13 @@
  
  # Directory in which to install the program wish:
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
-@@ -67,8 +67,11 @@ WCS_LIBS =		-lwcstools
+@@ -67,8 +68,12 @@ WCS_INC =		-I./wcs
  FILTER_INC =        	-I./filter
  # FILTER_LIBS =		-L./filter -lfilter
  
 +# tcl include files
 +TCL_INC = 		-I/usr/include/tcl
++TCL_LIBS = 		@TCL_LIBS@
 +
  # extra includes for compiling
 -INCLUDES =		$(UTIL_INC) $(FILTER_INC) $(WCS_INC) $(FITSY_INC)
@@ -21,7 +24,7 @@
  
  # extra libs
  EXTRA_LIBS =		@EXTRA_LIBS@
-@@ -253,9 +253,9 @@ tclfun:		$(LIB) tclmainlib.o tclfun.o
+@@ -249,9 +254,9 @@ tclfun:		$(LIB) tclmainlib.o tclfun.o
  
  shtclfun:	tclfun
  		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
@@ -29,11 +32,11 @@
 +		(cd $(PACKAGE)tmp && ar x ../libtclfun.a); \
  		CC='$(CC)' CXX='$(CXX)' \
 -		./mklib -o tclfun $(PACKAGE)tmp/*.o; \
-+		./mklib -o tclfun -L. -lfuntools $(PACKAGE)tmp/*.o; \
++		./mklib -o tclfun -L. -lfuntools $(PACKAGE)tmp/*.o $(TCL_LIBS); \
  		rm -rf $(PACKAGE)tmp; \
  		test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
  		SHLIB=libtclfun.so; \
-@@ -396,6 +397,8 @@ install::	install-man
+@@ -393,6 +398,8 @@ install::	install-man
  
  install::	install-share
  
@@ -42,7 +45,7 @@
  install::	install-data
  
  FORCE:
-@@ -408,7 +411,7 @@ FORCE:
+@@ -405,7 +412,7 @@ FORCE:
  _install:
  
  shlib_install:
@@ -51,7 +54,7 @@
  	   do \
  	   if [ -h $$i ] ; then \
  		echo "Installing link $$i" ; \
-@@ -420,6 +423,11 @@ shlib_install:
+@@ -417,6 +424,11 @@ shlib_install:
  	   fi; \
  	   done;)
  
@@ -63,3 +66,15 @@
  install-binaries: lib $(PROGS) $(SCRIPTS) $(DS9HELPERS)
  	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
+--- a/configure.ac	2012-02-04 11:40:38.013399732 +0100
++++ b/configure.ac	2012-02-04 11:41:16.957054763 +0100
+@@ -194,6 +194,9 @@
+ SC_PATH_TCLCONFIG
+ if test x"${no_tcl}" = x ; then
+     AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.])
++    SC_LOAD_TCLCONFIG
++    TCL_LIBS="$TCL_LIB_SPEC"
++    AC_SUBST(TCL_LIBS)
+ fi
+ 
+ AC_PROG_AWK

-- 
Minimal buy-in FITS library and utility package