Changeset 3277


Ignore:
Timestamp:
Feb 4, 2013, 4:07:03 PM (7 years ago)
Author:
gah
Message:

fixes for 1.9 ruby build

Location:
trunk
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/aclocal.m4

    r2709 r3277  
    99builtin(include,./cf/rpLangMatlab.m4)
    1010builtin(include,./cf/rpLangR.m4)
     11builtin(include,./cf/rpLangRuby.m4)
  • trunk/configure

    r3276 r3277  
    645645SIZEOF_INT
    646646SHLIB_LDFLAGS
    647 RUBY_VERSION_RV
    648 RUBY_PLATFORM
    649647RP_BASE
    650648PYTHON_VERSION
     
    680678JAVA_HOME
    681679INSTALL_PREFIX
    682 HAVE_RUBY_DEVEL
    683680HAVE_INTTYPES_H
    684681HAVE_FFMPEG_LIBS
     
    686683LDFLAGS_DEFAULT
    687684CFLAGS_DEFAULT
    688 RUBY_EXTRA_LIBS
    689 RUBY_SITE_PKG
     685host_os
     686host_vendor
     687host_cpu
     688host
     689build_os
     690build_vendor
     691build_cpu
     692build
     693RUBY_SITELIBDIR
     694RUBY_LIBRUBYARG_STATIC
     695RUBY_LIBRUBYARG
     696RUBY_LIBS
    690697RUBY_LDFLAGS
     698RUBY_CXXFLAGS
     699RUBY_CFLAGS
    691700RUBY_CPPFLAGS
    692 AWK
    693 RUBY_VERSION
    694 SED
     701RUBY_VERSION_CODE
    695702RUBY
    696703R
     
    816823with_R
    817824with_ruby
     825with_ruby_sitelibdir
    818826enable_shared
    819827enable_symbols
     
    14301438
    14311439  cat <<\_ACEOF
     1440
     1441System types:
     1442  --build=BUILD     configure for building on BUILD [guessed]
     1443  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
    14321444_ACEOF
    14331445fi
     
    14681480  --with-java=DIR         location of java [default=yes]
    14691481  --with-R=DIR            location of R interpreter [default=yes]
    1470   --with-ruby=DIR         location of ruby [default=yes]
     1482  --with-ruby=PATH        path to the ruby interpreter [[ruby]]
     1483  --with-ruby-sitelibdir=PATH
     1484                          path to install ruby scripts [[auto-detect]]
    14711485
    14721486Some influential environment variables:
     
    87388752
    87398753
    8740 
    8741 RUBY=""
    8742 RUBY_DEV_PKG="no"
     8754# Make sure we can run config.sub.
     8755$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
     8756  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     8757
     8758{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
     8759$as_echo_n "checking build system type... " >&6; }
     8760if ${ac_cv_build+:} false; then :
     8761  $as_echo_n "(cached) " >&6
     8762else
     8763  ac_build_alias=$build_alias
     8764test "x$ac_build_alias" = x &&
     8765  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
     8766test "x$ac_build_alias" = x &&
     8767  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     8768ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
     8769  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
     8770
     8771fi
     8772{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
     8773$as_echo "$ac_cv_build" >&6; }
     8774case $ac_cv_build in
     8775*-*-*) ;;
     8776*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
     8777esac
     8778build=$ac_cv_build
     8779ac_save_IFS=$IFS; IFS='-'
     8780set x $ac_cv_build
     8781shift
     8782build_cpu=$1
     8783build_vendor=$2
     8784shift; shift
     8785# Remember, the first character of IFS is used to create $*,
     8786# except with old shells:
     8787build_os=$*
     8788IFS=$ac_save_IFS
     8789case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
     8790
     8791
     8792{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
     8793$as_echo_n "checking host system type... " >&6; }
     8794if ${ac_cv_host+:} false; then :
     8795  $as_echo_n "(cached) " >&6
     8796else
     8797  if test "x$host_alias" = x; then
     8798  ac_cv_host=$ac_cv_build
     8799else
     8800  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
     8801    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
     8802fi
     8803
     8804fi
     8805{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
     8806$as_echo "$ac_cv_host" >&6; }
     8807case $ac_cv_host in
     8808*-*-*) ;;
     8809*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
     8810esac
     8811host=$ac_cv_host
     8812ac_save_IFS=$IFS; IFS='-'
     8813set x $ac_cv_host
     8814shift
     8815host_cpu=$1
     8816host_vendor=$2
     8817shift; shift
     8818# Remember, the first character of IFS is used to create $*,
     8819# except with old shells:
     8820host_os=$*
     8821IFS=$ac_save_IFS
     8822case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
     8823
     8824
     8825
    87438826
    87448827
    87458828# Check whether --with-ruby was given.
    87468829if test "${with_ruby+set}" = set; then :
    8747   withval=$with_ruby;
    8748 else
    8749   with_ruby="yes"
    8750 fi
    8751 
    8752 
    8753 if test "${with_ruby}" != "no" ; then
    8754   if test "${with_ruby}" = "yes" ; then
    8755     # Extract the first word of "ruby", so it can be a program name with args.
    8756 set dummy ruby; ac_word=$2
    8757 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8758 $as_echo_n "checking for $ac_word... " >&6; }
    8759 if ${ac_cv_path_RUBY+:} false; then :
    8760   $as_echo_n "(cached) " >&6
    8761 else
    8762   case $RUBY in
    8763   [\\/]* | ?:[\\/]*)
    8764   ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
    8765   ;;
    8766   *)
    8767   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8768 for as_dir in $PATH
    8769 do
    8770   IFS=$as_save_IFS
    8771   test -z "$as_dir" && as_dir=.
    8772     for ac_exec_ext in '' $ac_executable_extensions; do
    8773   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    8774     ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
    8775     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8776     break 2
     8830  withval=$with_ruby;  RUBY=$withval
     8831else
     8832   RUBY=ruby
     8833fi
     8834
     8835
     8836# Check whether --with-ruby_sitelibdir was given.
     8837if test "${with_ruby_sitelibdir+set}" = set; then :
     8838  withval=$with_ruby_sitelibdir;  ruby_sitelibdir=$withval
     8839else
     8840   ruby_sitelibdir=NONE
     8841fi
     8842
     8843
     8844
     8845
     8846RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
     8847
     8848
     8849RUBY_CONFIG_SO_NAME=`
     8850          $RUBY -rrbconfig -e "puts(Config::CONFIG['RUBY_SO_NAME'] || '')"`
     8851RUBY_CONFIG_ARCHDIR=`
     8852          $RUBY -rrbconfig -e "puts(Config::CONFIG['archdir'] || '')"`
     8853RUBY_CONFIG_ARCH=`
     8854          $RUBY -rrbconfig -e "puts(Config::CONFIG['arch'] || '')"`
     8855RUBY_CONFIG_LIBDIR=`
     8856          $RUBY -rrbconfig -e "puts(Config::CONFIG['libdir'] || '')"`
     8857RUBY_CONFIG_BINDIR=`
     8858          $RUBY -rrbconfig -e "puts(Config::CONFIG['bindir'] || '')"`
     8859RUBY_CONFIG_RUBYHDRDIR=`
     8860          $RUBY -rrbconfig -e "puts(Config::CONFIG['rubyhdrdir'] || '')"`
     8861RUBY_CONFIG_CFLAGS=`
     8862          $RUBY -rrbconfig -e "puts(Config::CONFIG['CFLAGS'] || '')"`
     8863RUBY_CONFIG_LIBS=`
     8864          $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBS'] || '')"`
     8865RUBY_CONFIG_DLDLIBS=`
     8866          $RUBY -rrbconfig -e "puts(Config::CONFIG['DLDLIBS'] || '')"`
     8867RUBY_CONFIG_LDFLAGS=`
     8868          $RUBY -rrbconfig -e "puts(Config::CONFIG['LDFLAGS'] || '')"`
     8869RUBY_CONFIG_LIBRUBYARG=`
     8870          $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG'] || '')"`
     8871RUBY_CONFIG_LIBRUBYARG_STATIC=`
     8872          $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG_STATIC'] || '')"`
     8873RUBY_CONFIG_CCDLFLAGS=`
     8874          $RUBY -rrbconfig -e "puts(Config::CONFIG['CCDLFLAGS'] || '')"`
     8875
     8876if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
     8877  # 1.9
     8878  RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
     8879  RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
     8880else
     8881  # 1.8
     8882  RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
     8883fi
     8884
     8885
     8886RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
     8887
     8888
     8889RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
     8890
     8891
     8892RUBY_LDFLAGS="-L${RUBY_CONFIG_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_CONFIG_LDFLAGS}"
     8893
     8894
     8895RUBY_LIBS="${RUBY_CONFIG_LIBS} ${RUBY_CONFIG_DLDLIBS}"
     8896
     8897
     8898RUBY_LIBRUBYARG="${RUBY_CONFIG_LIBRUBYARG}"
     8899
     8900
     8901RUBY_LIBRUBYARG_STATIC="${RUBY_CONFIG_LIBRUBYARG_STATIC}"
     8902
     8903
     8904if test "x${ruby_sitelibdir}x" != "xNONEx"
     8905then
     8906  RUBY_SITELIBDIR="${ruby_sitelibdir}"
     8907else
     8908  if test "x${prefix}x" = "xNONEx"
     8909  then
     8910    RUBY_SITELIBDIR=`
     8911          $RUBY -rrbconfig -e "puts(Config::CONFIG['sitelibdir'] || '')"`
     8912  else
     8913    sitelibdir_no_prefix=`$RUBY -rrbconfig \
     8914    -e "include Config; \
     8915    puts CONFIG['sitelibdir'].sub(CONFIG['prefix'], '')"`
     8916    RUBY_SITELIBDIR="${prefix}/${sitelibdir_no_prefix}"
    87778917  fi
    8778 done
    8779   done
    8780 IFS=$as_save_IFS
    8781 
    8782   ;;
     8918fi
     8919
     8920
     8921CPPFLAGS_save="${CPPFLAGS}"
     8922CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
     8923CXXFLAGS="${CPPFLAGS}"
     8924for ac_header in ruby.h
     8925do :
     8926  ac_fn_cxx_check_header_compile "$LINENO" "ruby.h" "ac_cv_header_ruby_h" "
     8927"
     8928if test "x$ac_cv_header_ruby_h" = xyes; then :
     8929  cat >>confdefs.h <<_ACEOF
     8930#define HAVE_RUBY_H 1
     8931_ACEOF
     8932
     8933else
     8934  as_fn_error $? "could not find ruby.h (check config.log)" "$LINENO" 5
     8935fi
     8936
     8937done
     8938
     8939for ac_header in node.h
     8940do :
     8941  ac_fn_cxx_check_header_compile "$LINENO" "node.h" "ac_cv_header_node_h" "
     8942#include <ruby.h>
     8943
     8944"
     8945if test "x$ac_cv_header_node_h" = xyes; then :
     8946  cat >>confdefs.h <<_ACEOF
     8947#define HAVE_NODE_H 1
     8948_ACEOF
     8949
     8950fi
     8951
     8952done
     8953
     8954for ac_header in ruby/node.h
     8955do :
     8956  ac_fn_cxx_check_header_compile "$LINENO" "ruby/node.h" "ac_cv_header_ruby_node_h" "
     8957#include <ruby.h>
     8958
     8959"
     8960if test "x$ac_cv_header_ruby_node_h" = xyes; then :
     8961  cat >>confdefs.h <<_ACEOF
     8962#define HAVE_RUBY_NODE_H 1
     8963_ACEOF
     8964
     8965$as_echo "#define REALLY_HAVE_RUBY_NODE_H /**/" >>confdefs.h
     8966
     8967fi
     8968
     8969done
     8970
     8971for ac_header in version.h
     8972do :
     8973  ac_fn_cxx_check_header_compile "$LINENO" "version.h" "ac_cv_header_version_h" "
     8974#include <ruby.h>
     8975
     8976"
     8977if test "x$ac_cv_header_version_h" = xyes; then :
     8978  cat >>confdefs.h <<_ACEOF
     8979#define HAVE_VERSION_H 1
     8980_ACEOF
     8981
     8982fi
     8983
     8984done
     8985
     8986for ac_header in env.h
     8987do :
     8988  ac_fn_cxx_check_header_compile "$LINENO" "env.h" "ac_cv_header_env_h" "
     8989#include <ruby.h>
     8990
     8991"
     8992if test "x$ac_cv_header_env_h" = xyes; then :
     8993  cat >>confdefs.h <<_ACEOF
     8994#define HAVE_ENV_H 1
     8995_ACEOF
     8996
     8997fi
     8998
     8999done
     9000
     9001
     9002CPPFLAGS="${CPPFLAGS_save}"
     9003
     9004
     9005case $host_os in
     9006  *mingw32* ) MINGW32=yes;;
     9007          * ) MINGW32=no;;
    87839008esac
    8784 fi
    8785 RUBY=$ac_cv_path_RUBY
    8786 if test -n "$RUBY"; then
    8787   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
    8788 $as_echo "$RUBY" >&6; }
    8789 else
    8790   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8791 $as_echo "no" >&6; }
    8792 fi
    8793 
    8794 
    8795   else
    8796     # Extract the first word of "ruby", so it can be a program name with args.
    8797 set dummy ruby; ac_word=$2
    8798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8799 $as_echo_n "checking for $ac_word... " >&6; }
    8800 if ${ac_cv_path_RUBY+:} false; then :
    8801   $as_echo_n "(cached) " >&6
    8802 else
    8803   case $RUBY in
    8804   [\\/]* | ?:[\\/]*)
    8805   ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
    8806   ;;
    8807   *)
    8808   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8809 as_dummy="${with_ruby}/bin:${with_ruby}"
    8810 for as_dir in $as_dummy
    8811 do
    8812   IFS=$as_save_IFS
    8813   test -z "$as_dir" && as_dir=.
    8814     for ac_exec_ext in '' $ac_executable_extensions; do
    8815   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    8816     ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
    8817     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8818     break 2
    8819   fi
    8820 done
    8821   done
    8822 IFS=$as_save_IFS
    8823 
    8824   ;;
    8825 esac
    8826 fi
    8827 RUBY=$ac_cv_path_RUBY
    8828 if test -n "$RUBY"; then
    8829   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
    8830 $as_echo "$RUBY" >&6; }
    8831 else
    8832   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8833 $as_echo "no" >&6; }
    8834 fi
    8835 
    8836 
    8837   fi
    8838 fi
    8839 
    8840 RUBY_VERSION_RV=
    8841 RUBY_PLATFORM=
    8842 if test "x${RUBY}" != "x" ; then
    8843   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
    8844 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
    8845 if ${ac_cv_path_SED+:} false; then :
    8846   $as_echo_n "(cached) " >&6
    8847 else
    8848             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
    8849      for ac_i in 1 2 3 4 5 6 7; do
    8850        ac_script="$ac_script$as_nl$ac_script"
    8851      done
    8852      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
    8853      { ac_script=; unset ac_script;}
    8854      if test -z "$SED"; then
    8855   ac_path_SED_found=false
    8856   # Loop through the user's path and test for each of PROGNAME-LIST
    8857   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8858 for as_dir in $PATH
    8859 do
    8860   IFS=$as_save_IFS
    8861   test -z "$as_dir" && as_dir=.
    8862     for ac_prog in sed gsed; do
    8863     for ac_exec_ext in '' $ac_executable_extensions; do
    8864       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
    8865       as_fn_executable_p "$ac_path_SED" || continue
    8866 # Check for GNU ac_path_SED and select it if it is found.
    8867   # Check for GNU $ac_path_SED
    8868 case `"$ac_path_SED" --version 2>&1` in
    8869 *GNU*)
    8870   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
    8871 *)
    8872   ac_count=0
    8873   $as_echo_n 0123456789 >"conftest.in"
    8874   while :
    8875   do
    8876     cat "conftest.in" "conftest.in" >"conftest.tmp"
    8877     mv "conftest.tmp" "conftest.in"
    8878     cp "conftest.in" "conftest.nl"
    8879     $as_echo '' >> "conftest.nl"
    8880     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
    8881     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    8882     as_fn_arith $ac_count + 1 && ac_count=$as_val
    8883     if test $ac_count -gt ${ac_path_SED_max-0}; then
    8884       # Best one so far, save it but keep looking for a better one
    8885       ac_cv_path_SED="$ac_path_SED"
    8886       ac_path_SED_max=$ac_count
    8887     fi
    8888     # 10*(2^10) chars as input seems more than enough
    8889     test $ac_count -gt 10 && break
    8890   done
    8891   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
    8892 esac
    8893 
    8894       $ac_path_SED_found && break 3
    8895     done
    8896   done
    8897   done
    8898 IFS=$as_save_IFS
    8899   if test -z "$ac_cv_path_SED"; then
    8900     as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
    8901   fi
    8902 else
    8903   ac_cv_path_SED=$SED
    8904 fi
    8905 
    8906 fi
    8907 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
    8908 $as_echo "$ac_cv_path_SED" >&6; }
    8909  SED="$ac_cv_path_SED"
    8910   rm -f conftest.sed
    8911 
    8912 
    8913 
    8914 
    8915 
    8916     if test -n "$RUBY"; then :
    8917 
    8918         ax_ruby_version=""
    8919 
    8920         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby version" >&5
    8921 $as_echo_n "checking for ruby version... " >&6; }
    8922 
    8923         ruby_version=`$RUBY --version 2>&1 | $GREP "^ruby " | $SED -e 's/^.* \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'`
    8924 
    8925         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ruby_version" >&5
    8926 $as_echo "$ruby_version" >&6; }
    8927 
    8928         RUBY_VERSION=$ruby_version
    8929 
    8930 
    8931 
    8932   for ac_prog in gawk mawk nawk awk
    8933 do
    8934   # Extract the first word of "$ac_prog", so it can be a program name with args.
    8935 set dummy $ac_prog; ac_word=$2
    8936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8937 $as_echo_n "checking for $ac_word... " >&6; }
    8938 if ${ac_cv_prog_AWK+:} false; then :
    8939   $as_echo_n "(cached) " >&6
    8940 else
    8941   if test -n "$AWK"; then
    8942   ac_cv_prog_AWK="$AWK" # Let the user override the test.
    8943 else
    8944 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8945 for as_dir in $PATH
    8946 do
    8947   IFS=$as_save_IFS
    8948   test -z "$as_dir" && as_dir=.
    8949     for ac_exec_ext in '' $ac_executable_extensions; do
    8950   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    8951     ac_cv_prog_AWK="$ac_prog"
    8952     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8953     break 2
    8954   fi
    8955 done
    8956   done
    8957 IFS=$as_save_IFS
    8958 
    8959 fi
    8960 fi
    8961 AWK=$ac_cv_prog_AWK
    8962 if test -n "$AWK"; then
    8963   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
    8964 $as_echo "$AWK" >&6; }
    8965 else
    8966   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8967 $as_echo "no" >&6; }
    8968 fi
    8969 
    8970 
    8971   test -n "$AWK" && break
    8972 done
    8973 
    8974 
    8975   # Used to indicate true or false condition
    8976   ax_compare_version=false
    8977 
    8978   # Convert the two version strings to be compared into a format that
    8979   # allows a simple string comparison.  The end result is that a version
    8980   # string of the form 1.12.5-r617 will be converted to the form
    8981   # 0001001200050617.  In other words, each number is zero padded to four
    8982   # digits, and non digits are removed.
    8983 
    8984   ax_compare_version_A=`echo "$ax_ruby_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
    8985                      -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
    8986                      -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
    8987                      -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
    8988                      -e 's/[^0-9]//g'`
    8989 
    8990 
    8991   ax_compare_version_B=`echo "$ruby_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
    8992                      -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
    8993                      -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
    8994                      -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
    8995                      -e 's/[^0-9]//g'`
    8996 
    8997 
    8998     ax_compare_version=`echo "x$ax_compare_version_A
    8999 x$ax_compare_version_B" | sed 's/^ *//' | sort | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"`
    9000 
    9001 
    9002 
    9003     if test "$ax_compare_version" = "true" ; then
    9004 
    9005             :
    9006 
    9007 
    9008     else
    9009             :
    9010 
    9011 
    9012   fi
    9013 
    9014 
    9015 else
    9016 
    9017         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find the ruby interpreter" >&5
    9018 $as_echo "$as_me: WARNING: could not find the ruby interpreter" >&2;}
    9019 
    9020 
    9021 fi
    9022 
    9023   RUBY_VERSION_RV=`echo ${RUBY_VERSION} | cut -d'.' -f1-2`
    9024   RUBY_PLATFORM=`ruby -e 'puts RUBY_PLATFORM'`
    9025   ac_mkmf_result=`${RUBY} -r mkmf -e ";" 2>&1`
    9026   if test -z "$ac_mkmf_result"; then
    9027     HAVE_RUBY_DEVEL="yes"
    9028 
    9029     #
    9030     # Check for Ruby include path
    9031     #
    9032     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby include path" >&5
    9033 $as_echo_n "checking for Ruby include path... " >&6; }
    9034     if test -z "$RUBY_CPPFLAGS"; then
    9035         ruby_path=`$RUBY -rmkmf -e 'print Config::CONFIG["archdir"]'`
    9036         if test -n "${ruby_path}"; then
    9037                 ruby_path="-I$ruby_path"
    9038         fi
    9039         RUBY_CPPFLAGS=$ruby_path
    9040     fi
    9041     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CPPFLAGS" >&5
    9042 $as_echo "$RUBY_CPPFLAGS" >&6; }
    9043 
    9044 
    9045     #
    9046     # Check for Ruby library path
    9047     #
    9048     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby library path" >&5
    9049 $as_echo_n "checking for Ruby library path... " >&6; }
    9050     if test -z "$RUBY_LDFLAGS"; then
    9051         RUBY_LDFLAGS=`$RUBY -rmkmf -e 'print Config::CONFIG["LIBRUBYARG_SHARED"]'`
    9052     fi
    9053     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_LDFLAGS" >&5
    9054 $as_echo "$RUBY_LDFLAGS" >&6; }
    9055 
    9056 
    9057     #
    9058     # Check for site packages
    9059     #
    9060     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby site-packages path" >&5
    9061 $as_echo_n "checking for Ruby site-packages path... " >&6; }
    9062     if test -z "$RUBY_SITE_PKG"; then
    9063         RUBY_SITE_PKG=`$RUBY -rmkmf -e 'print Config::CONFIG["sitearchdir"]'`
    9064     fi
    9065     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_SITE_PKG" >&5
    9066 $as_echo "$RUBY_SITE_PKG" >&6; }
    9067 
    9068 
    9069     #
    9070     # libraries which must be linked in when embedding
    9071     #
    9072     { $as_echo "$as_me:${as_lineno-$LINENO}: checking ruby extra libraries" >&5
    9073 $as_echo_n "checking ruby extra libraries... " >&6; }
    9074     if test -z "$RUBY_EXTRA_LIBS"; then
    9075        RUBY_EXTRA_LIBS=`$RUBY -rmkmf -e 'print Config::CONFIG["SOLIBS"]'`
    9076     fi
    9077     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_EXTRA_LIBS" >&5
    9078 $as_echo "$RUBY_EXTRA_LIBS" >&6; }
    9079 
    9080 
    9081     #
    9082     # linking flags needed when embedding
    9083     # (is it even needed for Ruby?)
    9084     #
    9085     # AC_MSG_CHECKING(ruby extra linking flags)
    9086     # if test -z "$RUBY_EXTRA_LDFLAGS"; then
    9087     # RUBY_EXTRA_LDFLAGS=`$RUBY -rmkmf -e 'print Config::CONFIG[["LINKFORSHARED"]]'`
    9088     # fi
    9089     # AC_MSG_RESULT([$RUBY_EXTRA_LDFLAGS])
    9090     # AC_SUBST(RUBY_EXTRA_LDFLAGS)
    9091 
    9092     # this flags breaks ruby.h, and is sometimes defined by KDE m4 macros
    9093     CFLAGS="`echo "$CFLAGS" | sed -e 's/-std=iso9899:1990//g;'`"
    9094     #
    9095     # final check to see if everything compiles alright
    9096     #
    9097     { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of ruby development environment" >&5
    9098 $as_echo_n "checking consistency of all components of ruby development environment... " >&6; }
    9099     ac_ext=c
    9100 ac_cpp='$CPP $CPPFLAGS'
    9101 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    9102 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    9103 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    9104 
    9105     # save current global flags
    9106     ac_save_LIBS="$LIBS"
    9107     LIBS="$ac_save_LIBS $RUBY_LDFLAGS"
    9108     ac_save_CPPFLAGS="$CPPFLAGS"
    9109     CPPFLAGS="$ac_save_CPPFLAGS $RUBY_CPPFLAGS"
    9110     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    9111 /* end confdefs.h.  */
    9112 
    9113         #include <ruby.h>
    9114 
    9115 int
    9116 main ()
    9117 {
    9118 
    9119         ruby_init();
    9120 
    9121   ;
    9122   return 0;
    9123 }
    9124 _ACEOF
    9125 if ac_fn_c_try_link "$LINENO"; then :
    9126   rubyexists=yes
    9127 else
    9128   rubyexists=no
    9129 fi
    9130 rm -f core conftest.err conftest.$ac_objext \
    9131     conftest$ac_exeext conftest.$ac_ext
    9132 
    9133     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyexists" >&5
    9134 $as_echo "$rubyexists" >&6; }
    9135 
    9136     if test "$rubyexists" = "no"; then
    9137       HAVE_RUBY_DEVEL="no"
    9138     fi
    9139     ac_ext=cpp
    9140 ac_cpp='$CXXCPP $CPPFLAGS'
    9141 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    9142 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    9143 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    9144 
    9145     # turn back to default flags
    9146     CPPFLAGS="$ac_save_CPPFLAGS"
    9147     LIBS="$ac_save_LIBS"
    9148 
    9149     #
    9150     # all done!
    9151     #
    9152 
    9153   fi
    9154 fi
     9009
     9010
     9011if test x"${MINGW32}"x = xyesx; then
     9012
     9013RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%oldnames.lib%-lmoldname%"`
     9014RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%user32.lib%-luser32%"`
     9015RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%advapi32.lib%-ladvapi32%"`
     9016RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%ws2_32.lib%-lws2_32%"`
     9017RUBY_LIBRUBYARG=`echo ${RUBY_LIBRUBYARG} | sed -e "s%\(msvcrt-ruby.*\).lib%${RUBY_CONFIG_BINDIR}/\1.dll%"`
     9018RUBY_LIBRUBYARG_STATIC=`echo ${RUBY_LIBRUBYARG_STATIC} | sed -e "s%\(msvcrt-ruby.*\).lib%${RUBY_CONFIG_LIBDIR}/\1.lib%"`
     9019
     9020fi
     9021
    91559022
    91569023
     
    101299996
    101309997
    10131 
    101329998MAKE=${make_command}
    10133 
    10134 
    10135 
    101369999
    1013710000
     
    1079010653INSTALL='$INSTALL'
    1079110654MKDIR_P='$MKDIR_P'
    10792 AWK='$AWK'
    1079310655test -n "\$AWK" || AWK=awk
    1079410656_ACEOF
  • trunk/configure.in

    r3049 r3277  
    206206RP_LANG_JAVA
    207207RP_LANG_R
    208 
    209 RUBY=""
    210 RUBY_DEV_PKG="no"
    211 
    212 AC_ARG_WITH(
    213     [ruby],
    214     [AS_HELP_STRING([--with-ruby=DIR], [location of ruby @<:@default=yes@:>@])],
    215     [],
    216     [with_ruby="yes"])
    217 
    218 if test "${with_ruby}" != "no" ; then
    219   if test "${with_ruby}" = "yes" ; then
    220     AC_PATH_PROG(RUBY, ruby)
    221   else
    222     AC_PATH_PROG(RUBY, ruby, [], [${with_ruby}/bin:${with_ruby}])
    223   fi
    224 fi
    225 
    226 RUBY_VERSION_RV=
    227 RUBY_PLATFORM=
    228 if test "x${RUBY}" != "x" ; then
    229   AX_PROG_RUBY_VERSION
    230   RUBY_VERSION_RV=`echo ${RUBY_VERSION} | cut -d'.' -f1-2`
    231   RUBY_PLATFORM=`ruby -e 'puts RUBY_PLATFORM'`
    232   ac_mkmf_result=`${RUBY} -r mkmf -e ";" 2>&1`
    233   if test -z "$ac_mkmf_result"; then
    234     HAVE_RUBY_DEVEL="yes"
    235     AX_RUBY_DEV_FLAGS([${RUBY}])
    236   fi
    237 fi
    238 
     208RP_LANG_RUBY
    239209
    240210RP_BASE=`pwd`
     
    359329AC_SUBST(HAVE_FFMPEG_LIBS)
    360330AC_SUBST(HAVE_INTTYPES_H)
    361 AC_SUBST(HAVE_RUBY_DEVEL)
    362331AC_SUBST(INSTALL_PREFIX)
    363332AC_SUBST(JAVA)
     
    403372AC_SUBST(R)
    404373AC_SUBST(RP_BASE)
    405 AC_SUBST(RUBY)
    406 AC_SUBST(RUBY_PLATFORM)
    407 AC_SUBST(RUBY_VERSION_RV)
    408374AC_SUBST(SHLIB_CFLAGS)
    409375AC_SUBST(SHLIB_LD)
  • trunk/lang/Makefile.in

    r3065 r3277  
    1515CC              = @CC@
    1616CXX             = @CXX@
    17 RUBY            = @HAVE_RUBY_DEVEL@
     17RUBY_CPPFLAGS   = @RUBY_CPPFLAGS@
    1818PERL            = @PERL@
    1919TCLSH           = @TCLSH@
     
    3333  LANGS += python
    3434endif
    35 ifeq ($(RUBY),yes)
     35ifneq ($(RUBY_CPP_FLAGS),)
    3636  LANGS += ruby
    3737endif
  • trunk/lang/ruby/Makefile.in

    r1944 r3277  
    1414
    1515
    16 HAVE_RUBY_DEVEL = @HAVE_RUBY_DEVEL@
    1716RUBY            = @RUBY@
    18 RUBY_VERSION    = @RUBY_VERSION@
    1917RUBY_CPPFLAGS   = @RUBY_CPPFLAGS@
    20 RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
    2118RUBY_LDFLAGS    = @RUBY_LDFLAGS@
    22 RUBY_SITE_PKG   = @RUBY_SITE_PKG@
    23 RUBY_VERSION_RV = @RUBY_VERSION_RV@
    24 RUBY_PLATFORM   = @RUBY_PLATFORM@
     19RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
    2520destdir         = $(libdir)/ruby
    2621rubydir         = $$RAPPTURE_INSTALL_DIR/lib/ruby
     
    3328SHLIB_LD        = @SHLIB_LD@
    3429SHLIB_CFLAGS    = @SHLIB_CFLAGS@
    35 SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@ $(RUBY_LDFLAGS)
     30SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@
    3631SHLIB_SUFFIX    = @SHLIB_SUFFIX@
    3732CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
     
    5550LIBS            = \
    5651                -L../../src/core -lrappture \
    57                 $(RUBY_LDFLAGS)
     52                $(RUBY_LIBRUBYARG)
    5853
    5954CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    6964$(lib): $(OBJS)
    7065        $(SHLIB_LD) $(SHLIB_LDFLAGS) -o $@ $(OBJS) \
    71                 $(LIB_SEARCH_DIRS) $(LIBS)
     66                $(LIB_SEARCH_DIRS) $(LIBS) 
    7267install: $(lib)
    7368        $(MKDIR_P) -m 0755 $(destdir)
  • trunk/src/core/config.h.in

    r3276 r3277  
    7070#undef HAVE_CTYPE_H
    7171
     72/* Define to 1 if you have the <env.h> header file. */
     73#undef HAVE_ENV_H
     74
    7275/* Define to 1 if you have the <errno.h> header file. */
    7376#undef HAVE_ERRNO_H
     
    154157#undef HAVE_NCURSES_H
    155158
     159/* Define to 1 if you have the <node.h> header file. */
     160#undef HAVE_NODE_H
     161
    156162/* Define to 1 if you have the <Python.h> header file. */
    157163#undef HAVE_PYTHON_H
    158164
     165/* Define to 1 if you have the <ruby.h> header file. */
     166#undef HAVE_RUBY_H
     167
     168/* Define to 1 if you have the <ruby/node.h> header file. */
     169#undef HAVE_RUBY_NODE_H
     170
    159171/* Define to 1 if you have the <sstream> header file. */
    160172#undef HAVE_SSTREAM
     
    208220#undef HAVE_VECTOR
    209221
     222/* Define to 1 if you have the <version.h> header file. */
     223#undef HAVE_VERSION_H
     224
    210225/* Define to the address where bug reports for this package should be sent. */
    211226#undef PACKAGE_BUGREPORT
     
    225240/* Define to the version of this package. */
    226241#undef PACKAGE_VERSION
     242
     243/* Define this macro to use ruby/node.h */
     244#undef REALLY_HAVE_RUBY_NODE_H
    227245
    228246/* The size of `int', as computed by sizeof. */
Note: See TracChangeset for help on using the changeset viewer.