more go bits

diff --git a/.gitignore b/.gitignore
index bdf52e66b8b40a59b6b4c746ec842a928d45ac86..244289106ab35620104352418247868584998cd3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -169,6 +169,9 @@ tclpkg/gv/gv.cmo
 tclpkg/gv/gv.cmx
 tclpkg/gv/gv.cmxa
 tclpkg/gv/gv.cs
+tclpkg/gv/gv.go
+tclpkg/gv/gv_gc.c
+tclpkg/gv/gv_go.cpp
 tclpkg/gv/gv.java
 tclpkg/gv/gv.ml
 tclpkg/gv/gv.mli

diff --git a/graphviz.spec.in b/graphviz.spec.in
index d1166b9bb54246cad859eac373036cf69653af68..73bbf5092f72df2d9c71489fcbda1f1183f3bce0 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -28,7 +28,7 @@ Prefix: /usr
 # All features are off (undefined) by default
 # To enable, use: <percent>define FEATURE 1
 # Available features are:
-#    SHARP GHOSTSCRIPT GO GUILE _IO JAVA LUA OCAML ORTHO PERL PHP
+#    SHARP GHOSTSCRIPT _GO GUILE _IO JAVA LUA OCAML ORTHO PERL PHP
 #    PYTHON RUBY R_LANG TCL IPSEPCOLA MYLIBGD PANGOCAIRO RSVG
 #    GTK GLITZ SMYRNA DEVIL MING GDK _QT WEBP
 
@@ -162,7 +162,7 @@ BuildRequires: R-devel swig >= 1.3.33 perl-libs
 BuildRequires: libwebp-devel
 %endif
 %if %fedora >= 20
-%define GOLANG 1
+%define _GO 1
 BuildRequires: golang
 %endif
 %endif
@@ -533,7 +533,7 @@ C# extension for graphviz.
 %endif
 
 #-- graphviz-lang-go rpm --------------------------------------------
-%if 0%{?GOLANG}
+%if 0%{?_GO}
 %package lang-go
 Group:          Applications/Multimedia
 Summary:        GO extension for graphviz
@@ -862,7 +862,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
         --disable-static \
         --disable-dependency-tracking \
         --enable-sharp%{!?SHARP:=no} \
-        --enable-go%{!?GOLANG:=no} \
+        --enable-go%{!?_GO:=no} \
         --enable-guile%{!?GUILE:=no} \
         --enable-io%{!?_IO:=no} \
         --enable-java%{!?JAVA:=no} \

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 94f50b136ae5b1d71f68c3f94ff37802076c3c60..1a9784d9764635928fceba6c53470005906437b8 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -33,13 +33,13 @@ gv_sharp.cpp: gv.i
        $(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp $(srcdir)/gv.i
 
 pkggodir = $(pkglibdir)/go
-GO_data = 
+GO_data = gv.go gv_gv.c
 nodist_libgv_go_la_SOURCES = gv_go.cpp $(GO_data)
 libgv_go_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_go_la_LIBADD = $(BASELIBS) $(GO_LIBS)
 libgv_go_la_LDFLAGS = -module -avoid-version
 libgv_go_la_CPPFLAGS = $(BASECPPFLAGS) $(GO_INCLUDES)
-# $(GO_data): gv_go.cpp
+$(GO_data): gv_go.cpp
 gv_go.cpp: gv.i
        $(SWIG) -c++ -go -intgosize @SIZEOF_INT_BITS@ -o gv_go.cpp $(srcdir)/gv.i