rice 1.0.2 → 1.1.0

data/COPYING

@@ -1,5 +1,5 @@
-Rice 1.0
-Copyright (C) 2007 Paul Brannan <pbrannan@atdesk.com>
+Rice 1.1
+Copyright (C) 2009 Paul Brannan <pbrannan@atdesk.com>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/Doxyfile

@@ -23,7 +23,7 @@ PROJECT_NAME           = Rice
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.0
+PROJECT_NUMBER         = 1.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

data/Makefile.in

@@ -63,8 +63,9 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/doxygen.am \
-	$(top_srcdir)/configure COPYING config.guess config.sub \
-	depcomp install-sh missing
+	$(top_srcdir)/configure \
+	$(top_srcdir)/rice/detail/ruby_version_code.hpp.in COPYING \
+	config.guess config.sub depcomp install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
@@ -75,7 +76,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/rice/config.hpp
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = rice/detail/ruby_version_code.hpp
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -164,6 +165,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
 RICE_CPPFLAGS = @RICE_CPPFLAGS@
 RICE_LDFLAGS = @RICE_LDFLAGS@
+RICE_ROOT = @RICE_ROOT@
 RICE_SAMPLES = @RICE_SAMPLES@
 RICE_USING_MINGW32 = @RICE_USING_MINGW32@
 RUBY = @RUBY@
@@ -175,6 +177,7 @@ RUBY_LIBRUBYARG = @RUBY_LIBRUBYARG@
 RUBY_LIBRUBYARG_STATIC = @RUBY_LIBRUBYARG_STATIC@
 RUBY_LIBS = @RUBY_LIBS@
 RUBY_SITELIBDIR = @RUBY_SITELIBDIR@
+RUBY_VERSION_CODE = @RUBY_VERSION_CODE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -303,6 +306,8 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+rice/detail/ruby_version_code.hpp: $(top_builddir)/config.status $(top_srcdir)/rice/detail/ruby_version_code.hpp.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.

data/Rakefile

@@ -2,9 +2,9 @@ require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
 require 'yaml'
 require 'rubyforge'
+require 'ruby/lib/version'
 
 PROJECT_NAME = "rice"
-RICE_VERSION = "1.0.2"
 PROJECT_WEB_PATH = "/var/www/gforge-projects/rice"
 
 task :default => :test
@@ -51,7 +51,7 @@ task :release => :package do
   puts "Logging into rubyforge"
   rf.login
 
-  pkg = "pkg/#{PROJECT_NAME}-#{RICE_VERSION}"
+  pkg = "pkg/#{PROJECT_NAME}-#{Rice::VERSION}"
 
   c = rf.userconfig
 
@@ -61,7 +61,7 @@ task :release => :package do
     "#{pkg}.gem"
   ]
 
-  puts "Releasing #{PROJECT_NAME} v. #{RICE_VERSION}"
+  puts "Releasing #{PROJECT_NAME} v. #{Rice::VERSION}"
   begin
     rf.add_release $spec.rubyforge_project, PROJECT_NAME, RICE_VERSION, *files
   rescue => ex

data/config.guess

@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-	eval $set_cc_for_build
-	cat << EOF > $dummy.c
-	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
-	LIBC=uclibc
-	# endif
-	#else
-	LIBC=gnu
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -857,31 +840,31 @@ EOF
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-${LIBC}
+    	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -904,7 +887,7 @@ EOF
 		s: ::g
 		p
 	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -927,16 +910,16 @@ EOF
 		s: ::g
 		p
 	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo or32-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -949,40 +932,40 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -997,22 +980,20 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 		exit ;;
 	esac
-	# This should get integrated into the C code below, but now we hack
-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c

data/config.sub

@@ -244,7 +244,7 @@ case $basic_machine in
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx | dvp \
+	| d10v | d30v | dlx | dsp16xx \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
@@ -277,7 +277,7 @@ case $basic_machine in
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -358,7 +358,7 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
@@ -714,24 +714,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsEE* | ee | ps2)
-		basic_machine=mips64r5900el-scei
-		case $os in
-		    -linux*)
-			;;
-		    *)
-			os=-elf
-			;;
-		esac
-		;;
-	iop)
-		basic_machine=mipsel-scei
-		os=-irx
-		;;
-	dvp)
-		basic_machine=dvp-scei
-		os=-elf
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -1276,7 +1258,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)

