Changeset 3277

Timestamp:

Feb 4, 2013 1:07:03 PM (11 years ago)

Author:

gah

Message:

fixes for 1.9 ruby build

Location:

trunk

Files:

• aclocal.m4 (modified) (1 diff)
• cf/config.guess (added)
• cf/config.sub (added)
• cf/rpLangRuby.m4 (added)
• configure (modified) (9 diffs)
• configure.in (modified) (3 diffs)
• lang/Makefile.in (modified) (2 diffs)
• lang/ruby/Makefile.in (modified) (4 diffs)
• src/core/config.h.in (modified) (4 diffs)

trunk/aclocal.m4

@@ -9 +9 @@
 builtin(include,./cf/rpLangMatlab.m4)
 builtin(include,./cf/rpLangR.m4)
+builtin(include,./cf/rpLangRuby.m4)

trunk/configure

@@ -645 +645 @@
 SIZEOF_INT
 SHLIB_LDFLAGS
-RUBY_VERSION_RV
-RUBY_PLATFORM
 RP_BASE
 PYTHON_VERSION
@@ -680 +678 @@
 JAVA_HOME
 INSTALL_PREFIX
-HAVE_RUBY_DEVEL
 HAVE_INTTYPES_H
 HAVE_FFMPEG_LIBS
@@ -686 +683 @@
 LDFLAGS_DEFAULT
 CFLAGS_DEFAULT
-RUBY_EXTRA_LIBS
-RUBY_SITE_PKG
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+RUBY_SITELIBDIR
+RUBY_LIBRUBYARG_STATIC
+RUBY_LIBRUBYARG
+RUBY_LIBS
 RUBY_LDFLAGS
+RUBY_CXXFLAGS
+RUBY_CFLAGS
 RUBY_CPPFLAGS
-AWK
-RUBY_VERSION
-SED
+RUBY_VERSION_CODE
 RUBY
 R
@@ -816 +823 @@
 with_R
 with_ruby
+with_ruby_sitelibdir
 enable_shared
 enable_symbols
@@ -1430 +1438 @@
 
   cat <<\_ACEOF
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
@@ -1468 +1480 @@
   --with-java=DIR         location of java [default=yes]
   --with-R=DIR            location of R interpreter [default=yes]
-  --with-ruby=DIR         location of ruby [default=yes]
+  --with-ruby=PATH        path to the ruby interpreter [[ruby]]
+  --with-ruby-sitelibdir=PATH
+                          path to install ruby scripts [[auto-detect]]
 
 Some influential environment variables:
@@ -8738 +8752 @@
 
 
-
-RUBY=""
-RUBY_DEV_PKG="no"
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
 
 
 # Check whether --with-ruby was given.
 if test "${with_ruby+set}" = set; then :
