fix tcl issues ... build with pre tcl8.4 ... do not try to install into the tcl tree...

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@733 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/bindings/tcl/Makefile.am b/bindings/tcl/Makefile.am
index 22d661df0306d5651329184f9ec3bf405cae678a..d4ea2102f95024452c055adbaba03177c318ce60 100644 (file)
--- a/bindings/tcl/Makefile.am
+++ b/bindings/tcl/Makefile.am
@@ -20,7 +20,9 @@ AM_CPPFLAGS        = -I$(TCL_PREFIX)/include -I$(SRC_DIR) -DUSE_TCL_STUBS
 LIBDIRS            = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
 LIB_RUNTIME_DIR    = $(libdir)
 
+if BUILD_TCL_SITE
 pkglibdir = @TCL_PACKAGE_DIR@
+endif
 
 # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
 # library name. So we build and install this library `by hand'.
@@ -39,7 +41,7 @@ pkglib_DATA = pkgIndex.tcl
 pkglib_SCRIPTS = ifOctets.tcl
 
 $(TCL_RRD_LIB): tclrrd.o
-       $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm $(TCL_STUB_LIB_SPEC) $(LIBS)
+       $(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
 
 tclrrd.o: tclrrd.c
        $(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"

diff --git a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c
index 5d4e9b7e7190eead0d6cc01f26a12baa0dd01aa4..6a5250c66632cb92f1ce62bd07937cb8dd6ee9e3 100644 (file)
--- a/bindings/tcl/tclrrd.c
+++ b/bindings/tcl/tclrrd.c
@@ -21,6 +21,12 @@
 #include <rrd_tool.h>
 #include <rrd_format.h>
 
+/* support pre-8.4 tcl */
+
+#ifndef CONST84
+#   define CONST84
+#endif
+
 extern int Tclrrd_Init(Tcl_Interp *interp);
 extern int Tclrrd_SafeInit(Tcl_Interp *interp);
 

diff --git a/configure.ac b/configure.ac
index ddff204f1041b2de913752f4bc0c16bb14fd75ad..eb3e53170ee36f38467608e15eefc3c075872a4b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -463,6 +463,8 @@ AC_SUBST(PERL)
 AC_SUBST(COMP_PERL)
 AC_SUBST(PERL_VERSION)
 
+enable_tcl_site=no
+
 AC_ARG_ENABLE(tcl,[  --disable-tcl           do not build the tcl modules],
 [],[enable_tcl=yes])
 
@@ -489,9 +491,13 @@ if test  "$enable_tcl" = "yes"; then
        . $tcl_config
        TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
   fi
+  AC_ARG_ENABLE(tcl,[  --enable-tcl-site        install the tcl extension in the tcl tree],
+  [],[enable_tcl_site=yes])
+
 fi
 
 AM_CONDITIONAL(BUILD_TCL, test "$enable_tcl" = "yes" )
+AM_CONDITIONAL(BUILD_TCL_SITE, test "$enable_tcl_site" = "yes" )
 
 AC_SUBST(TCL_PREFIX)
 AC_SUBST(TCL_SHLIB_CFLAGS)