Changeset 3305 for branches/nanovis2/configure.in

Timestamp:

Feb 18, 2013 2:32:14 PM (11 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• configure.in (modified) (3 diffs)

branches/nanovis2/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)