Changeset 3282


Ignore:
Timestamp:
Feb 6, 2013, 2:21:08 PM (7 years ago)
Author:
gah
Message:

fixes for 1.9 ruby build

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cf/rpLangRuby.m4

    r3281 r3282  
    9191CXXFLAGS="${CPPFLAGS}"
    9292AC_CHECK_HEADERS(ruby.h)
    93 if test "x${ac_cv_header_ruby_h}" != "x" ; then
    94   HAVE_RUBY_H=yes
    95   AC_CHECK_HEADERS(node.h,,,[
     93HAVE_RUBY_H=${ac_cv_header_ruby_h}
     94AC_SUBST(HAVE_RUBY_H)
     95
     96AC_CHECK_HEADERS(node.h,,,[
    9697#include <ruby.h>
    97   ])
    98   AC_CHECK_HEADERS(ruby/node.h,
    99     [ AC_DEFINE(REALLY_HAVE_RUBY_NODE_H, [],
    100     [ Define this macro to use ruby/node.h ]) ],
    101                              ,[
     98])
     99AC_CHECK_HEADERS(ruby/node.h,
     100[ AC_DEFINE(REALLY_HAVE_RUBY_NODE_H, [],
     101[ Define this macro to use ruby/node.h ]) ],
     102                            ,[
    102103                             #include <ruby.h>
    103   ])
    104   AC_CHECK_HEADERS(version.h,,,[
     104])
     105AC_CHECK_HEADERS(version.h,,,[
    105106#include <ruby.h>
    106   ])
    107   AC_CHECK_HEADERS(env.h,,,[
    108   #include <ruby.h>
    109   ])
    110 else
    111   HAVE_RUBY_H=no
    112 fi
    113 AC_SUBST(HAVE_RUBY_H)
     107])
     108AC_CHECK_HEADERS(env.h,,,[
     109#include <ruby.h>
     110])
    114111
    115112CPPFLAGS="${CPPFLAGS_save}"
  • trunk/configure

    r3281 r3282  
    89358935done
    89368936
    8937 if test "x${ac_cv_header_ruby_h}" != "x" ; then
    8938   HAVE_RUBY_H=yes
    8939   for ac_header in node.h
     8937HAVE_RUBY_H=${ac_cv_header_ruby_h}
     8938
     8939
     8940for ac_header in node.h
    89408941do :
    89418942  ac_fn_cxx_check_header_compile "$LINENO" "node.h" "ac_cv_header_node_h" "
     
    89528953done
    89538954
    8954   for ac_header in ruby/node.h
     8955for ac_header in ruby/node.h
    89558956do :
    89568957  ac_fn_cxx_check_header_compile "$LINENO" "ruby/node.h" "ac_cv_header_ruby_node_h" "
     
    89698970done
    89708971
    8971   for ac_header in version.h
     8972for ac_header in version.h
    89728973do :
    89738974  ac_fn_cxx_check_header_compile "$LINENO" "version.h" "ac_cv_header_version_h" "
     
    89848985done
    89858986
    8986   for ac_header in env.h
     8987for ac_header in env.h
    89878988do :
    89888989  ac_fn_cxx_check_header_compile "$LINENO" "env.h" "ac_cv_header_env_h" "
    8989   #include <ruby.h>
     8990#include <ruby.h>
    89908991
    89918992"
     
    89988999
    89999000done
    9000 
    9001 else
    9002   HAVE_RUBY_H=no
    9003 fi
    90049001
    90059002
  • trunk/lang/Makefile.in

    r3281 r3282  
    3434  LANGS += python
    3535endif
    36 ifeq ($(HAVE_RUBY_H),yes)
    37   LANGS += ruby
     36ifeq ($(RUBY),yes)
     37  ifeq ($(HAVE_RUBY_H),yes)
     38    LANGS += ruby
     39  endif
    3840endif
    3941ifneq ($(MEX),)
Note: See TracChangeset for help on using the changeset viewer.