[vmkit-commits] [PATCH] Allow user to specify which java runtime to use when configuring
Nicolas Geoffray
nicolas.geoffray at gmail.com
Mon Oct 24 14:10:27 PDT 2011
Very nice! These kinds of checks should have been there from the beginning,
it would have save me and probably other lots of debugging time finding out
what's going wrong :) There's one thing you should fix though to make it
portable, especially on macosx. Feel free to drop the code that is not
portable if it takes too long to find out how to fix it.
Small request: next time you change the configure.ac file, you can drop the
generated configure file from the review. Also, please do two separate
commits: one for the "real" files, and one for the auto-generated, so that
one does not pollute the other. Thanks!
Nicolas
On Mon, Oct 24, 2011 at 10:51 PM, Will Dietz <wdietz2 at illinois.edu> wrote:
> Inlined below.
>
> Shouldn't change any existing functionality, but sets some useful
> variables and whatnot that help for commits-to-come :).
>
> Also, slightly validates the results which can help new VMKit users
> (even of the classpath-based implementation) discover
> misconfigurations early on.
>
> ~Will
>
> >From 18e8de72bfaa7ff7643164677591199642531759 Mon Sep 17 00:00:00 2001
> From: Will Dietz <w at wdtz.org>
> Date: Fri, 14 Oct 2011 01:19:02 -0500
> Subject: [PATCH 05/28] Allow user to specify which java runtime to use when
> configuring.
>
> Also, lightly validate the parameters given, to help catch
> casual misconfiguration mistakes as early as possible.
> ---
> Makefile.config.in | 12 +
> autoconf/configure.ac | 70 +++++-
> configure | 656
> ++++++++++++++++++++++++++++++++++++++++---------
> 3 files changed, 616 insertions(+), 122 deletions(-)
>
> diff --git a/Makefile.config.in b/Makefile.config.in
> index b0f23c8..8f528a2 100755
> --- a/Makefile.config.in
> +++ b/Makefile.config.in
> @@ -2,3 +2,15 @@ MMTK_PLAN = @MMTK_PLAN@
> MMTK_PLAN_HEADER = @MMTK_PLAN_HEADER@
> WITH_64 = @WITH_64@
> ANT = @ANT@
> +
> +CLASSPATH_IMPL = @classpathimpl@
> +
> +ifeq ($(CLASSPATH_IMPL),gnuclasspath)
> + CLASSPATH_DIR = GNUClasspath
> +else
> + ifeq ($(CLASSPATH_IMPL),openjdk)
> + CLASSPATH_DIR = OpenJDK
> + else
> +$(error Unsupported classpath implementation "$(CLASSPATH_IMPL)")
> + endif
> +endif
> diff --git a/autoconf/configure.ac b/autoconf/configure.ac
> index 0a80c2b..ee53d3d 100644
> --- a/autoconf/configure.ac
> +++ b/autoconf/configure.ac
> @@ -203,6 +203,74 @@ AC_SUBST([classpathglibj])
> AC_SUBST([classpathlibs])
> AC_SUBST([classpathversion])
>
> +dnl
> **************************************************************************
> +dnl OpenJDK Paths
> +dnl
> **************************************************************************
> +dnl Chat with OpenJDK folk about best way to look for the things we need
> +dnl For now, this should suffice.
> +
> +AC_ARG_WITH(openjdk-jre,
> + [AS_HELP_STRING(--with-openjdk-jre,
> + [Build J3 with OpenJDK JRE install (default is
> '/usr/lib/java/jre')])],
> + [[openjdkjre=$withval]],
> + [[openjdkjre=/usr/lib/java/jre]]
> +)
> +
> +AC_ARG_WITH(openjdk-arch-dir,
> + [AS_HELP_STRING(--with-openjdk-arch-dir,
> + [Location of architecture-specific OpenJDK libraries
> (default is '/usr/lib/java/jre/lib/i386')])],
> + [[openjdkarchdir=$withval]],
> + [[openjdkarchdir=/usr/lib/java/jre/lib/i386]]
> +)
> +AC_SUBST([openjdkjre])
> +AC_SUBST([openjdkarchdir])
> +
> +
> +dnl
> **************************************************************************
> +dnl Pick Classpath or OpenJDK. Also, light sanity checks on the chosen
> one.
> +dnl
> **************************************************************************
> +
> +AC_ARG_WITH(classpath-impl,
> + [AS_HELP_STRING(--with-classpath-impl,
> + [Build J3 with the specified classpath implementation
> (default is gnuclasspath)])],
> + [[classpathimpl=$withval]],
> + [[classpathimpl=gnuclasspath]]
> +)
> +
> +case "${classpathimpl}" in
> + gnuclasspath)
> + AC_MSG_NOTICE(Validing GNU Classpath installation...)
> + AC_CHECK_FILES([${classpathlibs}]
> + [${classpathlibs}/libjavaio.so]
> + [${classpathlibs}/libjavalang.so]
> + [${classpathlibs}/libjavalangreflect.so]
> + [${classpathlibs}/libjavanet.so]
> + [${classpathlibs}/libjavanio.so]
> + [${classpathlibs}/libjavautil.so],,
>
Extra comma or is it necessary?
Also, this won't work on macosx (nor windows, but that's not supported
anyways), and unfortunately I don't know enough of autoconf to make it
portable. But that's a really neat thing to have, so if you can find it out,
it'll be great! :)
+ AC_MSG_ERROR([[Invalid GNU Classpath library path, can't find
> required libraries]]))
> + AC_CHECK_FILE([${classpathglibj}],,
> + AC_MSG_ERROR([[Invalid glibj.zip location]]))
> + ;;
> + openjdk)
> + AC_MSG_NOTICE(Validating OpenJDK installation...)
> + AC_CHECK_FILES([${openjdkjre}]
> + [${openjdkjre}/lib/rt.jar],,
> + AC_MSG_ERROR([[Invalid OpenJDK JRE path, can't find required
> jar files!]]))
> + AC_CHECK_FILE([${openjdkarchdir}],,
> + AC_MSG_ERROR([[Invalid OpenJDK arch dir]]))
> + dnl Check that $archdir/client/libjava.so or
> $archdir/server/libjava.so exist
> + AC_CHECK_FILE([${openjdkarchdir}]/client/libjvm.so,,
> + AC_CHECK_FILE([${openjdkarchdir}]/server/libjvm.so,,
> + AC_MSG_ERROR([[Can't find libjvm.so]])))
> + ;;
> + *)
>
Same comment for macosx.
> + AC_MSG_ERROR([Invalid --with-classpath-impl "${classpathimpl}".
> Must be one of "gnuclasspath" or "openjdk"])
> + ;;
> +esac
> +
> +AC_SUBST(classpathimpl)
> +
> +
>
> dnl===-----------------------------------------------------------------------===
> dnl===
> dnl=== SECTION 4: Check for programs we need and that they are the
> right version
> @@ -309,7 +377,7 @@ AC_CONFIG_SRCDIR(["Makefile.common.in"])
> dnl Configure a common Makefile
> AC_CONFIG_FILES(Makefile.common)
> AC_CONFIG_FILES(Makefile.config)
> -AC_CONFIG_FILES([lib/J3/Classpath/Classpath.h])
> +AC_CONFIG_FILES([lib/J3/ClassLib/Classpath.h])
>
I don't think that's supposed to go in (just yet :))
> AC_CONFIG_FILES([tools/llcj/LinkPaths.h])
> AC_CONFIG_FILES([mmtk/java/src/org/j3/config/Selected.java])
> AC_CONFIG_FILES([mmtk/java/build.xml])
> diff --git a/configure b/configure
> index d309952..9fbbdc7 100755
> --- a/configure
> +++ b/configure
> @@ -1,6 +1,6 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
> -# Generated by GNU Autoconf 2.67 for vmkit 0.30svn.
> +# Generated by GNU Autoconf 2.68 for vmkit 0.30svn.
> #
> # Report bugs to <nicolas.geoffray at gmail.com>.
> #
> @@ -93,6 +93,7 @@ fi
> IFS=" "" $as_nl"
>
> # Find who we are. Look in the path if we contain no directory separator.
> +as_myself=
> case $0 in #((
> *[\\/]* ) as_myself=$0 ;;
> *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> @@ -218,11 +219,18 @@ IFS=$as_save_IFS
> # We cannot yet assume a decent shell, so we have to provide a
> # neutralization value for shells without unset; and this also
> # works around shells that cannot unset nonexistent variables.
> + # Preserve -v and -x to the replacement shell.
> BASH_ENV=/dev/null
> ENV=/dev/null
> (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
> export CONFIG_SHELL
> - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
> + case $- in # ((((
> + *v*x* | *x*v* ) as_opts=-vx ;;
> + *v* ) as_opts=-v ;;
> + *x* ) as_opts=-x ;;
> + * ) as_opts= ;;
> + esac
> + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
> fi
>
> if test x$as_have_required = xno; then :
> @@ -632,6 +640,9 @@ CPPFLAGS
> LDFLAGS
> CFLAGS
> CC
> +classpathimpl
> +openjdkarchdir
> +openjdkjre
> classpathversion
> classpathlibs
> classpathglibj
> @@ -700,6 +711,9 @@ with_llvmobj
> with_mmtk_plan
> with_gnu_classpath_libs
> with_gnu_classpath_glibj
> +with_openjdk_jre
> +with_openjdk_arch_dir
> +with_classpath_impl
> '
> ac_precious_vars='build_alias
> host_alias
> @@ -1117,7 +1131,7 @@ Try \`$0 --help' for more information"
> $as_echo "$as_me: WARNING: you should use --build, --host, --target"
> >&2
> expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
> $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
> - : ${build_alias=$ac_option} ${host_alias=$ac_option}
> ${target_alias=$ac_option}
> + : "${build_alias=$ac_option} ${host_alias=$ac_option}
> ${target_alias=$ac_option}"
> ;;
>
> esac
> @@ -1338,6 +1352,12 @@ Optional Packages:
> --with-gnu-classpath-glibj
> Build J3 with GNU Classpath install (default is
> '/usr/share/classpath/glibj.zip')
> + --with-openjdk-jre Build J3 with OpenJDK JRE install (default is
> + '/usr/lib/java/jre')
> + --with-openjdk-arch-dir Location of architecture-specific OpenJDK
> libraries
> + (default is '/usr/lib/java/jre/lib/i386')
> + --with-classpath-impl Build J3 with the specified classpath
> implementation
> + (default is gnuclasspath)
>
> Some influential environment variables:
> CC C compiler command
> @@ -1418,7 +1438,7 @@ test -n "$ac_init_help" && exit $ac_status
> if $ac_init_version; then
> cat <<\_ACEOF
> vmkit configure 0.30svn
> -generated by GNU Autoconf 2.67
> +generated by GNU Autoconf 2.68
>
> Copyright (C) 2010 Free Software Foundation, Inc.
> This configure script is free software; the Free Software Foundation
> @@ -1466,7 +1486,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
>
> ac_retval=1
> fi
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
> as_fn_set_status $ac_retval
>
> } # ac_fn_c_try_compile
> @@ -1503,7 +1523,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
>
> ac_retval=1
> fi
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
> as_fn_set_status $ac_retval
>
> } # ac_fn_c_try_cpp
> @@ -1541,7 +1561,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
>
> ac_retval=1
> fi
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
> as_fn_set_status $ac_retval
>
> } # ac_fn_cxx_try_compile
> @@ -1587,7 +1607,7 @@ fi
> # interfere with the next link command; also delete a directory that is
> # left behind by Apple's compiler. We do this before executing the
> actions.
> rm -rf conftest.dSYM conftest_ipa8_conftest.oo
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
> as_fn_set_status $ac_retval
>
> } # ac_fn_c_try_link
> @@ -1600,10 +1620,10 @@ fi
> ac_fn_c_check_header_mongrel ()
> {
> as_lineno=${as_lineno-"$1"}
> as_lineno_stack=as_lineno_stack=$as_lineno_stack
> - if eval "test \"\${$3+set}\"" = set; then :
> + if eval \${$3+:} false; then :
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
> $as_echo_n "checking for $2... " >&6; }
> -if eval "test \"\${$3+set}\"" = set; then :
> +if eval \${$3+:} false; then :
> $as_echo_n "(cached) " >&6
> fi
> eval ac_res=\$$3
> @@ -1670,7 +1690,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with
> the compiler's result" >&2;}
> esac
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
> $as_echo_n "checking for $2... " >&6; }
> -if eval "test \"\${$3+set}\"" = set; then :
> +if eval \${$3+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> eval "$3=\$ac_header_compiler"
> @@ -1679,7 +1699,7 @@ eval ac_res=\$$3
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> $as_echo "$ac_res" >&6; }
> fi
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
>
> } # ac_fn_c_check_header_mongrel
>
> @@ -1720,7 +1740,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
> ac_retval=$ac_status
> fi
> rm -rf conftest.dSYM conftest_ipa8_conftest.oo
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
> as_fn_set_status $ac_retval
>
> } # ac_fn_c_try_run
> @@ -1734,7 +1754,7 @@ ac_fn_c_check_header_compile ()
> as_lineno=${as_lineno-"$1"}
> as_lineno_stack=as_lineno_stack=$as_lineno_stack
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
> $as_echo_n "checking for $2... " >&6; }
> -if eval "test \"\${$3+set}\"" = set; then :
> +if eval \${$3+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -1752,7 +1772,7 @@ fi
> eval ac_res=\$$3
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> $as_echo "$ac_res" >&6; }
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
>
> } # ac_fn_c_check_header_compile
>
> @@ -1765,7 +1785,7 @@ ac_fn_c_check_type ()
> as_lineno=${as_lineno-"$1"}
> as_lineno_stack=as_lineno_stack=$as_lineno_stack
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
> $as_echo_n "checking for $2... " >&6; }
> -if eval "test \"\${$3+set}\"" = set; then :
> +if eval \${$3+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> eval "$3=no"
> @@ -1806,7 +1826,7 @@ fi
> eval ac_res=\$$3
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> $as_echo "$ac_res" >&6; }
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
>
> } # ac_fn_c_check_type
>
> @@ -1818,7 +1838,7 @@ ac_fn_c_check_func ()
> as_lineno=${as_lineno-"$1"}
> as_lineno_stack=as_lineno_stack=$as_lineno_stack
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
> $as_echo_n "checking for $2... " >&6; }
> -if eval "test \"\${$3+set}\"" = set; then :
> +if eval \${$3+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -1873,7 +1893,7 @@ fi
> eval ac_res=\$$3
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> $as_echo "$ac_res" >&6; }
> - eval $as_lineno_stack; test "x$as_lineno_stack" = x && {
> as_lineno=; unset as_lineno;}
> + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
>
> } # ac_fn_c_check_func
> cat >config.log <<_ACEOF
> @@ -1881,7 +1901,7 @@ This file contains any messages produced by
> compilers while
> running configure, to aid debugging if configure makes a mistake.
>
> It was created by vmkit $as_me 0.30svn, which was
> -generated by GNU Autoconf 2.67. Invocation command line was
> +generated by GNU Autoconf 2.68. Invocation command line was
>
> $ $0 $@
>
> @@ -2139,7 +2159,7 @@ $as_echo "$as_me: loading site script $ac_site_file"
> >&6;}
> || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':"
> >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error $? "failed to load site script $ac_site_file
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> fi
> done
>
> @@ -2306,7 +2326,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1
> ||
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
> $as_echo_n "checking build system type... " >&6; }
> -if test "${ac_cv_build+set}" = set; then :
> +if ${ac_cv_build+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_build_alias=$build_alias
> @@ -2322,7 +2342,7 @@ fi
> $as_echo "$ac_cv_build" >&6; }
> case $ac_cv_build in
> *-*-*) ;;
> -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
> +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
> esac
> build=$ac_cv_build
> ac_save_IFS=$IFS; IFS='-'
> @@ -2340,7 +2360,7 @@ case $build_os in *\ *) build_os=`echo
> "$build_os" | sed 's/ /-/g'`;; esac
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
> $as_echo_n "checking host system type... " >&6; }
> -if test "${ac_cv_host+set}" = set; then :
> +if ${ac_cv_host+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test "x$host_alias" = x; then
> @@ -2355,7 +2375,7 @@ fi
> $as_echo "$ac_cv_host" >&6; }
> case $ac_cv_host in
> *-*-*) ;;
> -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
> +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
> esac
> host=$ac_cv_host
> ac_save_IFS=$IFS; IFS='-'
> @@ -2373,7 +2393,7 @@ case $host_os in *\ *) host_os=`echo "$host_os"
> | sed 's/ /-/g'`;; esac
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
> $as_echo_n "checking target system type... " >&6; }
> -if test "${ac_cv_target+set}" = set; then :
> +if ${ac_cv_target+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test "x$target_alias" = x; then
> @@ -2388,7 +2408,7 @@ fi
> $as_echo "$ac_cv_target" >&6; }
> case $ac_cv_target in
> *-*-*) ;;
> -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
> +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
> esac
> target=$ac_cv_target
> ac_save_IFS=$IFS; IFS='-'
> @@ -2413,7 +2433,7 @@ test -n "$target_alias" &&
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking type of operating
> system we're going to host on" >&5
> $as_echo_n "checking type of operating system we're going to host
> on... " >&6; }
> -if test "${vmkit_cv_os_type+set}" = set; then :
> +if ${vmkit_cv_os_type+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $host in
> @@ -2543,6 +2563,385 @@ fi
>
>
>
> +
> +# Check whether --with-openjdk-jre was given.
> +if test "${with_openjdk_jre+set}" = set; then :
> + withval=$with_openjdk_jre; openjdkjre=$withval
> +else
> + openjdkjre=/usr/lib/java/jre
> +
> +fi
> +
> +
> +
> +# Check whether --with-openjdk-arch-dir was given.
> +if test "${with_openjdk_arch_dir+set}" = set; then :
> + withval=$with_openjdk_arch_dir; openjdkarchdir=$withval
> +else
> + openjdkarchdir=/usr/lib/java/jre/lib/i386
> +
> +fi
> +
> +
> +
> +
> +
> +
> +
> +# Check whether --with-classpath-impl was given.
> +if test "${with_classpath_impl+set}" = set; then :
> + withval=$with_classpath_impl; classpathimpl=$withval
> +else
> + classpathimpl=gnuclasspath
> +
> +fi
> +
> +
> +case "${classpathimpl}" in
> + gnuclasspath)
> + { $as_echo "$as_me:${as_lineno-$LINENO}: Validing GNU Classpath
> installation..." >&5
> +$as_echo "$as_me: Validing GNU Classpath installation..." >&6;}
> + as_ac_File=`$as_echo "ac_cv_file_${classpathlibs}" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${classpathlibs}"
> >&5
> +$as_echo_n "checking for ${classpathlibs}... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathlibs}"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${classpathlibs}" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid GNU Classpath library path, can't find
> required libraries" "$LINENO" 5
> +fi
> +as_ac_File=`$as_echo "ac_cv_file_${classpathlibs}/libjavaio.so" |
> $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${classpathlibs}/libjavaio.so" >&5
> +$as_echo_n "checking for ${classpathlibs}/libjavaio.so... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathlibs}/libjavaio.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${classpathlibs}/libjavaio.so" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid GNU Classpath library path, can't find
> required libraries" "$LINENO" 5
> +fi
> +as_ac_File=`$as_echo "ac_cv_file_${classpathlibs}/libjavalang.so" |
> $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${classpathlibs}/libjavalang.so" >&5
> +$as_echo_n "checking for ${classpathlibs}/libjavalang.so... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathlibs}/libjavalang.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${classpathlibs}/libjavalang.so" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid GNU Classpath library path, can't find
> required libraries" "$LINENO" 5
> +fi
> +as_ac_File=`$as_echo
> "ac_cv_file_${classpathlibs}/libjavalangreflect.so" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${classpathlibs}/libjavalangreflect.so" >&5
> +$as_echo_n "checking for ${classpathlibs}/libjavalangreflect.so... " >&6;
> }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathlibs}/libjavalangreflect.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${classpathlibs}/libjavalangreflect.so" |
> $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid GNU Classpath library path, can't find
> required libraries" "$LINENO" 5
> +fi
> +as_ac_File=`$as_echo "ac_cv_file_${classpathlibs}/libjavanet.so" |
> $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${classpathlibs}/libjavanet.so" >&5
> +$as_echo_n "checking for ${classpathlibs}/libjavanet.so... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathlibs}/libjavanet.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${classpathlibs}/libjavanet.so" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid GNU Classpath library path, can't find
> required libraries" "$LINENO" 5
> +fi
> +as_ac_File=`$as_echo "ac_cv_file_${classpathlibs}/libjavanio.so" |
> $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${classpathlibs}/libjavanio.so" >&5
> +$as_echo_n "checking for ${classpathlibs}/libjavanio.so... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathlibs}/libjavanio.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${classpathlibs}/libjavanio.so" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid GNU Classpath library path, can't find
> required libraries" "$LINENO" 5
> +fi
> +as_ac_File=`$as_echo "ac_cv_file_${classpathlibs}/libjavautil.so" |
> $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${classpathlibs}/libjavautil.so" >&5
> +$as_echo_n "checking for ${classpathlibs}/libjavautil.so... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathlibs}/libjavautil.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${classpathlibs}/libjavautil.so" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid GNU Classpath library path, can't find
> required libraries" "$LINENO" 5
> +fi
> +
> + as_ac_File=`$as_echo "ac_cv_file_${classpathglibj}" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${classpathglibj}"
> >&5
> +$as_echo_n "checking for ${classpathglibj}... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${classpathglibj}"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +else
> + as_fn_error $? "Invalid glibj.zip location" "$LINENO" 5
> +fi
> +
> + ;;
> + openjdk)
> + { $as_echo "$as_me:${as_lineno-$LINENO}: Validating OpenJDK
> installation..." >&5
> +$as_echo "$as_me: Validating OpenJDK installation..." >&6;}
> + as_ac_File=`$as_echo "ac_cv_file_${openjdkjre}" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkjre}" >&5
> +$as_echo_n "checking for ${openjdkjre}... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${openjdkjre}"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${openjdkjre}" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid OpenJDK JRE path, can't find required jar
> files!" "$LINENO" 5
> +fi
> +as_ac_File=`$as_echo "ac_cv_file_${openjdkjre}/lib/rt.jar" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${openjdkjre}/lib/rt.jar" >&5
> +$as_echo_n "checking for ${openjdkjre}/lib/rt.jar... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${openjdkjre}/lib/rt.jar"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +cat >>confdefs.h <<_ACEOF
> +#define `$as_echo "HAVE_${openjdkjre}/lib/rt.jar" | $as_tr_cpp` 1
> +_ACEOF
> +
> +else
> + as_fn_error $? "Invalid OpenJDK JRE path, can't find required jar
> files!" "$LINENO" 5
> +fi
> +
> + as_ac_File=`$as_echo "ac_cv_file_${openjdkarchdir}" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${openjdkarchdir}"
> >&5
> +$as_echo_n "checking for ${openjdkarchdir}... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${openjdkarchdir}"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +else
> + as_fn_error $? "Invalid OpenJDK arch dir" "$LINENO" 5
> +fi
> +
> + as_ac_File=`$as_echo
> "ac_cv_file_${openjdkarchdir}/client/libjvm.so" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${openjdkarchdir}/client/libjvm.so" >&5
> +$as_echo_n "checking for ${openjdkarchdir}/client/libjvm.so... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${openjdkarchdir}/client/libjvm.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +else
> + as_ac_File=`$as_echo
> "ac_cv_file_${openjdkarchdir}/server/libjvm.so" | $as_tr_sh`
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
> ${openjdkarchdir}/server/libjvm.so" >&5
> +$as_echo_n "checking for ${openjdkarchdir}/server/libjvm.so... " >&6; }
> +if eval \${$as_ac_File+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + test "$cross_compiling" = yes &&
> + as_fn_error $? "cannot check for file existence when cross
> compiling" "$LINENO" 5
> +if test -r "${openjdkarchdir}/server/libjvm.so"; then
> + eval "$as_ac_File=yes"
> +else
> + eval "$as_ac_File=no"
> +fi
> +fi
> +eval ac_res=\$$as_ac_File
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res"
> >&5
> +$as_echo "$ac_res" >&6; }
> +if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
> +
> +else
> + as_fn_error $? "Can't find libjvm.so" "$LINENO" 5
> +fi
> +
> +fi
> +
> + ;;
> + *)
> + as_fn_error $? "Invalid --with-classpath-impl
> \"${classpathimpl}\". Must be one of \"gnuclasspath\" or \"openjdk\""
> "$LINENO" 5
> + ;;
> +esac
> +
> +
> +
> +
> +
> ac_ext=c
> ac_cpp='$CPP $CPPFLAGS'
> ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> @@ -2553,7 +2952,7 @@ if test -n "$ac_tool_prefix"; then
> set dummy ${ac_tool_prefix}gcc; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then :
> +if ${ac_cv_prog_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -2593,7 +2992,7 @@ if test -z "$ac_cv_prog_CC"; then
> set dummy gcc; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_CC"; then
> @@ -2646,7 +3045,7 @@ if test -z "$CC"; then
> set dummy ${ac_tool_prefix}cc; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then :
> +if ${ac_cv_prog_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -2686,7 +3085,7 @@ if test -z "$CC"; then
> set dummy cc; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then :
> +if ${ac_cv_prog_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -2745,7 +3144,7 @@ if test -z "$CC"; then
> set dummy $ac_tool_prefix$ac_prog; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then :
> +if ${ac_cv_prog_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -2789,7 +3188,7 @@ do
> set dummy $ac_prog; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_CC"; then
> @@ -2844,7 +3243,7 @@ fi
> test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in
> \`$ac_pwd':" >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error $? "no acceptable C compiler found in \$PATH
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>
> # Provide some information about the compiler.
> $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version"
> >&5
> @@ -2959,7 +3358,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
> { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error 77 "C compiler cannot create executables
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> else
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> @@ -3002,7 +3401,7 @@ else
> { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error $? "cannot compute suffix of executables: cannot compile and
> link
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> fi
> rm -f conftest conftest$ac_cv_exeext
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
> @@ -3061,7 +3460,7 @@ $as_echo "$ac_try_echo"; } >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error $? "cannot run C compiled programs.
> If you meant to cross compile, use \`--host'.
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> fi
> fi
> fi
> @@ -3072,7 +3471,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext
> conftest.out
> ac_clean_files=$ac_clean_files_save
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of
> object files" >&5
> $as_echo_n "checking for suffix of object files... " >&6; }
> -if test "${ac_cv_objext+set}" = set; then :
> +if ${ac_cv_objext+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -3113,7 +3512,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
> { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error $? "cannot compute suffix of object files: cannot compile
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> fi
> rm -f conftest.$ac_cv_objext conftest.$ac_ext
> fi
> @@ -3123,7 +3522,7 @@ OBJEXT=$ac_cv_objext
> ac_objext=$OBJEXT
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are
> using the GNU C compiler" >&5
> $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
> -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
> +if ${ac_cv_c_compiler_gnu+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -3160,7 +3559,7 @@ ac_test_CFLAGS=${CFLAGS+set}
> ac_save_CFLAGS=$CFLAGS
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g"
> >&5
> $as_echo_n "checking whether $CC accepts -g... " >&6; }
> -if test "${ac_cv_prog_cc_g+set}" = set; then :
> +if ${ac_cv_prog_cc_g+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_save_c_werror_flag=$ac_c_werror_flag
> @@ -3238,7 +3637,7 @@ else
> fi
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to
> accept ISO C89" >&5
> $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
> -if test "${ac_cv_prog_cc_c89+set}" = set; then :
> +if ${ac_cv_prog_cc_c89+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_cv_prog_cc_c89=no
> @@ -3345,7 +3744,7 @@ if test -n "$CPP" && test -d "$CPP"; then
> CPP=
> fi
> if test -z "$CPP"; then
> - if test "${ac_cv_prog_CPP+set}" = set; then :
> + if ${ac_cv_prog_CPP+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> # Double quotes because CPP needs to be expanded
> @@ -3461,7 +3860,7 @@ else
> { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
> fi
>
> ac_ext=c
> @@ -3482,7 +3881,7 @@ if test -n "$ac_tool_prefix"; then
> set dummy $ac_tool_prefix$ac_prog; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then :
> +if ${ac_cv_prog_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -3526,7 +3925,7 @@ do
> set dummy $ac_prog; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_CC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_CC"; then
> @@ -3579,7 +3978,7 @@ fi
> test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in
> \`$ac_pwd':" >&5
> $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
> as_fn_error $? "no acceptable C compiler found in \$PATH
> -See \`config.log' for more details" "$LINENO" 5 ; }
> +See \`config.log' for more details" "$LINENO" 5; }
>
> # Provide some information about the compiler.
> $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version"
> >&5
> @@ -3608,7 +4007,7 @@ done
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are
> using the GNU C compiler" >&5
> $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
> -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
> +if ${ac_cv_c_compiler_gnu+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -3645,7 +4044,7 @@ ac_test_CFLAGS=${CFLAGS+set}
> ac_save_CFLAGS=$CFLAGS
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g"
> >&5
> $as_echo_n "checking whether $CC accepts -g... " >&6; }
> -if test "${ac_cv_prog_cc_g+set}" = set; then :
> +if ${ac_cv_prog_cc_g+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_save_c_werror_flag=$ac_c_werror_flag
> @@ -3723,7 +4122,7 @@ else
> fi
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to
> accept ISO C89" >&5
> $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
> -if test "${ac_cv_prog_cc_c89+set}" = set; then :
> +if ${ac_cv_prog_cc_c89+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_cv_prog_cc_c89=no
> @@ -3834,7 +4233,7 @@ if test -z "$CXX"; then
> set dummy $ac_tool_prefix$ac_prog; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CXX+set}" = set; then :
> +if ${ac_cv_prog_CXX+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CXX"; then
> @@ -3878,7 +4277,7 @@ do
> set dummy $ac_prog; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_CXX+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_CXX"; then
> @@ -3956,7 +4355,7 @@ done
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are
> using the GNU C++ compiler" >&5
> $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
> -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
> +if ${ac_cv_cxx_compiler_gnu+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -3993,7 +4392,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
> ac_save_CXXFLAGS=$CXXFLAGS
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g"
> >&5
> $as_echo_n "checking whether $CXX accepts -g... " >&6; }
> -if test "${ac_cv_prog_cxx_g+set}" = set; then :
> +if ${ac_cv_prog_cxx_g+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_save_cxx_werror_flag=$ac_cxx_werror_flag
> @@ -4078,7 +4477,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm"
> >&5
> $as_echo_n "checking for BSD-compatible nm... " >&6; }
> -if test "${lt_cv_path_NM+set}" = set; then :
> +if ${lt_cv_path_NM+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$NM"; then
> @@ -4146,7 +4545,7 @@ fi
> set dummy cmp; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_CMP+set}" = set; then :
> +if ${ac_cv_path_CMP+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $CMP in
> @@ -4187,7 +4586,7 @@ fi
> set dummy cp; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_CP+set}" = set; then :
> +if ${ac_cv_path_CP+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $CP in
> @@ -4228,7 +4627,7 @@ fi
> set dummy date; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_DATE+set}" = set; then :
> +if ${ac_cv_path_DATE+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $DATE in
> @@ -4269,7 +4668,7 @@ fi
> set dummy find; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_FIND+set}" = set; then :
> +if ${ac_cv_path_FIND+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $FIND in
> @@ -4310,7 +4709,7 @@ fi
> set dummy grep; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_GREP+set}" = set; then :
> +if ${ac_cv_path_GREP+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $GREP in
> @@ -4351,7 +4750,7 @@ fi
> set dummy mkdir; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_MKDIR+set}" = set; then :
> +if ${ac_cv_path_MKDIR+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $MKDIR in
> @@ -4392,7 +4791,7 @@ fi
> set dummy mv; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_MV+set}" = set; then :
> +if ${ac_cv_path_MV+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $MV in
> @@ -4434,7 +4833,7 @@ if test -n "$ac_tool_prefix"; then
> set dummy ${ac_tool_prefix}ranlib; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_RANLIB+set}" = set; then :
> +if ${ac_cv_prog_RANLIB+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$RANLIB"; then
> @@ -4474,7 +4873,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
> set dummy ranlib; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
> +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_RANLIB"; then
> @@ -4525,7 +4924,7 @@ fi
> set dummy rm; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_RM+set}" = set; then :
> +if ${ac_cv_path_RM+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $RM in
> @@ -4566,7 +4965,7 @@ fi
> set dummy sed; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_SED+set}" = set; then :
> +if ${ac_cv_path_SED+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $SED in
> @@ -4607,7 +5006,7 @@ fi
> set dummy tar; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_TAR+set}" = set; then :
> +if ${ac_cv_path_TAR+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $TAR in
> @@ -4648,7 +5047,7 @@ fi
> set dummy pwd; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_BINPWD+set}" = set; then :
> +if ${ac_cv_path_BINPWD+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $BINPWD in
> @@ -4689,7 +5088,7 @@ fi
> set dummy cat; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_CAT+set}" = set; then :
> +if ${ac_cv_path_CAT+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $CAT in
> @@ -4731,7 +5130,7 @@ fi
> set dummy llvm-as; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_LLVMAS+set}" = set; then :
> +if ${ac_cv_path_LLVMAS+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $LLVMAS in
> @@ -4772,7 +5171,7 @@ fi
> set dummy llc; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_LLC+set}" = set; then :
> +if ${ac_cv_path_LLC+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $LLC in
> @@ -4813,7 +5212,7 @@ fi
> set dummy ant; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_ANT+set}" = set; then :
> +if ${ac_cv_path_ANT+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $ANT in
> @@ -4867,7 +5266,7 @@ fi
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a
> BSD-compatible install" >&5
> $as_echo_n "checking for a BSD-compatible install... " >&6; }
> if test -z "$INSTALL"; then
> -if test "${ac_cv_path_install+set}" = set; then :
> +if ${ac_cv_path_install+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> @@ -4948,7 +5347,7 @@ test -z "$INSTALL_DATA" &&
> INSTALL_DATA='${INSTALL} -m 644'
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
> $as_echo_n "checking for inflate in -lz... " >&6; }
> -if test "${ac_cv_lib_z_inflate+set}" = set; then :
> +if ${ac_cv_lib_z_inflate+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> @@ -4982,7 +5381,7 @@ LIBS=$ac_check_lib_save_LIBS
> fi
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
> $as_echo "$ac_cv_lib_z_inflate" >&6; }
> -if test "x$ac_cv_lib_z_inflate" = x""yes; then :
> +if test "x$ac_cv_lib_z_inflate" = xyes; then :
> cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBZ 1
> _ACEOF
> @@ -5001,7 +5400,7 @@ fi
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that
> handles long lines and -e" >&5
> $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
> -if test "${ac_cv_path_GREP+set}" = set; then :
> +if ${ac_cv_path_GREP+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if test -z "$GREP"; then
> @@ -5064,7 +5463,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
> $as_echo_n "checking for egrep... " >&6; }
> -if test "${ac_cv_path_EGREP+set}" = set; then :
> +if ${ac_cv_path_EGREP+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
> @@ -5131,7 +5530,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files"
> >&5
> $as_echo_n "checking for ANSI C header files... " >&6; }
> -if test "${ac_cv_header_stdc+set}" = set; then :
> +if ${ac_cv_header_stdc+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -5259,7 +5658,7 @@ done
>
>
> ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h"
> "$ac_includes_default"
> -if test "x$ac_cv_header_zlib_h" = x""yes; then :
> +if test "x$ac_cv_header_zlib_h" = xyes; then :
>
> else
> \
> @@ -5272,7 +5671,7 @@ fi
>
> nl===-----------------------------------------------------------------------===
>
> ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t"
> "$ac_includes_default"
> -if test "x$ac_cv_type_pid_t" = x""yes; then :
> +if test "x$ac_cv_type_pid_t" = xyes; then :
>
> else
>
> @@ -5283,7 +5682,7 @@ _ACEOF
> fi
>
> ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t"
> "$ac_includes_default"
> -if test "x$ac_cv_type_size_t" = x""yes; then :
> +if test "x$ac_cv_type_size_t" = xyes; then :
>
> else
>
> @@ -5295,7 +5694,7 @@ fi
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm
> is in sys/time.h or time.h" >&5
> $as_echo_n "checking whether struct tm is in sys/time.h or time.h... "
> >&6; }
> -if test "${ac_cv_struct_tm+set}" = set; then :
> +if ${ac_cv_struct_tm+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -5329,7 +5728,7 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
> fi
>
> ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t"
> "$ac_includes_default"
> -if test "x$ac_cv_type_int64_t" = x""yes; then :
> +if test "x$ac_cv_type_int64_t" = xyes; then :
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_INT64_T 1
> @@ -5341,7 +5740,7 @@ else
> fi
>
> ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t"
> "$ac_includes_default"
> -if test "x$ac_cv_type_uint64_t" = x""yes; then :
> +if test "x$ac_cv_type_uint64_t" = xyes; then :
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_UINT64_T 1
> @@ -5350,7 +5749,7 @@ _ACEOF
>
> else
> ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t"
> "$ac_includes_default"
> -if test "x$ac_cv_type_u_int64_t" = x""yes; then :
> +if test "x$ac_cv_type_u_int64_t" = xyes; then :
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_U_INT64_T 1
> @@ -5390,7 +5789,7 @@ ac_config_files="$ac_config_files Makefile.common"
>
> ac_config_files="$ac_config_files Makefile.config"
>
> -ac_config_files="$ac_config_files lib/J3/Classpath/Classpath.h"
> +ac_config_files="$ac_config_files lib/J3/ClassLib/Classpath.h"
>
> ac_config_files="$ac_config_files tools/llcj/LinkPaths.h"
>
> @@ -5468,10 +5867,21 @@ $as_echo "$as_me: WARNING: cache variable
> $ac_var contains a newline" >&2;} ;;
> :end' >>confcache
> if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
> if test -w "$cache_file"; then
> - test "x$cache_file" != "x/dev/null" &&
> + if test "x$cache_file" != "x/dev/null"; then
> { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file"
> >&5
> $as_echo "$as_me: updating cache $cache_file" >&6;}
> - cat confcache >$cache_file
> + if test ! -f "$cache_file" || test -h "$cache_file"; then
> + cat confcache >"$cache_file"
> + else
> + case $cache_file in #(
> + */* | ?:*)
> + mv -f confcache "$cache_file"$$ &&
> + mv -f "$cache_file"$$ "$cache_file" ;; #(
> + *)
> + mv -f confcache "$cache_file" ;;
> + esac
> + fi
> + fi
> else
> { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable
> cache $cache_file" >&5
> $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
> @@ -5503,7 +5913,7 @@ LTLIBOBJS=$ac_ltlibobjs
>
>
>
> -: ${CONFIG_STATUS=./config.status}
> +: "${CONFIG_STATUS=./config.status}"
> ac_write_fail=0
> ac_clean_files_save=$ac_clean_files
> ac_clean_files="$ac_clean_files $CONFIG_STATUS"
> @@ -5604,6 +6014,7 @@ fi
> IFS=" "" $as_nl"
>
> # Find who we are. Look in the path if we contain no directory separator.
> +as_myself=
> case $0 in #((
> *[\\/]* ) as_myself=$0 ;;
> *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> @@ -5911,7 +6322,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
> # values after options handling.
> ac_log="
> This file was extended by vmkit $as_me 0.30svn, which was
> -generated by GNU Autoconf 2.67. Invocation command line was
> +generated by GNU Autoconf 2.68. Invocation command line was
>
> CONFIG_FILES = $CONFIG_FILES
> CONFIG_HEADERS = $CONFIG_HEADERS
> @@ -5977,7 +6388,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
> s/[\\""\`\$]/\\\\&/g'`"
> ac_cs_version="\\
> vmkit config.status 0.30svn
> -configured by $0, generated by GNU Autoconf 2.67,
> +configured by $0, generated by GNU Autoconf 2.68,
> with options \\"\$ac_cs_config\\"
>
> Copyright (C) 2010 Free Software Foundation, Inc.
> @@ -6107,13 +6518,13 @@ do
> "include/mvm/Config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS
> include/mvm/Config/config.h" ;;
> "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
> "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
> - "lib/J3/Classpath/Classpath.h") CONFIG_FILES="$CONFIG_FILES
> lib/J3/Classpath/Classpath.h" ;;
> + "lib/J3/ClassLib/Classpath.h") CONFIG_FILES="$CONFIG_FILES
> lib/J3/ClassLib/Classpath.h" ;;
> "tools/llcj/LinkPaths.h") CONFIG_FILES="$CONFIG_FILES
> tools/llcj/LinkPaths.h" ;;
> "mmtk/java/src/org/j3/config/Selected.java")
> CONFIG_FILES="$CONFIG_FILES mmtk/java/src/org/j3/config/Selected.java"
> ;;
> "mmtk/java/build.xml") CONFIG_FILES="$CONFIG_FILES mmtk/java/build.xml"
> ;;
> "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
>
> - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5
> ;;
> + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
> esac
> done
>
> @@ -6136,9 +6547,10 @@ fi
> # after its creation but before its name has been assigned to `$tmp'.
> $debug ||
> {
> - tmp=
> + tmp= ac_tmp=
> trap 'exit_status=$?
> - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit
> $exit_status
> + : "${ac_tmp:=$tmp}"
> + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
> ' 0
> trap 'as_fn_exit 1' 1 2 13 15
> }
> @@ -6146,12 +6558,13 @@ $debug ||
>
> {
> tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
> - test -n "$tmp" && test -d "$tmp"
> + test -d "$tmp"
> } ||
> {
> tmp=./conf$$-$RANDOM
> (umask 077 && mkdir "$tmp")
> } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
> +ac_tmp=$tmp
>
> # Set up the scripts for CONFIG_FILES section.
> # No need to generate them if there are no CONFIG_FILES.
> @@ -6173,7 +6586,7 @@ else
> ac_cs_awk_cr=$ac_cr
> fi
>
> -echo 'BEGIN {' >"$tmp/subs1.awk" &&
> +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
> _ACEOF
>
>
> @@ -6201,7 +6614,7 @@ done
> rm -f conf$$subs.sh
>
> cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
> +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
> _ACEOF
> sed -n '
> h
> @@ -6249,7 +6662,7 @@ t delim
> rm -f conf$$subs.awk
> cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> _ACAWK
> -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
> +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
> for (key in S) S_is_set[key] = 1
> FS = " "
>
> @@ -6281,7 +6694,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1;
> then
> sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
> else
> cat
> -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
> +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
> || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
> _ACEOF
>
> @@ -6315,7 +6728,7 @@ fi # test -n "$CONFIG_FILES"
> # No need to generate them if there are no CONFIG_HEADERS.
> # This happens for instance with `./config.status Makefile'.
> if test -n "$CONFIG_HEADERS"; then
> -cat >"$tmp/defines.awk" <<\_ACAWK ||
> +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
> BEGIN {
> _ACEOF
>
> @@ -6327,8 +6740,8 @@ _ACEOF
> # handling of long lines.
> ac_delim='%!_!# '
> for ac_last_try in false false :; do
> - ac_t=`sed -n "/$ac_delim/p" confdefs.h`
> - if test -z "$ac_t"; then
> + ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
> + if test -z "$ac_tt"; then
> break
> elif $ac_last_try; then
> as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
> @@ -6429,7 +6842,7 @@ do
> esac
> case $ac_mode$ac_tag in
> :[FHL]*:*);;
> - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
> + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
> :[FH]-) ac_tag=-:-;;
> :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
> esac
> @@ -6448,7 +6861,7 @@ do
> for ac_f
> do
> case $ac_f in
> - -) ac_f="$tmp/stdin";;
> + -) ac_f="$ac_tmp/stdin";;
> *) # Look for the file first in the build tree, then in the source
> tree
> # (if the path is not absolute). The absolute path cannot be
> DOS-style,
> # because $ac_f cannot contain `:'.
> @@ -6457,7 +6870,7 @@ do
> [\\/$]*) false;;
> *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
> esac ||
> - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
> + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
> esac
> case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed
> "s/'/'\\\\\\\\''/g"`;; esac
> as_fn_append ac_file_inputs " '$ac_f'"
> @@ -6483,8 +6896,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
> esac
>
> case $ac_tag in
> - *:-:* | *:-) cat >"$tmp/stdin" \
> - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
> + *:-:* | *:-) cat >"$ac_tmp/stdin" \
> + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
> esac
> ;;
> esac
> @@ -6614,21 +7027,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
> s&@INSTALL@&$ac_INSTALL&;t t
> $ac_datarootdir_hack
> "
> -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f
> "$tmp/subs.awk" >$tmp/out \
> - || as_fn_error $? "could not create $ac_file" "$LINENO" 5
> +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk"
> \
> + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
>
> test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
> - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; }
> &&
> - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test
> -z "$ac_out"; } &&
> + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out";
> } &&
> + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
> + "$ac_tmp/out"`; test -z "$ac_out"; } &&
> { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains
> a reference to the variable \`datarootdir'
> which seems to be undefined. Please make sure it is defined" >&5
> $as_echo "$as_me: WARNING: $ac_file contains a reference to the
> variable \`datarootdir'
> which seems to be undefined. Please make sure it is defined" >&2;}
>
> - rm -f "$tmp/stdin"
> + rm -f "$ac_tmp/stdin"
> case $ac_file in
> - -) cat "$tmp/out" && rm -f "$tmp/out";;
> - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
> + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
> + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
> esac \
> || as_fn_error $? "could not create $ac_file" "$LINENO" 5
> ;;
> @@ -6639,20 +7053,20 @@ which seems to be undefined. Please make sure
> it is defined" >&2;}
> if test x"$ac_file" != x-; then
> {
> $as_echo "/* $configure_input */" \
> - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
> - } >"$tmp/config.h" \
> + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
> + } >"$ac_tmp/config.h" \
> || as_fn_error $? "could not create $ac_file" "$LINENO" 5
> - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
> + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
> { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
> $as_echo "$as_me: $ac_file is unchanged" >&6;}
> else
> rm -f "$ac_file"
> - mv "$tmp/config.h" "$ac_file" \
> + mv "$ac_tmp/config.h" "$ac_file" \
> || as_fn_error $? "could not create $ac_file" "$LINENO" 5
> fi
> else
> $as_echo "/* $configure_input */" \
> - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
> + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
> || as_fn_error $? "could not create -" "$LINENO" 5
> fi
> ;;
> --
> 1.7.5.1
>
> _______________________________________________
> vmkit-commits mailing list
> vmkit-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111024/dcce7a08/attachment.html>
More information about the vmkit-commits
mailing list