@@ -881,7 +881,6 @@ BOOT_JDK_SOURCETARGET
881881JARSIGNER
882882JAR
883883JAVADOC
884- JAVAH
885884JAVAC
886885JAVA
887886BOOT_JDK
@@ -1093,7 +1092,6 @@ infodir
10931092docdir
10941093oldincludedir
10951094includedir
1096- runstatedir
10971095localstatedir
10981096sharedstatedir
10991097sysconfdir
@@ -1300,7 +1298,6 @@ SETFILE
13001298PKG_CONFIG
13011299JAVA
13021300JAVAC
1303- JAVAH
13041301JAVADOC
13051302JAR
13061303JARSIGNER
@@ -1384,7 +1381,6 @@ datadir='${datarootdir}'
13841381sysconfdir='${prefix}/etc'
13851382sharedstatedir='${prefix}/com'
13861383localstatedir='${prefix}/var'
1387- runstatedir='${localstatedir}/run'
13881384includedir='${prefix}/include'
13891385oldincludedir='/usr/include'
13901386docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1637,15 +1633,6 @@ do
16371633 | -silent | --silent | --silen | --sile | --sil)
16381634 silent=yes ;;
16391635
1640- -runstatedir | --runstatedir | --runstatedi | --runstated \
1641- | --runstate | --runstat | --runsta | --runst | --runs \
1642- | --run | --ru | --r)
1643- ac_prev=runstatedir ;;
1644- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1645- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1646- | --run=* | --ru=* | --r=*)
1647- runstatedir=$ac_optarg ;;
1648-
16491636 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
16501637 ac_prev=sbindir ;;
16511638 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
17831770for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
17841771 datadir sysconfdir sharedstatedir localstatedir includedir \
17851772 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1786- libdir localedir mandir runstatedir
1773+ libdir localedir mandir
17871774do
17881775 eval ac_val=\$$ac_var
17891776 # Remove trailing slashes.
@@ -1936,7 +1923,6 @@ Fine tuning of the installation directories:
19361923 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
19371924 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
19381925 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1939- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
19401926 --libdir=DIR object code libraries [EPREFIX/lib]
19411927 --includedir=DIR C header files [PREFIX/include]
19421928 --oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2271,7 +2257,6 @@ Some influential environment variables:
22712257 PKG_CONFIG path to pkg-config utility
22722258 JAVA Override default value for JAVA
22732259 JAVAC Override default value for JAVAC
2274- JAVAH Override default value for JAVAH
22752260 JAVADOC Override default value for JAVADOC
22762261 JAR Override default value for JAR
22772262 JARSIGNER Override default value for JARSIGNER
@@ -5187,7 +5172,7 @@ VS_SDK_PLATFORM_NAME_2013=
51875172#CUSTOM_AUTOCONF_INCLUDE
51885173
51895174# Do not change or remove the following line, it is needed for consistency checks:
5190- DATE_WHEN_GENERATED=1513702260
5175+ DATE_WHEN_GENERATED=1513805283
51915176
51925177###############################################################################
51935178#
@@ -30920,144 +30905,6 @@ $as_echo "$tool_specified" >&6; }
3092030905
3092130906
3092230907
30923- # Use user overridden value if available, otherwise locate tool in the Boot JDK.
30924-
30925- # Publish this variable in the help.
30926-
30927-
30928- if [ -z "${JAVAH+x}" ]; then
30929- # The variable is not set by user, try to locate tool using the code snippet
30930-
30931- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
30932- $as_echo_n "checking for javah in Boot JDK... " >&6; }
30933- JAVAH=$BOOT_JDK/bin/javah
30934- if test ! -x $JAVAH; then
30935- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
30936- $as_echo "not found" >&6; }
30937- { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
30938- $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
30939- as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
30940- fi
30941- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
30942- $as_echo "ok" >&6; }
30943-
30944-
30945- else
30946- # The variable is set, but is it from the command line or the environment?
30947-
30948- # Try to remove the string !JAVAH! from our list.
30949- try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JAVAH!/}
30950- if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
30951- # If it failed, the variable was not from the command line. Ignore it,
30952- # but warn the user (except for BASH, which is always set by the calling BASH).
30953- if test "xJAVAH" != xBASH; then
30954- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&5
30955- $as_echo "$as_me: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&2;}
30956- fi
30957- # Try to locate tool using the code snippet
30958-
30959- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
30960- $as_echo_n "checking for javah in Boot JDK... " >&6; }
30961- JAVAH=$BOOT_JDK/bin/javah
30962- if test ! -x $JAVAH; then
30963- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
30964- $as_echo "not found" >&6; }
30965- { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
30966- $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
30967- as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
30968- fi
30969- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
30970- $as_echo "ok" >&6; }
30971-
30972-
30973- else
30974- # If it succeeded, then it was overridden by the user. We will use it
30975- # for the tool.
30976-
30977- # First remove it from the list of overridden variables, so we can test
30978- # for unknown variables in the end.
30979- CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
30980-
30981- # Check if we try to supply an empty value
30982- if test "x$JAVAH" = x; then
30983- { $as_echo "$as_me:${as_lineno-$LINENO}: Setting user supplied tool JAVAH= (no value)" >&5
30984- $as_echo "$as_me: Setting user supplied tool JAVAH= (no value)" >&6;}
30985- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
30986- $as_echo_n "checking for JAVAH... " >&6; }
30987- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
30988- $as_echo "disabled" >&6; }
30989- else
30990- # Check if the provided tool contains a complete path.
30991- tool_specified="$JAVAH"
30992- tool_basename="${tool_specified##*/}"
30993- if test "x$tool_basename" = "x$tool_specified"; then
30994- # A command without a complete path is provided, search $PATH.
30995- { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JAVAH=$tool_basename" >&5
30996- $as_echo "$as_me: Will search for user supplied tool JAVAH=$tool_basename" >&6;}
30997- # Extract the first word of "$tool_basename", so it can be a program name with args.
30998- set dummy $tool_basename; ac_word=$2
30999- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
31000- $as_echo_n "checking for $ac_word... " >&6; }
31001- if ${ac_cv_path_JAVAH+:} false; then :
31002- $as_echo_n "(cached) " >&6
31003- else
31004- case $JAVAH in
31005- [\\/]* | ?:[\\/]*)
31006- ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
31007- ;;
31008- *)
31009- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
31010- for as_dir in $PATH
31011- do
31012- IFS=$as_save_IFS
31013- test -z "$as_dir" && as_dir=.
31014- for ac_exec_ext in '' $ac_executable_extensions; do
31015- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
31016- ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
31017- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31018- break 2
31019- fi
31020- done
31021- done
31022- IFS=$as_save_IFS
31023-
31024- ;;
31025- esac
31026- fi
31027- JAVAH=$ac_cv_path_JAVAH
31028- if test -n "$JAVAH"; then
31029- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
31030- $as_echo "$JAVAH" >&6; }
31031- else
31032- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
31033- $as_echo "no" >&6; }
31034- fi
31035-
31036-
31037- if test "x$JAVAH" = x; then
31038- as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
31039- fi
31040- else
31041- # Otherwise we believe it is a complete path. Use it as it is.
31042- { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JAVAH=$tool_specified" >&5
31043- $as_echo "$as_me: Will use user supplied tool JAVAH=$tool_specified" >&6;}
31044- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
31045- $as_echo_n "checking for JAVAH... " >&6; }
31046- if test ! -x "$tool_specified"; then
31047- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
31048- $as_echo "not found" >&6; }
31049- as_fn_error $? "User supplied tool JAVAH=$tool_specified does not exist or is not executable" "$LINENO" 5
31050- fi
31051- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
31052- $as_echo "$tool_specified" >&6; }
31053- fi
31054- fi
31055- fi
31056-
31057- fi
31058-
31059-
31060-
3106130908 # Use user overridden value if available, otherwise locate tool in the Boot JDK.
3106230909
3106330910 # Publish this variable in the help.
0 commit comments