configure in rice-1.0.1 vs configure in rice-1.0.2

@@ -3299,18 +3299,19 @@
 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_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
 
 
-RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS}"
+RUBY_CFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
 
 
-RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS}"
+RUBY_CXXFLAGS="${RUBY_CONFIG_CFLAGS} ${RUBY_CONFIG_CCDLFLAGS}"
 
 
 RUBY_LDFLAGS="-L${RUBY_ARCHDIR} -L${RUBY_CONFIG_LIBDIR} ${RUBY_LDFLAGS}"
 
 
@@ -3339,10 +3340,11 @@
 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
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -7118,25 +7120,26 @@
     echo "/* $configure_input  */"
     cat "$ac_result"
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
@@ -7169,10 +7172,10 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||