restore RUBY to FC5 builds

diff --git a/configure.ac b/configure.ac
index 5ff0b413849358e746846a82e7cc6dce1ceba963..88a723566aada6cc67ad8156a75133bc979a0bec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -441,20 +441,20 @@ AM_CONDITIONAL(WITH_PYTHON, [test "x$PYTHON" != "x"])
 dnl -----------------------------------
 dnl INCLUDES and LIBS for RUBY
 
-#AC_CHECK_PROG(RUBY,ruby,ruby)
-#if test "x$RUBY" != "x"; then
-#  RUBY_INCLUDES="-I`ruby $TOP_DIR/config/config_ruby.rb INCLUDES`"
-#  RUBY_LIBS="-L`ruby $TOP_DIR/config/config_ruby.rb lib` -lruby"
-#  save_CPPFLAGS=$CPPFLAGS
-#  CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
-#  AC_CHECK_HEADER(ruby.h,,[
-#    AC_MSG_WARN([Unable to find header ruby.h. The Ruby packages will not be built])
-#    RUBY=
-#    ])
-#  CPPFLAGS=$save_CPPFLAGS
-#fi
-#AC_SUBST(RUBY_INCLUDES)
-#AC_SUBST(RUBY_LIBS)
+AC_CHECK_PROG(RUBY,ruby,ruby)
+if test "x$RUBY" != "x"; then
+  RUBY_INCLUDES="-I`ruby $TOP_DIR/config/config_ruby.rb INCLUDES`"
+  RUBY_LIBS="-L`ruby $TOP_DIR/config/config_ruby.rb lib` -lruby"
+  save_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
+  AC_CHECK_HEADER(ruby.h,,[
+    AC_MSG_WARN([Unable to find header ruby.h. The Ruby packages will not be built])
+    RUBY=
+    ])
+  CPPFLAGS=$save_CPPFLAGS
+fi
+AC_SUBST(RUBY_INCLUDES)
+AC_SUBST(RUBY_LIBS)
 AM_CONDITIONAL(WITH_RUBY, [test "x$RUBY" != "x"])
 
 dnl -----------------------------------

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 7d8ff92b5b33af927bbd2a7c459b111779faf0b0..053cce840d38ee020e1ce41106d8dd9ffc114178 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -21,7 +21,8 @@
 %{?fc4: %{expand: %%define GUILE   1}}
 %{?fc4: %{expand: %%define PERL    1}}
 %{?fc4: %{expand: %%define PYTHON  1}}
-%{?fc4: %{expand: %%define RUBY    0}}
+%{?fc4: %{expand: %%define RUBY    1}}
+%{?fc4: %{expand: %%define TCL     1}}
 
 %{?fc5: %{expand: %%define CSHARP  1}}
 %{?fc5: %{expand: %%define GUILE   1}}
@@ -30,7 +31,8 @@
 %{?fc5: %{expand: %%define PERL    1}}
 %{?fc5: %{expand: %%define PHP     1}}
 %{?fc5: %{expand: %%define PYTHON  1}}
-%{?fc5: %{expand: %%define RUBY    0}}
+%{?fc5: %{expand: %%define RUBY    1}}
+%{?fc5: %{expand: %%define TCL     1}}
 
 Summary:       Graph Visualization Tools
 Name:          graphviz