-  withval=$with_ruby;
-else
-  with_ruby="yes"
-fi
-
-
-if test "${with_ruby}" != "no" ; then
-  if test "${with_ruby}" = "yes" ; then
-    # Extract the first word of "ruby", so it can be a program name with args.
-set dummy ruby; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RUBY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $RUBY in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  withval=$with_ruby;  RUBY=$withval
+else
+   RUBY=ruby
+fi
+
+
+# Check whether --with-ruby_sitelibdir was given.
+if test "${with_ruby_sitelibdir+set}" = set; then :
+  withval=$with_ruby_sitelibdir;  ruby_sitelibdir=$withval
+else
+   ruby_sitelibdir=NONE
+fi
+
+
+
+
+RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
+
+
+RUBY_CONFIG_SO_NAME=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['RUBY_SO_NAME'] || '')"`
+RUBY_CONFIG_ARCHDIR=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['archdir'] || '')"`
+RUBY_CONFIG_ARCH=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['arch'] || '')"`
+RUBY_CONFIG_LIBDIR=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['libdir'] || '')"`
+RUBY_CONFIG_BINDIR=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['bindir'] || '')"`
+RUBY_CONFIG_RUBYHDRDIR=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['rubyhdrdir'] || '')"`
+RUBY_CONFIG_CFLAGS=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['CFLAGS'] || '')"`
+RUBY_CONFIG_LIBS=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBS'] || '')"`
+RUBY_CONFIG_DLDLIBS=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['DLDLIBS'] || '')"`
+RUBY_CONFIG_LDFLAGS=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['LDFLAGS'] || '')"`
+RUBY_CONFIG_LIBRUBYARG=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG'] || '')"`
+RUBY_CONFIG_LIBRUBYARG_STATIC=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['LIBRUBYARG_STATIC'] || '')"`
+RUBY_CONFIG_CCDLFLAGS=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['CCDLFLAGS'] || '')"`
+
+if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
+  # 1.9
+  RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
+  RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
+else
+  # 1.8
+  RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
+fi
+
+
+RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
+
+
+RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
+
+
+RUBY_LDFLAGS="-L${RUBY_CONFIG_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_CONFIG_LDFLAGS}"
+
+
+RUBY_LIBS="${RUBY_CONFIG_LIBS} ${RUBY_CONFIG_DLDLIBS}"
+
+
+RUBY_LIBRUBYARG="${RUBY_CONFIG_LIBRUBYARG}"
+
+
+RUBY_LIBRUBYARG_STATIC="${RUBY_CONFIG_LIBRUBYARG_STATIC}"
+
+
+if test "x${ruby_sitelibdir}x" != "xNONEx"
+then
+  RUBY_SITELIBDIR="${ruby_sitelibdir}"
+else
+  if test "x${prefix}x" = "xNONEx"
+  then
+    RUBY_SITELIBDIR=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['sitelibdir'] || '')"`
+  else
+    sitelibdir_no_prefix=`$RUBY -rrbconfig \
+    -e "include Config; \
+    puts CONFIG['sitelibdir'].sub(CONFIG['prefix'], '')"`
+    RUBY_SITELIBDIR="${prefix}/${sitelibdir_no_prefix}"
   fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
+fi
+
+
+CPPFLAGS_save="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
+CXXFLAGS="${CPPFLAGS}"
+for ac_header in ruby.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "ruby.h" "ac_cv_header_ruby_h" "
+"
+if test "x$ac_cv_header_ruby_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RUBY_H 1
+_ACEOF
+
+else
+  as_fn_error $? "could not find ruby.h (check config.log)" "$LINENO" 5
+fi
+
+done
+
+for ac_header in node.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "node.h" "ac_cv_header_node_h" "
+#include <ruby.h>
+
+"
+if test "x$ac_cv_header_node_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NODE_H 1
+_ACEOF
+
+fi
+
+done
+
+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>
+
+"
+if test "x$ac_cv_header_ruby_node_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RUBY_NODE_H 1
+_ACEOF
+
+$as_echo "#define REALLY_HAVE_RUBY_NODE_H /**/" >>confdefs.h
+
+fi
+
+done
+
+for ac_header in version.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "version.h" "ac_cv_header_version_h" "
+#include <ruby.h>
+
+"
+if test "x$ac_cv_header_version_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VERSION_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in env.h
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "env.h" "ac_cv_header_env_h" "
+#include <ruby.h>
+
+"
+if test "x$ac_cv_header_env_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ENV_H 1
+_ACEOF
+
+fi
+
+done
+
+
+CPPFLAGS="${CPPFLAGS_save}"
+
+
+case $host_os in
+  *mingw32* ) MINGW32=yes;;
+          * ) MINGW32=no;;
 esac
