[rrd-developers] [PATCH] build system: Replaced TCL_INC_DIR with TCL_INCLUDE_SPEC.

[Sebastian Harl]

Hi,

Please find attached a patch which fixes building the tcl bindings with
current versions of tcl. See the description included in the patch for
more details.

TIA,
Sebastian

-- 
Sebastian "tokkee" Harl +++ GnuPG-ID: 0x8501C7FC +++ http://tokkee.org/

Those who would give up Essential Liberty to purchase a little Temporary
Safety, deserve neither Liberty nor Safety.         -- Benjamin Franklin

-------------- next part --------------
From 85a9e97a27b05a2fa9b79212156b98e490e96ae1 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh at tokkee.org>
Date: Tue, 3 Jun 2008 22:34:12 +0200
Subject: [PATCH] build system: Replaced TCL_INC_DIR with TCL_INCLUDE_SPEC.

In current versions of tclConfig.sh, TCL_INC_DIR is no longer defined.
Instead, TCL_INCLUDE_SPEC is provided which is set to the compiler options
required to find the tcl headers. For backward compatibility, TCL_INC_DIR,
if set, is appended to TCL_INCLUDE_DIR (including the "-I").

Signed-off-by: Sebastian Harl <sh at tokkee.org>
---
 program/bindings/tcl/Makefile.am |    4 ++--
 program/configure.ac             |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/program/bindings/tcl/Makefile.am b/program/bindings/tcl/Makefile.am
index b30736b..34f4077 100644
--- a/program/bindings/tcl/Makefile.am
+++ b/program/bindings/tcl/Makefile.am
@@ -12,12 +12,12 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
 TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
 TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
 TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
-TCL_INC_DIR = @TCL_INC_DIR@
+TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
 
 CLEANFILES = tclrrd.o tclrrd.so
 
 SRC_DIR            = $(top_srcdir)/src
-AM_CPPFLAGS        = -I$(TCL_INC_DIR) -I$(SRC_DIR) -DUSE_TCL_STUBS
+AM_CPPFLAGS        = $(TCL_INCLUDE_SPEC) -I$(SRC_DIR) -DUSE_TCL_STUBS
 LIBDIRS            = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
 LIB_RUNTIME_DIR    = $(libdir)
 
diff --git a/program/configure.ac b/program/configure.ac
index f5f4b13..955ca71 100644
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -853,6 +853,9 @@ if test  "$enable_tcl" = "yes"; then
   else
 	. $tcl_config
 	TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
+	if test -n "$TCL_INC_DIR"; then
+	  TCL_INCLUDE_SPEC="$TCL_INCLUDE_SPEC -I$TCL_INC_DIR"
+	fi
   fi
   AC_ARG_ENABLE(tcl,[  --enable-tcl-site        install the tcl extension in the tcl tree],
   [],[enable_tcl_site=yes])
@@ -872,7 +875,7 @@ AC_SUBST(TCL_LD_SEARCH_FLAGS)
 AC_SUBST(TCL_STUB_LIB_SPEC)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_PACKAGE_DIR)
-AC_SUBST(TCL_INC_DIR)
+AC_SUBST(TCL_INCLUDE_SPEC)
 
 AC_ARG_ENABLE(python,[  --disable-python        do not build the python modules],
 [],[enable_python=yes])
-- 
1.5.5.1.316.g377d9

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.oetiker.ch/pipermail/rrd-developers/attachments/20080604/1677b19a/attachment.bin