data/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for rice 1.0.
+# Generated by GNU Autoconf 2.61 for rice 1.1.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='rice'
 PACKAGE_TARNAME='rice'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='rice 1.0'
+PACKAGE_VERSION='1.1'
+PACKAGE_STRING='rice 1.1'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="rice"
@@ -665,6 +665,7 @@ host_vendor
 host_os
 RICE_USING_MINGW32
 RUBY
+RUBY_VERSION_CODE
 RUBY_CPPFLAGS
 RUBY_CFLAGS
 RUBY_CXXFLAGS
@@ -679,68 +680,48 @@ DX_DOCDIR
 DX_ENV
 DX_FLAG_doc
 DX_DOXYGEN
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_PERL
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_doc_TRUE
 DX_COND_doc_FALSE
 DX_FLAG_dot
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_DOT
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_dot_TRUE
 DX_COND_dot_FALSE
 DX_FLAG_man
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_man_TRUE
 DX_COND_man_FALSE
 DX_FLAG_rtf
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_rtf_TRUE
 DX_COND_rtf_FALSE
 DX_FLAG_xml
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_xml_TRUE
 DX_COND_xml_FALSE
 DX_FLAG_chm
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_HHC
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_chm_TRUE
 DX_COND_chm_FALSE
 DX_FLAG_chi
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_chi_TRUE
 DX_COND_chi_FALSE
 DX_FLAG_html
-DX_FLAG_[]DX_CURRENT_FEATURE
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_html_TRUE
 DX_COND_html_FALSE
 DX_FLAG_ps
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_LATEX
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_MAKEINDEX
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_DVIPS
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_EGREP
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_ps_TRUE
 DX_COND_ps_FALSE
 DX_FLAG_pdf
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_PDFLATEX
-DX_FLAG_[]DX_CURRENT_FEATURE
-DX_FLAG_[]DX_CURRENT_FEATURE
-DX_FLAG_[]DX_CURRENT_FEATURE
 DX_COND_pdf_TRUE
 DX_COND_pdf_FALSE
 DX_COND_latex_TRUE
 DX_COND_latex_FALSE
 DOXYGEN_PAPER_SIZE
 RICE_SAMPLES
+RICE_ROOT
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1256,7 +1237,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rice 1.0 to adapt to many kinds of systems.
+\`configure' configures rice 1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1326,7 +1307,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rice 1.0:";;
+     short | recursive ) echo "Configuration of rice 1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1428,7 +1409,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rice configure 1.0
+rice configure 1.1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1442,7 +1423,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rice $as_me 1.0, which was
+It was created by rice $as_me 1.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2133,7 +2114,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rice'
- VERSION='1.0'
+ VERSION='1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3292,18 +3273,44 @@ fi
 
 
 
-RUBY_CONFIG_ARCHDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"`
-RUBY_CONFIG_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['libdir']"`
-RUBY_CONFIG_BINDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['bindir']"`
-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']"`
+RUBY_VERSION_CODE=`$RUBY -e "puts RUBY_VERSION.gsub(/\./, '')"`
 
-RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
+
+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}"
@@ -3312,7 +3319,7 @@ RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
 RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
 
 
-RUBY_LDFLAGS="-L${RUBY_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_LDFLAGS}"
+RUBY_LDFLAGS="-L${RUBY_CONFIG_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_CONFIG_LDFLAGS}"
 
 
 RUBY_LIBS="${RUBY_CONFIG_LIBS} ${RUBY_CONFIG_DLDLIBS}"
@@ -3330,7 +3337,8 @@ then
 else
   if test "x${prefix}x" = "xNONEx"
   then
