From 81e21f0212e45ba3c82a5d812cffbcdcdca01706 Mon Sep 17 00:00:00 2001 From: oetiker Date: Wed, 4 Jun 2008 16:18:42 +0000 Subject: [PATCH] enable new building for newer tcl versions git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1397 a5681a0c-68f1-0310-ab6d-d61299d08faa --- bindings/tcl/Makefile.am | 4 ++-- configure.ac | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bindings/tcl/Makefile.am b/bindings/tcl/Makefile.am index b30736b..34f4077 100644 --- a/bindings/tcl/Makefile.am +++ b/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/configure.ac b/configure.ac index f5f4b13..955ca71 100644 --- a/configure.ac +++ b/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]) -- 2.11.0