[saods9] 01/05: Avoid undefined tclStubsPtr references

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository saods9.

commit 011ff46ea9862bfaabe70537331c54aa84ad66f2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Oct 5 16:03:25 2014 +0200

    Avoid undefined tclStubsPtr references
---
 debian/patches/ds9_use_external_libs.patch | 51 ++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 7acf2a2..358daa1 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -396,15 +396,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  pkgincludedir	= $(includedir)/$(PKG_DIR)
  
  top_builddir	= .
-@@ -155,7 +155,7 @@
- # you do not compile with a similar machine setup as the Tcl core was
- # compiled with.
- #DEFS		= $(TCL_DEFS) @DEFS@ $(PKG_CFLAGS)
--DEFS		= @DEFS@ $(PKG_CFLAGS)
-+DEFS		= @DEFS@ $(PKG_CFLAGS) -DUSE_TCL_STUBS
- 
- # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
- CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
 --- a/tclcheckdns1.1/Makefile.in
 +++ b/tclcheckdns1.1/Makefile.in
 @@ -80,7 +80,7 @@
@@ -427,12 +418,38 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  pkgincludedir	= $(includedir)/$(PKG_DIR)
  
  top_builddir	= .
+--- a/tclcheckdns1.1/configure.in
++++ b/tclcheckdns1.1/configure.in
 @@ -155,7 +155,7 @@
- # you do not compile with a similar machine setup as the Tcl core was
- # compiled with.
- #DEFS		= $(TCL_DEFS) @DEFS@ $(PKG_CFLAGS)
--DEFS		= @DEFS@ $(PKG_CFLAGS)
-+DEFS		= @DEFS@ $(PKG_CFLAGS) -DUSE_TCL_STUBS
- 
- # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
- CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
+ # link against the non-stubbed Tcl library.  Add Tk too if necessary.
+ #--------------------------------------------------------------------
+ 
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ 
+ #--------------------------------------------------------------------
+--- a/tcliis1.0/configure.in
++++ b/tcliis1.0/configure.in
+@@ -160,7 +160,7 @@
+ # link against the non-stubbed Tcl library.  Add Tk too if necessary.
+ #--------------------------------------------------------------------
+ 
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ 
+ #--------------------------------------------------------------------
+--- a/tkmpeg1.0/configure.in
++++ b/tkmpeg1.0/configure.in
+@@ -158,8 +158,8 @@
+ # link against the non-stubbed Tcl library.  Add Tk too if necessary.
+ #--------------------------------------------------------------------
+ 
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+-AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ 
+ #--------------------------------------------------------------------
+ # This macro generates a line to use when building a library.  It

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git