-    RUBY_SITELIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['sitelibdir']"`
+    RUBY_SITELIBDIR=`
+          $RUBY -rrbconfig -e "puts(Config::CONFIG['sitelibdir'] || '')"`
   else
     sitelibdir_no_prefix=`$RUBY -rrbconfig \
     -e "include Config; \
@@ -3343,9 +3351,13 @@ fi
 CPPFLAGS_save="${CPPFLAGS}"
 CPPFLAGS="${CPPFLAGS} ${RUBY_CPPFLAGS}"
 CXXFLAGS="${CPPFLAGS}"
-{ echo "$as_me:$LINENO: checking for ruby.h" >&5
-echo $ECHO_N "checking for ruby.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ruby_h+set}" = set; then
+
+for ac_header in ruby.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3356,7 +3368,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-#include <ruby.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -3375,30 +3387,39 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_ruby_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_header_ruby_h=no
+	eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ruby_h" >&5
-echo "${ECHO_T}$ac_cv_header_ruby_h" >&6; }
-if test $ac_cv_header_ruby_h = yes; then
-  :
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
 else
   { { echo "$as_me:$LINENO: error: could not find ruby.h (check config.log)" >&5
 echo "$as_me: error: could not find ruby.h (check config.log)" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+done
+
 
-{ echo "$as_me:$LINENO: checking for node.h" >&5
-echo $ECHO_N "checking for node.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_node_h+set}" = set; then
+for ac_header in node.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3411,7 +3432,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <ruby.h>
 
 
-#include <node.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -3430,30 +3451,99 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_node_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_header_node_h=no
+	eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_node_h" >&5
-echo "${ECHO_T}$ac_cv_header_node_h" >&6; }
-if test $ac_cv_header_node_h = yes; then
-  :
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in ruby/node.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  { { echo "$as_me:$LINENO: error: could not find node.h (check config.log)" >&5
-echo "$as_me: error: could not find node.h (check config.log)" >&2;}
-   { (exit 1); exit 1; }; }
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <ruby.h>
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
+#define REALLY_HAVE_RUBY_NODE_H
+_ACEOF
+
 fi
 
+done
+
 
-{ echo "$as_me:$LINENO: checking for version.h" >&5
-echo $ECHO_N "checking for version.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_version_h+set}" = set; then
+for ac_header in version.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3466,7 +3556,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <ruby.h>
 
 
-#include <version.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -3485,25 +3575,165 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_version_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_header_version_h=no
+	eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_version_h" >&5
-echo "${ECHO_T}$ac_cv_header_version_h" >&6; }
-if test $ac_cv_header_version_h = yes; then
-  :
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in env.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  { { echo "$as_me:$LINENO: error: could not find version.h (check config.log)" >&5
-echo "$as_me: error: could not find version.h (check config.log)" >&2;}
-   { (exit 1); exit 1; }; }
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <ruby.h>
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+save_ldflags="$LDFLAGS"
+LDFLAGS="$RUBY_LDFLAGS"
+
+as_ac_Lib=`echo "ac_cv_lib_$RUBY_CONFIG_SO_NAME''_rb_class_boot" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for rb_class_boot in -l$RUBY_CONFIG_SO_NAME" >&5
+echo $ECHO_N "checking for rb_class_boot in -l$RUBY_CONFIG_SO_NAME... $ECHO_C" >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$RUBY_CONFIG_SO_NAME  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rb_class_boot ();
+int
+main ()
+{
+return rb_class_boot ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_Lib=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Lib=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval echo '${'$as_ac_Lib'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_RB_CLASS_BOOT
+_ACEOF
+
+fi
+
+
+LDFLAGS="$save_ldflags"
 
 
 CPPFLAGS="${CPPFLAGS_save}"
@@ -5708,7 +5938,10 @@ esac
 RICE_SAMPLES="enum map inheritance"
 
 
-ac_config_files="$ac_config_files Makefile rice/Makefile test/Makefile sample/Makefile ruby/Makefile ruby/lib/Makefile ruby/lib/mkmf-rice.rb"
+RICE_ROOT=`pwd`
+
+
+ac_config_files="$ac_config_files Makefile rice/Makefile test/Makefile sample/Makefile ruby/Makefile ruby/lib/Makefile ruby/lib/mkmf-rice.rb rice/detail/ruby_version_code.hpp"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6274,7 +6507,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rice $as_me 1.0, which was
+This file was extended by rice $as_me 1.1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6327,7 +6560,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-rice config.status 1.0
+rice config.status 1.1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -6450,6 +6683,7 @@ do
     "ruby/Makefile") CONFIG_FILES="$CONFIG_FILES ruby/Makefile" ;;
     "ruby/lib/Makefile") CONFIG_FILES="$CONFIG_FILES ruby/lib/Makefile" ;;
     "ruby/lib/mkmf-rice.rb") CONFIG_FILES="$CONFIG_FILES ruby/lib/mkmf-rice.rb" ;;
+    "rice/detail/ruby_version_code.hpp") CONFIG_FILES="$CONFIG_FILES rice/detail/ruby_version_code.hpp" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -6600,6 +6834,7 @@ host_vendor!$host_vendor$ac_delim
 host_os!$host_os$ac_delim
 RICE_USING_MINGW32!$RICE_USING_MINGW32$ac_delim
 RUBY!$RUBY$ac_delim
