configure.ac: try to harden tests for R - forcing --disable-r

graphviz.spec.in:  add commented reminder about BR swig >= 1.3.33

diff --git a/configure.ac b/configure.ac
index ce604fa62a1852a6faa942ae6bfb8a875ea712e1..98bc9cc01c890d93bc34d85cc859f11b8c820e52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1022,6 +1022,7 @@ AM_CONDITIONAL(WITH_PYTHON25, [test "x$PYTHON25" != "x"])
 dnl -----------------------------------
 dnl INCLUDES and LIBS for R (disabled for now - swig generated gv_r.cpp doesn't compile)
 
+R=
 if test "x$SWIG" != "x"; then
 AC_ARG_ENABLE(r,
   [AC_HELP_STRING([--enable-r=no], [R language bindings])],

diff --git a/graphviz.spec.in b/graphviz.spec.in
index fb97f3f9c6eca0ad3545dae5519b49aca13a57bd..cd3bc8fea3b947aec631624b178b673e04c90f41 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -148,7 +148,7 @@ BuildRequires: gd gd-devel perl-devel DevIL-devel
 %endif
 %if "%fedora" >= "8"
 #define R_LANG 1
-#BuildRequires: R
+#BuildRequires: R swig >= 1.3.33
 %endif
 %if "%fedora" >= "9"
 %define MING 1