Changeset 3281

Timestamp:

Feb 6, 2013 11:04:50 AM (11 years ago)

Author:

gah

Message:

fixes for 1.9 ruby build

Location:

trunk

Files:

• cf/rpLangRuby.m4 (modified) (1 diff)
• configure (modified) (7 diffs)
• gui/scripts/sidebarframe.tcl (modified) (1 diff)
• lang/Makefile.in (modified) (2 diffs)

trunk/cf/rpLangRuby.m4

@@ -90 +90 @@
 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
 CXXFLAGS="${CPPFLAGS}"
-AC_CHECK_HEADERS(ruby.h,,AC_MSG_ERROR(
-                could not find ruby.h (check config.log)),[ ])
-AC_CHECK_HEADERS(node.h,,,[
+AC_CHECK_HEADERS(ruby.h)
+if test "x${ac_cv_header_ruby_h}" != "x" ; then
+  HAVE_RUBY_H=yes
+  AC_CHECK_HEADERS(node.h,,,[
 #include <ruby.h>
-])
-AC_CHECK_HEADERS(ruby/node.h,
-                 [ AC_DEFINE(REALLY_HAVE_RUBY_NODE_H, [],
-                             [ Define this macro to use ruby/node.h ]) ],
+  ])
+  AC_CHECK_HEADERS(ruby/node.h,
+    [ AC_DEFINE(REALLY_HAVE_RUBY_NODE_H, [],
+    [ Define this macro to use ruby/node.h ]) ],
                              ,[
+                             #include <ruby.h>
+  ])
+  AC_CHECK_HEADERS(version.h,,,[
 #include <ruby.h>
-])
-AC_CHECK_HEADERS(version.h,,,[
-#include <ruby.h>
-])
-AC_CHECK_HEADERS(env.h,,,[
-#include <ruby.h>
-])
+  ])
+  AC_CHECK_HEADERS(env.h,,,[
+  #include <ruby.h>
+  ])
+else 
+  HAVE_RUBY_H=no
+fi
+AC_SUBST(HAVE_RUBY_H)
 
 CPPFLAGS="${CPPFLAGS_save}"

trunk/configure

@@ -691 +691 @@
 build_cpu
 build
+HAVE_RUBY_H
 RUBY_SITELIBDIR
 RUBY_LIBRUBYARG_STATIC
@@ -8924 +8925 @@
 for ac_header in ruby.h
 do :
-  ac_fn_cxx_check_header_compile "$LINENO" "ruby.h" "ac_cv_header_ruby_h" "
-"
+  ac_fn_cxx_check_header_mongrel "$LINENO" "ruby.h" "ac_cv_header_ruby_h" "$ac_includes_default"
 if test "x$ac_cv_header_ruby_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
@@ -8931 +8931 @@
 _ACEOF
 
-else
-  as_fn_error $? "could not find ruby.h (check config.log)" "$LINENO" 5
-fi
-
-done
-
-for ac_header in node.h
+fi
+
+done
+
+if test "x${ac_cv_header_ruby_h}" != "x" ; then
+  HAVE_RUBY_H=yes
+  for ac_header in node.h
 do :
   ac_fn_cxx_check_header_compile "$LINENO" "node.h" "ac_cv_header_node_h" "
@@ -8952 +8952 @@
 done
 
-for ac_header in ruby/node.h
+  for ac_header in ruby/node.h
 do :
   ac_fn_cxx_check_header_compile "$LINENO" "ruby/node.h" "ac_cv_header_ruby_node_h" "
-#include <ruby.h>
+                             #include <ruby.h>
 
 "
@@ -8969 +8969 @@
 done
 
-for ac_header in version.h
+  for ac_header in version.h
 do :
   ac_fn_cxx_check_header_compile "$LINENO" "version.h" "ac_cv_header_version_h" "
@@ -8984 +8984 @@
 done
 
-for ac_header in env.h
+  for ac_header in env.h
 do :
   ac_fn_cxx_check_header_compile "$LINENO" "env.h" "ac_cv_header_env_h" "
-#include <ruby.h>
+  #include <ruby.h>
 
 "
@@ -8998 +8998 @@
 
 done
+
+else
+  HAVE_RUBY_H=no
+fi
 
 

trunk/gui/scripts/sidebarframe.tcl

@@ -214 +214 @@
             Background
     }
-    pack $itk_component(tabs) -side top -expand yes -anchor e -padx {4 0} -fill y
+    pack $itk_component(tabs) -side top -expand yes -anchor e -padx {4 0} \
+        -fill y
 
     eval itk_initialize $args

trunk/lang/Makefile.in

@@ -15 +15 @@
 CC              = @CC@
 CXX             = @CXX@
-RUBY_CPPFLAGS   = @RUBY_CPPFLAGS@
+HAVE_RUBY_H     = @HAVE_RUBY_H@
+RUBY            = @RUBY@
 PERL            = @PERL@
 TCLSH           = @TCLSH@
@@ -33 +34 @@
   LANGS += python
 endif
-ifneq ($(RUBY_CPP_FLAGS),)
+ifeq ($(HAVE_RUBY_H),yes)
   LANGS += ruby
 endif