Changeset 5803 for branches/r9/lang/cf/rpLangRuby.m4

Timestamp:

Aug 12, 2015 11:45:04 AM (9 years ago)

Author:

gah

Message:

test me

File:

• branches/r9/lang/cf/rpLangRuby.m4 (modified) (4 diffs)

branches/r9/lang/cf/rpLangRuby.m4

@@ -16 +16 @@
      --with-ruby-sitelibdir=PATH,
      [ path to install ruby scripts [[auto-detect]] ]),
-    [ ruby_sitelibdir=$withval ],
-    [ ruby_sitelibdir=NONE ])
+    [WITH_RUBY_SITELIBDIR=$withval],
+    [WITH_RUBY_SITELIBDIR=""])
 
 echo RUBY=$WITH_RUBY
@@ -34 +34 @@
 AC_SUBST(RUBY)
 
-AC_DEFUN([RUBY_CONFIG], [
-          $RUBY -rrbconfig -e "puts(Config::CONFIG[['$1']] || '')"])
+. ${srcdir}/cf/rp_ruby_functions.sh
+
+#AC_DEFUN([RUBY_CONFIG], [
+# $RUBY -rrbconfig -e "puts(RbConfig::CONFIG[['$1']])"])
 
 RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
 AC_SUBST(RUBY_VERSION_CODE)
 
-RUBY_CONFIG_SO_NAME=`RUBY_CONFIG(RUBY_SO_NAME)`
-RUBY_CONFIG_ARCHDIR=`RUBY_CONFIG(archdir)`
-RUBY_CONFIG_ARCH=`RUBY_CONFIG(arch)`
-RUBY_CONFIG_LIBDIR=`RUBY_CONFIG(libdir)`
-RUBY_CONFIG_BINDIR=`RUBY_CONFIG(bindir)`
-RUBY_CONFIG_RUBYHDRDIR=`RUBY_CONFIG(rubyhdrdir)`
-RUBY_CONFIG_CFLAGS=`RUBY_CONFIG(CFLAGS)`
-RUBY_CONFIG_LIBS=`RUBY_CONFIG(LIBS)`
-RUBY_CONFIG_DLDLIBS=`RUBY_CONFIG(DLDLIBS)`
-RUBY_CONFIG_LDFLAGS=`RUBY_CONFIG(LDFLAGS)`
-RUBY_CONFIG_LIBRUBYARG=`RUBY_CONFIG(LIBRUBYARG)`
-RUBY_CONFIG_LIBRUBYARG_STATIC=`RUBY_CONFIG(LIBRUBYARG_STATIC)`
-RUBY_CONFIG_CCDLFLAGS=`RUBY_CONFIG(CCDLFLAGS)`
+RUBY_VERSION=`ruby_get_config_param "ruby_version"`
+RUBY_CONFIG_ARCHDIR=`ruby_get_config_param "archdir"`
+RUBY_CONFIG_ARCH=`ruby_get_config_param "arch"`
+RUBY_CONFIG_LIBDIR=`ruby_get_config_param "libdir"`
+RUBY_CONFIG_BINDIR=`ruby_get_config_param "bindir"`
+RUBY_CONFIG_RUBYHDRDIR=`ruby_get_config_param rubyhdrdir`
+RUBY_CONFIG_CFLAGS=`ruby_get_config_param CFLAGS`
+RUBY_CONFIG_LIBS=`ruby_get_config_param LIBS`
+RUBY_CONFIG_DLDLIBS=`ruby_get_config_param DLDLIBS`
+RUBY_CONFIG_LDFLAGS=`ruby_get_config_param LDFLAGS`
+RUBY_CONFIG_SITELIBDIR=`ruby_get_config_param sitelibdir`
+RUBY_CONFIG_LIBRUBYARG=`ruby_get_config_param LIBRUBYARG`
+RUBY_CONFIG_LIBRUBYARG_STATIC=`ruby_get_config_param "LIBRUBYARG_STATIC"`
+RUBY_CONFIG_CCDLFLAGS=`ruby_get_config_param "CCDLFLAGS"`
+echo RUBY_CONFIG_ARCHDIR=$RUBY_CONFIG_ARCHDIR
+echo RUBY_CONFIG_ARCH=$RUBY_CONFIG_ARCH
+echo RUBY_CONFIG_LIBDIR=$RUBY_CONFIG_LIBDIR
+echo RUBY_CONFIG_BINDIR=$RUBY_CONFIG_BINDIR
+echo RUBY_CONFIG_RUBYHDRDIR=$RUBY_CONFIG_RUBYHDRDIR
+echo RUBY_CONFIG_CFLAGS=$RUBY_CONFIG_CFLAGS
+echo RUBY_CONFIG_LDFLAGS=$RUBY_CONFIG_LDFLAGS
+echo RUBY_CONFIG_SITELIBDIR=$RUBY_CONFIG_SITELIBDIR
+echo RUBY_VERSION=$RUBY_VERSION
 
-if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
+if test "x${RUBY_CONFIG_RUBYHDRDIR}" != "x"; then
   # 1.9
   RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
   RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
+  echo RUBY_CPPFLAGS=$RUBY_CPPFLAGS"
 else
   # 1.8
   RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
+  echo "RUBY_CPPFLAGS=$RUBY_CPPFLAGS"
 fi
 AC_SUBST(RUBY_CPPFLAGS)
@@ -82 +96 @@
 AC_SUBST(RUBY_LIBRUBYARG_STATIC)
 
-dnl If the user specified a prefix, then use it, otherwise defalut to
-dnl the configured sitelibdir
-if test "x${ruby_sitelibdir}x" != "xNONEx"
-then
-  RUBY_SITELIBDIR="${ruby_sitelibdir}"
-else
-  if test "x${prefix}x" = "xNONEx"
-  then
-    RUBY_SITELIBDIR=`RUBY_CONFIG(sitelibdir)`
-  else
-    sitelibdir_no_prefix=`$RUBY -rrbconfig \
-    -e "include Config; \
-    puts CONFIG[['sitelibdir']].sub(CONFIG[['prefix']], '')"`
-    RUBY_SITELIBDIR="${prefix}/${sitelibdir_no_prefix}"
-  fi
-fi
-AC_SUBST(RUBY_SITELIBDIR)
-
 dnl The fourth parameter to AC_CHECK_HEADER keeps autoconf from
 dnl searching for standard header files as a side-effect (which we want)
 CPPFLAGS_save="${CPPFLAGS}"
-CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
-CXXFLAGS="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS} -I${RUBY_HEADER_DIR}"
+echo CPPFLAGS=$CPPFLAGS
 AC_CHECK_HEADERS(ruby.h)
 HAVE_RUBY_H=${ac_cv_header_ruby_h}
@@ -129 +125 @@
 AC_MINGW32
 
-if test x"${MINGW32}"x = xyesx; then
+if test "${MINGW32}" = yes; then
   RB_FIX_MINGW_LIBS
 fi