Changeset 3603 for trunk

Timestamp:

Apr 1, 2013, 2:31:06 PM (11 years ago)

Author:

gah

Message:

put back new ruby configure test

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• lang/Makefile.in (modified) (1 diff)

trunk/configure.in

@@ -207 +207 @@
 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`

trunk/lang/Makefile.in

@@ -34 +34 @@
   LANGS += python
 endif
-ifeq ($(RUBY),yes)
+ifneq ($(RUBY),)
   ifeq ($(HAVE_RUBY_H),yes)
     LANGS += ruby