-fi
-RUBY=$ac_cv_path_RUBY
-if test -n "$RUBY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
-$as_echo "$RUBY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    # Extract the first word of "ruby", so it can be a program name with args.
-set dummy ruby; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RUBY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $RUBY in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RUBY="$RUBY" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_ruby}/bin:${with_ruby}"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-RUBY=$ac_cv_path_RUBY
-if test -n "$RUBY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
-$as_echo "$RUBY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-
-RUBY_VERSION_RV=
-RUBY_PLATFORM=
-if test "x${RUBY}" != "x" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-
-
-
-
-    if test -n "$RUBY"; then :
-
-        ax_ruby_version=""
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby version" >&5
-$as_echo_n "checking for ruby version... " >&6; }
-
-        ruby_version=`$RUBY --version 2>&1 | $GREP "^ruby " | $SED -e 's/^.* \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'`
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ruby_version" >&5
-$as_echo "$ruby_version" >&6; }
-
-        RUBY_VERSION=$ruby_version
-
-
-
-  for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-  # Used to indicate true or false condition
-  ax_compare_version=false
-
-  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-
-  ax_compare_version_A=`echo "$ax_ruby_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
-                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/[^0-9]//g'`
-
-
-  ax_compare_version_B=`echo "$ruby_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
-                     -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
-                     -e 's/[^0-9]//g'`
-
-
-    ax_compare_version=`echo "x$ax_compare_version_A
-x$ax_compare_version_B" | sed 's/^ *//' | sort | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"`
-
-
-
-    if test "$ax_compare_version" = "true" ; then
-
-            :
-
-
-    else
-            :
-
-
-  fi
-
-
-else
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find the ruby interpreter" >&5
-$as_echo "$as_me: WARNING: could not find the ruby interpreter" >&2;}
-
-
-fi
-
-  RUBY_VERSION_RV=`echo ${RUBY_VERSION} | cut -d'.' -f1-2`
-  RUBY_PLATFORM=`ruby -e 'puts RUBY_PLATFORM'`
-  ac_mkmf_result=`${RUBY} -r mkmf -e ";" 2>&1`
-  if test -z "$ac_mkmf_result"; then
-    HAVE_RUBY_DEVEL="yes"
-
-    #
-    # Check for Ruby include path
-    #
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby include path" >&5
-$as_echo_n "checking for Ruby include path... " >&6; }
-    if test -z "$RUBY_CPPFLAGS"; then
-        ruby_path=`$RUBY -rmkmf -e 'print Config::CONFIG["archdir"]'`
-        if test -n "${ruby_path}"; then
-                ruby_path="-I$ruby_path"
-        fi
-        RUBY_CPPFLAGS=$ruby_path
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CPPFLAGS" >&5
-$as_echo "$RUBY_CPPFLAGS" >&6; }
-
-
-    #
-    # Check for Ruby library path
-    #
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby library path" >&5
-$as_echo_n "checking for Ruby library path... " >&6; }
-    if test -z "$RUBY_LDFLAGS"; then
-        RUBY_LDFLAGS=`$RUBY -rmkmf -e 'print Config::CONFIG["LIBRUBYARG_SHARED"]'`
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_LDFLAGS" >&5
-$as_echo "$RUBY_LDFLAGS" >&6; }
-
-
-    #
-    # Check for site packages
-    #
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ruby site-packages path" >&5
-$as_echo_n "checking for Ruby site-packages path... " >&6; }
-    if test -z "$RUBY_SITE_PKG"; then
-        RUBY_SITE_PKG=`$RUBY -rmkmf -e 'print Config::CONFIG["sitearchdir"]'`
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_SITE_PKG" >&5
-$as_echo "$RUBY_SITE_PKG" >&6; }
-
-
-    #
-    # libraries which must be linked in when embedding
-    #
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking ruby extra libraries" >&5
-$as_echo_n "checking ruby extra libraries... " >&6; }
-    if test -z "$RUBY_EXTRA_LIBS"; then
-       RUBY_EXTRA_LIBS=`$RUBY -rmkmf -e 'print Config::CONFIG["SOLIBS"]'`
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_EXTRA_LIBS" >&5
-$as_echo "$RUBY_EXTRA_LIBS" >&6; }
-
-
-    #
-    # linking flags needed when embedding
-    # (is it even needed for Ruby?)
-    #
-    # AC_MSG_CHECKING(ruby extra linking flags)
-    # if test -z "$RUBY_EXTRA_LDFLAGS"; then
-    # RUBY_EXTRA_LDFLAGS=`$RUBY -rmkmf -e 'print Config::CONFIG[["LINKFORSHARED"]]'`
-    # fi
-    # AC_MSG_RESULT([$RUBY_EXTRA_LDFLAGS])
-    # AC_SUBST(RUBY_EXTRA_LDFLAGS)
-
-    # this flags breaks ruby.h, and is sometimes defined by KDE m4 macros
-    CFLAGS="`echo "$CFLAGS" | sed -e 's/-std=iso9899:1990//g;'`"
-    #
-    # final check to see if everything compiles alright
-    #
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of ruby development environment" >&5
-$as_echo_n "checking consistency of all components of ruby development environment... " >&6; }
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    # save current global flags
-    ac_save_LIBS="$LIBS"
-    LIBS="$ac_save_LIBS $RUBY_LDFLAGS"
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$ac_save_CPPFLAGS $RUBY_CPPFLAGS"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-        #include <ruby.h>
-
-int
-main ()
-{
-
-        ruby_init();
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  rubyexists=yes
-else
-  rubyexists=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyexists" >&5
-$as_echo "$rubyexists" >&6; }
-
-    if test "$rubyexists" = "no"; then
-      HAVE_RUBY_DEVEL="no"
-    fi
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    # turn back to default flags
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIBS="$ac_save_LIBS"
-
-    #
-    # all done!
-    #
-
-  fi
-fi
+
+
+if test x"${MINGW32}"x = xyesx; then
+
+RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%oldnames.lib%-lmoldname%"`
+RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%user32.lib%-luser32%"`
+RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%advapi32.lib%-ladvapi32%"`
+RUBY_LIBS=`echo ${RUBY_LIBS} | sed -e "s%ws2_32.lib%-lws2_32%"`
+RUBY_LIBRUBYARG=`echo ${RUBY_LIBRUBYARG} | sed -e "s%\(msvcrt-ruby.*\).lib%${RUBY_CONFIG_BINDIR}/\1.dll%"`
+RUBY_LIBRUBYARG_STATIC=`echo ${RUBY_LIBRUBYARG_STATIC} | sed -e "s%\(msvcrt-ruby.*\).lib%${RUBY_CONFIG_LIBDIR}/\1.lib%"`
+
+fi
+
 
 
@@ -10129 +9996 @@
 
 
-
 MAKE=${make_command}
