< prev index next >
make/autoconf/generated-configure.sh
Print this page
*** 1094,1103 ****
--- 1094,1104 ----
htmldir
infodir
docdir
oldincludedir
includedir
+ runstatedir
localstatedir
sharedstatedir
sysconfdir
datadir
datarootdir
*** 1383,1392 ****
--- 1384,1394 ----
datarootdir='${prefix}/share'
datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+ runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
*** 1635,1644 ****
--- 1637,1655 ----
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
| --sbi=* | --sb=*)
sbindir=$ac_optarg ;;
*** 1772,1782 ****
# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
! libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
case $ac_val in
*/ )
--- 1783,1793 ----
# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
! libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
case $ac_val in
*/ )
*** 1925,1934 ****
--- 1936,1946 ----
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
*** 5174,5184 ****
# definitions. It is replaced with custom functionality when building
# custom sources.
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1513805283
###############################################################################
#
# Initialization / Boot-strapping
#
--- 5186,5196 ----
# definitions. It is replaced with custom functionality when building
# custom sources.
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1516716346
###############################################################################
#
# Initialization / Boot-strapping
#
*** 15718,15727 ****
--- 15730,15743 ----
;;
*mingw*)
VAR_OS=windows
VAR_OS_ENV=windows.msys
;;
+ *wsl*)
+ VAR_OS=windows
+ VAR_OS_ENV=windows.wsl
+ ;;
*aix*)
VAR_OS=aix
VAR_OS_TYPE=unix
;;
*)
*** 15905,15914 ****
--- 15921,15934 ----
;;
*mingw*)
VAR_OS=windows
VAR_OS_ENV=windows.msys
;;
+ *wsl*)
+ VAR_OS=windows
+ VAR_OS_ENV=windows.wsl
+ ;;
*aix*)
VAR_OS=aix
VAR_OS_TYPE=unix
;;
*)
*** 16557,16568 ****
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSYS_ROOT_PATH" >&5
$as_echo "$MSYS_ROOT_PATH" >&6; }
WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH"
else
! as_fn_error $? "Unknown Windows environment. Neither cygwin nor msys was detected." "$LINENO" 5
fi
# Test if windows or unix (cygwin/msys) find is first in path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what kind of 'find' is first on the PATH" >&5
$as_echo_n "checking what kind of 'find' is first on the PATH... " >&6; }
--- 16577,16599 ----
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSYS_ROOT_PATH" >&5
$as_echo "$MSYS_ROOT_PATH" >&6; }
WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking wsl kernel" >&5
+ $as_echo_n "checking wsl kernel... " >&6; }
+ WSL_KERNEL_VERSION=`$UNAME -r`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WSL_KERNEL_VERSION" >&5
+ $as_echo "$WSL_KERNEL_VERSION" >&6; }
+
+ WINDOWS_ENV_VENDOR='wsl'
+ WINDOWS_ENV_VERSION="$WSL_KERNEL_VERSION"
+
+ WINDOWS_ENV_ROOT_PATH="/mnt/c"
else
! as_fn_error $? "Unknown Windows environment: $OPENJDK_BUILD_OS_ENV " "$LINENO" 5
fi
# Test if windows or unix (cygwin/msys) find is first in path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what kind of 'find' is first on the PATH" >&5
$as_echo_n "checking what kind of 'find' is first on the PATH... " >&6; }
*** 17937,17946 ****
--- 17968,17979 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 18321,18330 ****
--- 18354,18365 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 18710,18719 ****
--- 18745,18756 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 19093,19102 ****
--- 19130,19141 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 19499,19508 ****
--- 19538,19549 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 19883,19892 ****
--- 19924,19935 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 20272,20281 ****
--- 20315,20326 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 20655,20664 ****
--- 20700,20711 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
*** 21086,21095 ****
--- 21133,21144 ----
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
MAKE_EXPECTED_ENV='cygwin'
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
MAKE_EXPECTED_ENV='msys'
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+ MAKE_EXPECTED_ENV='.'
else
as_fn_error $? "Unknown Windows environment" "$LINENO" 5
fi
MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
< prev index next >