configure in rice-1.7.0 vs configure in rice-2.0.0
- old
+ new
@@ -1920,11 +1920,11 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.14'
+am__api_version='1.15'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
@@ -2121,12 +2121,12 @@
# Double any \ or $.
# By default was `s,x,x', remove it if useless.
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case \"$am_aux_dir\" in
*\ * | *\ *)
MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
@@ -2141,11 +2141,11 @@
am_missing_run=
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case \"$am_aux_dir\" in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
*)
install_sh="\${SHELL} \"$am_aux_dir\"/install-sh"
@@ -2469,12 +2469,12 @@
# dies out for good. For more background, see:
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -2528,10 +2528,11 @@
END
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
fi
fi
+
ac_config_headers="$ac_config_headers rice/config.hpp"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -3715,17 +3716,12 @@
RUBY_CONFIG_LIBRUBYARG_STATIC=`
$RUBY -rrbconfig -e "puts(RbConfig::CONFIG['LIBRUBYARG_STATIC'] || '')"`
RUBY_CONFIG_CCDLFLAGS=`
$RUBY -rrbconfig -e "puts(RbConfig::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_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
+RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
+
if test "x${RUBY_CONFIG_RUBYARCHHDRDIR}x" != "xx"; then
RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYARCHHDRDIR}"
fi