various bits of golang support

diff --git a/configure.ac b/configure.ac
index e74e06d6a1fd303749ad668820fc379d7052e7b1..311ce3550345dbbaf88af30e87c70d5fab5cc794 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -653,7 +653,7 @@ else
     if test `$SWIG -help 2>&1 | $EGREP -c '\-go* *- Generate'` = 0 ; then
       use_go="No (swig does not support -go option)"
     else
-      AC_CHECK_PROG(GO,6g,8g)
+      AC_CHECK_PROG(GO,go,go)
       if test "x$GO" = "x"; then
         use_go="No (GO compiler not available)"
       else
@@ -3142,6 +3142,8 @@ rm -f conftest*
 # -----------------------------------------------------------------------
 AC_CHECK_SIZEOF([long long])
 AC_CHECK_SIZEOF([int])
+SIZEOF_INT_BITS=$(( $ac_cv_sizeof_int * 8 ))
+AC_SUBST([SIZEOF_INT_BITS])
 # -----------------------------------------------------------------------
 
 # Generate Makefiles

diff --git a/graphviz.spec.in b/graphviz.spec.in
index dfe4cd9a9ba31c1424c8772a9aab236a0d5e57ac..a3a3b0b02b862665259ab87ecae81536ca579c16 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 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
 
@@ -161,6 +161,10 @@ BuildRequires: R-devel swig >= 1.3.33 perl-libs
 %define WEBP 1
 BuildRequires: libwebp-devel
 %endif
+%if %fedora >= 20
+%define GO 1
+BuildRequires: golang
+%endif
 %endif
 
 # What a meal PHP makes of versioning !!!
@@ -528,6 +532,24 @@ C# extension for graphviz.
 %{_mandir}/man3/*.3sharp.*
 %endif
 
+#-- graphviz-lang-go rpm --------------------------------------------
+%if 0%{?GO}
+%package lang-go
+Group:          Applications/Multimedia
+Summary:        GO extension for graphviz
+Requires:       %{name} = %{version}-%{release}, golang
+Obsoletes:     %{name}-go
+
+%description lang-go
+Guile extension for graphviz.
+
+%files lang-go
+%defattr(-,root,root,-)
+%dir %{_libdir}/graphviz/go
+%{_libdir}/graphviz/go/*
+%{_mandir}/man3/*.3.guile.*
+%endif
+
 #-- graphviz-lang-guile rpm --------------------------------------------
 %if 0%{?GUILE}
 %package lang-guile
@@ -840,6 +862,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
         --disable-static \
         --disable-dependency-tracking \
         --enable-sharp%{!?SHARP:=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 61173a9f0ef2cd44e7fbb06ca537b7bdda4febde..94f50b136ae5b1d71f68c3f94ff37802076c3c60 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -41,7 +41,7 @@ libgv_go_la_LDFLAGS = -module -avoid-version
 libgv_go_la_CPPFLAGS = $(BASECPPFLAGS) $(GO_INCLUDES)
 # $(GO_data): gv_go.cpp
 gv_go.cpp: gv.i
-       $(SWIG) -c++ -go -o gv_go.cpp $(srcdir)/gv.i
+       $(SWIG) -c++ -go -intgosize @SIZEOF_INT_BITS@ -o gv_go.cpp $(srcdir)/gv.i
 
 pkgguiledir = $(pkglibdir)/guile
 GUILE_data =