jdk-sandbox: comparison make/autoconf/basics.m4

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 $1="$2:[$]$1"
 fi
 fi
 ])
+################################################################################
+# This will make a path absolute. Assumes it's already a unix path. Also
+# resolves ~ to homedir.
+AC_DEFUN([BASIC_ABSOLUTE_PATH],
+[
+if test "x[$]$1" != x; then
+new_path="[$]$1"
+# Use eval to expand a potential ~. This technique does not work if there
+# are spaces in the path (which is valid at this point on Windows), so only
+# try to apply it if there is an actual ~ first in the path.
+if [ [[ "$new_path" = "~"* ]] ]; then
+eval new_path="$new_path"
+if test ! -f "$new_path" && test ! -d "$new_path"; then
+AC_MSG_ERROR([The new_path of $1, which resolves as "$new_path", is not found.])
+fi
+fi
+if test -d "$new_path"; then
+$1="`cd "$new_path"; $THEPWDCMD -L`"
+else
+dir="`$DIRNAME "$new_path"`"
+base="`$BASENAME "$new_path"`"
+$1="`cd "$dir"; $THEPWDCMD -L`/$base"
+fi
+fi
+])
 ###############################################################################
 # This will make sure the given variable points to a full and proper
 # path. This means:
 # 1) There will be no spaces in the path. On unix platforms,
 #    spaces in the path will result in an error. On Windows,
 #     cygwin).
 # $1: The name of the variable to fix
 AC_DEFUN([BASIC_FIXUP_PATH],
 [
 # Only process if variable expands to non-empty
 if test "x[$]$1" != x; then
 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 BASIC_FIXUP_PATH_CYGWIN($1)
 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
 BASIC_FIXUP_PATH_MSYS($1)
 if test "x$has_space" != x; then
 AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
 AC_MSG_ERROR([Spaces are not allowed in this path.])
 fi
-# Use eval to expand a potential ~
+BASIC_ABSOLUTE_PATH(path)
-eval path="$path"
+$1="$path"
-if test ! -f "$path" && test ! -d "$path"; then
-AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
-fi
-if test -d "$path"; then
-$1="`cd "$path"; $THEPWDCMD -L`"
-else
-dir="`$DIRNAME "$path"`"
-base="`$BASENAME "$path"`"
-$1="`cd "$dir"; $THEPWDCMD -L`/$base"
-fi
 fi
 fi
 ])
 ###############################################################################
 # AUTOCONF might be set in the environment by the user. Preserve for "make reconfigure".
 AC_SUBST(AUTOCONF)
 # Save the path variable before it gets changed
 ORIGINAL_PATH="$PATH"
 AC_SUBST(ORIGINAL_PATH)
-DATE_WHEN_CONFIGURED=`LANG=C date`
+DATE_WHEN_CONFIGURED=`date`
 AC_SUBST(DATE_WHEN_CONFIGURED)
 AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
 ])
 ###############################################################################
 # First remove it from the list of overridden variables, so we can test
 # for unknown variables in the end.
 CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
+tool_override=[$]$1
+AC_MSG_NOTICE([User supplied override $1="$tool_override"])
 # Check if we try to supply an empty value
-if test "x[$]$1" = x; then
+if test "x$tool_override" = x; then
-AC_MSG_NOTICE([Setting user supplied tool $1= (no value)])
 AC_MSG_CHECKING([for $1])
 AC_MSG_RESULT([disabled])
 else
+# Split up override in command part and argument part
+tool_and_args=($tool_override)
+[ tool_command=${tool_and_args[0]} ]
+[ unset 'tool_and_args[0]' ]
+[ tool_args=${tool_and_args[@]} ]
 # Check if the provided tool contains a complete path.
-tool_specified="[$]$1"
+tool_basename="${tool_command##*/}"
-tool_basename="${tool_specified##*/}"
+if test "x$tool_basename" = "x$tool_command"; then
-if test "x$tool_basename" = "x$tool_specified"; then
 # A command without a complete path is provided, search $PATH.
-AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
+AC_MSG_NOTICE([Will search for user supplied tool "$tool_basename"])
 AC_PATH_PROG($1, $tool_basename)
 if test "x[$]$1" = x; then
-AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
+AC_MSG_ERROR([User supplied tool $1="$tool_basename" could not be found])
 fi
 else
 # Otherwise we believe it is a complete path. Use it as it is.
-AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
+AC_MSG_NOTICE([Will use user supplied tool "$tool_command"])
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $tool_command])
-if test ! -x "$tool_specified"; then
+if test ! -x "$tool_command"; then
 AC_MSG_RESULT([not found])
-AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
+AC_MSG_ERROR([User supplied tool $1="$tool_command" does not exist or is not executable])
 fi
-AC_MSG_RESULT([$tool_specified])
+$1="$tool_command"
+AC_MSG_RESULT([found])
+fi
+if test "x$tool_args" != x; then
+# If we got arguments, re-append them to the command after the fixup.
+$1="[$]$1 $tool_args"
 fi
 fi
 fi
 $3
 fi
 TAR_TYPE="bsd"
 elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then
 TAR_TYPE="bsd"
 elif test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
 TAR_TYPE="solaris"
+elif test "x$OPENJDK_BUILD_OS" = "xaix"; then
+TAR_TYPE="aix"
 fi
 AC_MSG_CHECKING([what type of tar was found])
 AC_MSG_RESULT([$TAR_TYPE])
 TAR_CREATE_FILE_PARAM=""
 TAR_SUPPORTS_TRANSFORM="true"
 if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
 # When using gnu tar for Solaris targets, need to use compatibility mode
 TAR_CREATE_EXTRA_PARAM="--format=ustar"
 fi
+elif test "x$TAR_TYPE" = "aix"; then
+# -L InputList of aix tar: name of file listing the files and directories
+# that need to be   archived or extracted
+TAR_INCLUDE_PARAM="L"
+TAR_SUPPORTS_TRANSFORM="false"
 else
 TAR_INCLUDE_PARAM="I"
 TAR_SUPPORTS_TRANSFORM="false"
 fi
 AC_SUBST(TAR_TYPE)

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 54490	bf07e140c49c
child 58679	9c3209ff7550