From: ellson <devnull@localhost>
Date: Sat, 26 Mar 2005 17:46:46 +0000 (+0000)
Subject: Needed to move scipt language bindings to somewhere where it gets built
X-Git-Tag: LAST_LIBGRAPH~32^2~7804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83452f27732e8f67773b9562a9dc7cd3bf00831d;p=graphviz
Needed to move scipt language bindings to somewhere where it gets built
after the plugins so that plugins are available to be statically linked.
tclpkg/ is suitable, but now it is misnamed since it is not just tcl anymore .... oh well.
It has the advantage that gv can share the same pkgIndex.tcl construction mechanism
for its tcl binding.
---
diff --git a/configure.ac b/configure.ac
index 8c7373831..36308ee09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,7 +229,7 @@ else
HAVE_PERL=1
PERL_ARCHLIB=`perl -e 'use Config; print $Config{archlib};'`
PERL_INCLUDES=-I$PERL_ARCHLIB/CORE
- PERL_LIBS=-L$PERL_ARCHLIB/CORE -lperl
+ PERL_LIBS="-L$PERL_ARCHLIB/CORE -lperl"
fi
AC_SUBST(HAVE_PERL)
AC_SUBST(PERL_INCLUDES)
@@ -259,7 +259,7 @@ if test "x$RUBY" = "x"; then
HAVE_RUBY=0
else
HAVE_RUBY=1
- RUBY_INCLUDES=-I`ruby $(top_srcdir)/config_ruby.rb INCLUDES`
+ RUBY_INCLUDES=-I`ruby $TOP_DIR/config_ruby.rb INCLUDES`
RUBY_LIBS=-lruby
fi
AC_SUBST(HAVE_RUBY)
@@ -1349,7 +1349,6 @@ AC_CONFIG_FILES(Makefile
lib/ingraphs/Makefile
lib/gvc/Makefile
lib/gvc/libgvc.pc
- lib/gvapi/Makefile
plugin/Makefile
plugin/cairo/Makefile
plugin/gd/Makefile
@@ -1385,6 +1384,7 @@ AC_CONFIG_FILES(Makefile
tclpkg/tclpathplan/demo/pathplan_data/Makefile
tclpkg/tkspline/Makefile
tclpkg/tkspline/demo/Makefile
+ tclpkg/gv/Makefile
graphviz.spec
ast_common.h
)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f0a6380ff..430ffaccf 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = cdt graph agraph gd pathplan agutil sfio vmalloc ast circogen \
- dotgen fdpgen neatogen pack twopigen common gvc ingraphs expr gvapi
+ dotgen fdpgen neatogen pack twopigen common gvc ingraphs expr
EXTRA_DIST = Makefile.old
diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am
index 746d86605..3b3dc0ced 100644
--- a/tclpkg/Makefile.am
+++ b/tclpkg/Makefile.am
@@ -3,7 +3,7 @@
pkgindexdir = $(libdir)/@PACKAGE@
pkgindex_DATA = pkgIndex.tcl
-SUBDIRS = tclstubs tkstubs tclhandle gdtclft tcldot tclpathplan tkspline
+SUBDIRS = tclstubs tkstubs tclhandle gdtclft tcldot tclpathplan tkspline gv
pkgIndex.tcl: @TCL_PKGINDEX@ @TK_PKGINDEX@
echo "# end" >end
diff --git a/tclpkg/gv/gv.h b/tclpkg/gv/gv.h
new file mode 100644
index 000000000..d972ea1fd
--- /dev/null
+++ b/tclpkg/gv/gv.h
@@ -0,0 +1,17 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
+/**********************************************************
+* This software is part of the graphviz package *
+* http://www.graphviz.org/ *
+* *
+* Copyright (c) 1994-2004 AT&T Corp. *
+* and is licensed under the *
+* Common Public License, Version 1.0 *
+* by AT&T Corp. *
+* *
+* Information and Software Systems Research *
+* AT&T Research, Florham Park NJ *
+**********************************************************/
+
+#include "render.h"