Changeset 4909 for branches/r9/lang


Ignore:
Timestamp:
Dec 31, 2014 10:05:58 AM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9/lang
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/lang/Makefile.in

    r4870 r4909  
    1717HAVE_RUBY_H     = @HAVE_RUBY_H@
    1818RUBY            = @RUBY@
     19WITH_RUBY       = @WITH_RUBY@
    1920PERL            = @PERL@
    2021TCLSH           = @TCLSH@
     
    3435  LANGS += python
    3536endif
    36 ifneq ($(RUBY),)
     37ifneq ($(WITH_RUBY), "no")
    3738  ifeq ($(HAVE_RUBY_H),yes)
    3839    LANGS += ruby
     
    5253endif
    5354
    54 .PHONY: all install test clean distclean $(LANGS)
     55.PHONY: all install test clean distclean $(LANGS) examples
    5556
    56 all:
     57all: 
    5758        for i in $(LANGS) ; do \
    5859          $(MAKE) -C $$i all || exit 1 ;\
    5960        done
    60         $(MAKE) -C examples all || exit 1
    61 
    62 install:
    6361        for i in $(LANGS) ; do \
    6462          $(MAKE) -C $$i install || exit 1 ;\
    6563        done
     64        $(MAKE) -C examples all || exit 1
     65
     66install: all
    6667        $(MAKE) -C examples install || exit 1
     68
     69test:
     70        for i in $(LANGS) ; do \
     71          $(MAKE) -C $$i test || exit 1 ;\
     72        done
    6773
    6874test:
  • branches/r9/lang/cf/rpLangRuby.m4

    r4837 r4909  
    11dnl Get a key from ruby's configuration table
    2 AC_DEFUN([RUBY_CONFIG], [
    3           $RUBY -rrbconfig -e "puts(Config::CONFIG[['$1']] || '')"])
    42
    53AC_DEFUN([RP_LANG_RUBY], [
    64
    75AC_ARG_WITH(
    8     ruby,
     6    [ruby],
    97    AC_HELP_STRING(
    108     --with-ruby=PATH,
    119     [ path to the ruby interpreter [[ruby]] ]),
    12     [ RUBY=$withval ],
    13     [ RUBY=ruby ])
     10    [WITH_RUBY=$withval],
     11    [WITH_RUBY=ruby])
     12
    1413AC_ARG_WITH(
    1514    ruby_sitelibdir,
     
    2019    [ ruby_sitelibdir=NONE ])
    2120
     21echo RUBY=$WITH_RUBY
     22if test "$WITH_RUBY" != "no" ; then
     23  if test "$WITH_RUBY" = "yes" ; then
     24    AC_PATH_PROG(RUBY, [ruby], [no])
     25  fi
     26else
     27  RUBY=$WITH_RUBY
     28fi
     29echo "after RUBY=$RUBY"
     30if test "$RUBY" = "no" ; then
     31  RUBY="/bin/true"
     32fi
     33AC_SUBST(WITH_RUBY)
    2234AC_SUBST(RUBY)
     35
     36AC_DEFUN([RUBY_CONFIG], [
     37          $RUBY -rrbconfig -e "puts(Config::CONFIG[['$1']] || '')"])
    2338
    2439RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
  • branches/r9/lang/configure

    r4867 r4909  
    695695RUBY_CPPFLAGS
    696696RUBY_VERSION_CODE
     697WITH_RUBY
    697698RUBY
    698699R
     
    89368937# Check whether --with-ruby was given.
    89378938if test "${with_ruby+set}" = set; then :
    8938   withval=$with_ruby;  RUBY=$withval
    8939 else
    8940    RUBY=ruby
    8941 fi
     8939  withval=$with_ruby; WITH_RUBY=$withval
     8940else
     8941  WITH_RUBY=ruby
     8942fi
     8943
    89428944
    89438945
     
    89508952
    89518953
     8954echo RUBY=$WITH_RUBY
     8955if test "$WITH_RUBY" != "no" ; then
     8956  if test "$WITH_RUBY" = "yes" ; then
     8957    # Extract the first word of "ruby", so it can be a program name with args.
     8958set dummy ruby; ac_word=$2
     8959{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8960$as_echo_n "checking for $ac_word... " >&6; }
     8961if ${ac_cv_path_RUBY+:} false; then :
     8962  $as_echo_n "(cached) " >&6
     8963else
     8964  case $RUBY in
     8965  [\\/]* | ?:[\\/]*)
     8966  ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
     8967  ;;
     8968  *)
     8969  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8970for as_dir in $PATH
     8971do
     8972  IFS=$as_save_IFS
     8973  test -z "$as_dir" && as_dir=.
     8974    for ac_exec_ext in '' $ac_executable_extensions; do
     8975  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8976    ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
     8977    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8978    break 2
     8979  fi
     8980done
     8981  done
     8982IFS=$as_save_IFS
     8983
     8984  test -z "$ac_cv_path_RUBY" && ac_cv_path_RUBY="no"
     8985  ;;
     8986esac
     8987fi
     8988RUBY=$ac_cv_path_RUBY
     8989if test -n "$RUBY"; then
     8990  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
     8991$as_echo "$RUBY" >&6; }
     8992else
     8993  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8994$as_echo "no" >&6; }
     8995fi
     8996
     8997
     8998  fi
     8999else
     9000  RUBY=$WITH_RUBY
     9001fi
     9002echo "after RUBY=$RUBY"
     9003if test "$RUBY" = "no" ; then
     9004  RUBY="/bin/true"
     9005fi
     9006
     9007
     9008
    89529009
    89539010
     
    89569013
    89579014RUBY_CONFIG_SO_NAME=`
    8958           $RUBY -rrbconfig -e "puts(Config::CONFIG['RUBY_SO_NAME'] || '')"`
     9015          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89599016RUBY_CONFIG_ARCHDIR=`
    8960           $RUBY -rrbconfig -e "puts(Config::CONFIG['archdir'] || '')"`
     9017          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89619018RUBY_CONFIG_ARCH=`
    8962           $RUBY -rrbconfig -e "puts(Config::CONFIG['arch'] || '')"`
     9019          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89639020RUBY_CONFIG_LIBDIR=`
    8964           $RUBY -rrbconfig -e "puts(Config::CONFIG['libdir'] || '')"`
     9021          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89659022RUBY_CONFIG_BINDIR=`
    8966           $RUBY -rrbconfig -e "puts(Config::CONFIG['bindir'] || '')"`
     9023          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89679024RUBY_CONFIG_RUBYHDRDIR=`
    8968           $RUBY -rrbconfig -e "puts(Config::CONFIG['rubyhdrdir'] || '')"`
     9025          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89699026RUBY_CONFIG_CFLAGS=`
    8970           $RUBY -rrbconfig -e "puts(Config::CONFIG['CFLAGS'] || '')"`
     9027          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89719028RUBY_CONFIG_LIBS=`
    8972           $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBS'] || '')"`
     9029          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89739030RUBY_CONFIG_DLDLIBS=`
    8974           $RUBY -rrbconfig -e "puts(Config::CONFIG['DLDLIBS'] || '')"`
     9031          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89759032RUBY_CONFIG_LDFLAGS=`
    8976           $RUBY -rrbconfig -e "puts(Config::CONFIG['LDFLAGS'] || '')"`
     9033          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89779034RUBY_CONFIG_LIBRUBYARG=`
    8978           $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG'] || '')"`
     9035          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89799036RUBY_CONFIG_LIBRUBYARG_STATIC=`
    8980           $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG_STATIC'] || '')"`
     9037          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89819038RUBY_CONFIG_CCDLFLAGS=`
    8982           $RUBY -rrbconfig -e "puts(Config::CONFIG['CCDLFLAGS'] || '')"`
     9039          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    89839040
    89849041if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
     
    90179074  then
    90189075    RUBY_SITELIBDIR=`
    9019           $RUBY -rrbconfig -e "puts(Config::CONFIG['sitelibdir'] || '')"`
     9076          $RUBY -rrbconfig -e "puts(Config::CONFIG[''] || '')"`
    90209077  else
    90219078    sitelibdir_no_prefix=`$RUBY -rrbconfig \
Note: See TracChangeset for help on using the changeset viewer.