-
-
-
 
 
@@ -10790 +10653 @@
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
-AWK='$AWK'
 test -n "\$AWK" || AWK=awk
 _ACEOF

trunk/configure.in

@@ -206 +206 @@
 RP_LANG_JAVA
 RP_LANG_R
-
-RUBY=""
-RUBY_DEV_PKG="no"
-
-AC_ARG_WITH(
-    [ruby],
-    [AS_HELP_STRING([--with-ruby=DIR], [location of ruby @<:@default=yes@:>@])],
-    [],
-    [with_ruby="yes"])
-
-if test "${with_ruby}" != "no" ; then
-  if test "${with_ruby}" = "yes" ; then
-    AC_PATH_PROG(RUBY, ruby)
-  else
-    AC_PATH_PROG(RUBY, ruby, [], [${with_ruby}/bin:${with_ruby}])
-  fi
-fi
-
-RUBY_VERSION_RV=
-RUBY_PLATFORM=
-if test "x${RUBY}" != "x" ; then
-  AX_PROG_RUBY_VERSION
-  RUBY_VERSION_RV=`echo ${RUBY_VERSION} | cut -d'.' -f1-2`
-  RUBY_PLATFORM=`ruby -e 'puts RUBY_PLATFORM'`
-  ac_mkmf_result=`${RUBY} -r mkmf -e ";" 2>&1`
-  if test -z "$ac_mkmf_result"; then
-    HAVE_RUBY_DEVEL="yes"
-    AX_RUBY_DEV_FLAGS([${RUBY}])
-  fi
-fi
-
+RP_LANG_RUBY
 
 RP_BASE=`pwd`