+RUBY_VERSION_CODE!$RUBY_VERSION_CODE$ac_delim
 RUBY_CPPFLAGS!$RUBY_CPPFLAGS$ac_delim
 RUBY_CFLAGS!$RUBY_CFLAGS$ac_delim
 RUBY_CXXFLAGS!$RUBY_CXXFLAGS$ac_delim
@@ -6608,7 +6843,6 @@ RUBY_LIBS!$RUBY_LIBS$ac_delim
 RUBY_LIBRUBYARG!$RUBY_LIBRUBYARG$ac_delim
 RUBY_LIBRUBYARG_STATIC!$RUBY_LIBRUBYARG_STATIC$ac_delim
 RUBY_SITELIBDIR!$RUBY_SITELIBDIR$ac_delim
-DX_PROJECT!$DX_PROJECT$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -6650,78 +6884,59 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+DX_PROJECT!$DX_PROJECT$ac_delim
 DX_CONFIG!$DX_CONFIG$ac_delim
 DX_DOCDIR!$DX_DOCDIR$ac_delim
 DX_ENV!$DX_ENV$ac_delim
 DX_FLAG_doc!$DX_FLAG_doc$ac_delim
 DX_DOXYGEN!$DX_DOXYGEN$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_PERL!$DX_PERL$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_doc_TRUE!$DX_COND_doc_TRUE$ac_delim
 DX_COND_doc_FALSE!$DX_COND_doc_FALSE$ac_delim
 DX_FLAG_dot!$DX_FLAG_dot$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_DOT!$DX_DOT$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_dot_TRUE!$DX_COND_dot_TRUE$ac_delim
 DX_COND_dot_FALSE!$DX_COND_dot_FALSE$ac_delim
 DX_FLAG_man!$DX_FLAG_man$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_man_TRUE!$DX_COND_man_TRUE$ac_delim
 DX_COND_man_FALSE!$DX_COND_man_FALSE$ac_delim
 DX_FLAG_rtf!$DX_FLAG_rtf$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_rtf_TRUE!$DX_COND_rtf_TRUE$ac_delim
 DX_COND_rtf_FALSE!$DX_COND_rtf_FALSE$ac_delim
 DX_FLAG_xml!$DX_FLAG_xml$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_xml_TRUE!$DX_COND_xml_TRUE$ac_delim
 DX_COND_xml_FALSE!$DX_COND_xml_FALSE$ac_delim
 DX_FLAG_chm!$DX_FLAG_chm$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_HHC!$DX_HHC$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_chm_TRUE!$DX_COND_chm_TRUE$ac_delim
 DX_COND_chm_FALSE!$DX_COND_chm_FALSE$ac_delim
 DX_FLAG_chi!$DX_FLAG_chi$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_chi_TRUE!$DX_COND_chi_TRUE$ac_delim
 DX_COND_chi_FALSE!$DX_COND_chi_FALSE$ac_delim
 DX_FLAG_html!$DX_FLAG_html$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_html_TRUE!$DX_COND_html_TRUE$ac_delim
 DX_COND_html_FALSE!$DX_COND_html_FALSE$ac_delim
 DX_FLAG_ps!$DX_FLAG_ps$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_LATEX!$DX_LATEX$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_MAKEINDEX!$DX_MAKEINDEX$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_DVIPS!$DX_DVIPS$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_EGREP!$DX_EGREP$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_ps_TRUE!$DX_COND_ps_TRUE$ac_delim
 DX_COND_ps_FALSE!$DX_COND_ps_FALSE$ac_delim
 DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_PDFLATEX!$DX_PDFLATEX$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
-DX_FLAG_pdf!$DX_FLAG_pdf$ac_delim
 DX_COND_pdf_TRUE!$DX_COND_pdf_TRUE$ac_delim
 DX_COND_pdf_FALSE!$DX_COND_pdf_FALSE$ac_delim
 DX_COND_latex_TRUE!$DX_COND_latex_TRUE$ac_delim
 DX_COND_latex_FALSE!$DX_COND_latex_FALSE$ac_delim
 DOXYGEN_PAPER_SIZE!$DOXYGEN_PAPER_SIZE$ac_delim
 RICE_SAMPLES!$RICE_SAMPLES$ac_delim
+RICE_ROOT!$RICE_ROOT$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5