@@ -359 +329 @@
 AC_SUBST(HAVE_FFMPEG_LIBS)
 AC_SUBST(HAVE_INTTYPES_H)
-AC_SUBST(HAVE_RUBY_DEVEL)
 AC_SUBST(INSTALL_PREFIX)
 AC_SUBST(JAVA)
@@ -403 +372 @@
 AC_SUBST(R)
 AC_SUBST(RP_BASE)
-AC_SUBST(RUBY)
-AC_SUBST(RUBY_PLATFORM)
-AC_SUBST(RUBY_VERSION_RV)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LD)

trunk/lang/Makefile.in

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

trunk/lang/ruby/Makefile.in

@@ -14 +14 @@
 
 
-HAVE_RUBY_DEVEL = @HAVE_RUBY_DEVEL@
 RUBY            = @RUBY@
-RUBY_VERSION    = @RUBY_VERSION@
 RUBY_CPPFLAGS   = @RUBY_CPPFLAGS@
-RUBY_EXTRA_LIBS = @RUBY_EXTRA_LIBS@
 RUBY_LDFLAGS    = @RUBY_LDFLAGS@
-RUBY_SITE_PKG   = @RUBY_SITE_PKG@
-RUBY_VERSION_RV = @RUBY_VERSION_RV@
-RUBY_PLATFORM   = @RUBY_PLATFORM@
+RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
 destdir         = $(libdir)/ruby
 rubydir         = $$RAPPTURE_INSTALL_DIR/lib/ruby
@@ -33 +28 @@
 SHLIB_LD        = @SHLIB_LD@
 SHLIB_CFLAGS    = @SHLIB_CFLAGS@ 
-SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@ $(RUBY_LDFLAGS)
+SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@ 
 SHLIB_SUFFIX    = @SHLIB_SUFFIX@
 CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
@@ -55 +50 @@
 LIBS            = \
                 -L../../src/core -lrappture \
-                $(RUBY_LDFLAGS)
+                $(RUBY_LIBRUBYARG)
 
 CXX_SWITCHES    = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
@@ -69 +64 @@
 $(lib): $(OBJS)
         $(SHLIB_LD) $(SHLIB_LDFLAGS) -o $@ $(OBJS) \
-                $(LIB_SEARCH_DIRS) $(LIBS)
+                $(LIB_SEARCH_DIRS) $(LIBS) 
 install: $(lib) 
         $(MKDIR_P) -m 0755 $(destdir)

trunk/src/core/config.h.in

@@ -70 +70 @@
 #undef HAVE_CTYPE_H
 
+/* Define to 1 if you have the <env.h> header file. */
+#undef HAVE_ENV_H
+
 /* Define to 1 if you have the <errno.h> header file. */
 #undef HAVE_ERRNO_H
@@ -154 +157 @@
 #undef HAVE_NCURSES_H
 
+/* Define to 1 if you have the <node.h> header file. */
+#undef HAVE_NODE_H
+
 /* Define to 1 if you have the <Python.h> header file. */
 #undef HAVE_PYTHON_H
 
+/* Define to 1 if you have the <ruby.h> header file. */
+#undef HAVE_RUBY_H
+
+/* Define to 1 if you have the <ruby/node.h> header file. */
+#undef HAVE_RUBY_NODE_H
+
 /* Define to 1 if you have the <sstream> header file. */
 #undef HAVE_SSTREAM
@@ -208 +220 @@
 #undef HAVE_VECTOR
 
+/* Define to 1 if you have the <version.h> header file. */
+#undef HAVE_VERSION_H
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
@@ -225 +240 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* Define this macro to use ruby/node.h */
+#undef REALLY_HAVE_RUBY_NODE_H
 
 /* The size of `int', as computed by sizeof. */