equal
deleted
inserted
replaced
97 AC_DEFUN([ADD_JVM_ARG_IF_OK], |
97 AC_DEFUN([ADD_JVM_ARG_IF_OK], |
98 [ |
98 [ |
99 $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD |
99 $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD |
100 $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD |
100 $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD |
101 OUTPUT=`$3 $1 -version 2>&1` |
101 OUTPUT=`$3 $1 -version 2>&1` |
102 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
102 FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn` |
103 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
103 FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""` |
104 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
104 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
105 $2="[$]$2 $1" |
105 $2="[$]$2 $1" |
106 JVM_ARG_OK=true |
106 JVM_ARG_OK=true |
107 else |
107 else |
108 $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD |
108 $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD |
713 SDKNAME=${SDKNAME:-macosx} |
713 SDKNAME=${SDKNAME:-macosx} |
714 fi |
714 fi |
715 |
715 |
716 if test -n "$SDKNAME"; then |
716 if test -n "$SDKNAME"; then |
717 # Call xcodebuild to determine SYSROOT |
717 # Call xcodebuild to determine SYSROOT |
718 SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | grep '^Path: ' | sed 's/Path: //'` |
718 SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | $GREP '^Path: ' | $SED 's/Path: //'` |
719 fi |
719 fi |
720 else |
720 else |
721 if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then |
721 if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then |
722 AC_MSG_ERROR([No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK]) |
722 AC_MSG_ERROR([No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK]) |
723 fi |
723 fi |
992 echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete |
992 echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete |
993 |
993 |
994 TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` |
994 TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` |
995 if test -f $DELETEDIR/TestIfFindSupportsDelete; then |
995 if test -f $DELETEDIR/TestIfFindSupportsDelete; then |
996 # No, it does not. |
996 # No, it does not. |
997 rm $DELETEDIR/TestIfFindSupportsDelete |
997 $RM $DELETEDIR/TestIfFindSupportsDelete |
998 if test "x$OPENJDK_TARGET_OS" = "xaix"; then |
998 if test "x$OPENJDK_TARGET_OS" = "xaix"; then |
999 # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list |
999 # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list |
1000 FIND_DELETE="-print | xargs rm" |
1000 FIND_DELETE="-print | $XARGS $RM" |
1001 else |
1001 else |
1002 FIND_DELETE="-exec rm \{\} \+" |
1002 FIND_DELETE="-exec $RM \{\} \+" |
1003 fi |
1003 fi |
1004 AC_MSG_RESULT([no]) |
1004 AC_MSG_RESULT([no]) |
1005 else |
1005 else |
1006 AC_MSG_RESULT([yes]) |
1006 AC_MSG_RESULT([yes]) |
1007 fi |
1007 fi |
1008 rmdir $DELETEDIR |
1008 $RMDIR $DELETEDIR |
1009 AC_SUBST(FIND_DELETE) |
1009 AC_SUBST(FIND_DELETE) |
1010 ]) |
1010 ]) |
1011 |
1011 |
1012 AC_DEFUN([BASIC_CHECK_TAR], |
1012 AC_DEFUN([BASIC_CHECK_TAR], |
1013 [ |
1013 [ |
1078 BASIC_REQUIRE_PROGS(XATTR, xattr) |
1078 BASIC_REQUIRE_PROGS(XATTR, xattr) |
1079 BASIC_PATH_PROGS(CODESIGN, codesign) |
1079 BASIC_PATH_PROGS(CODESIGN, codesign) |
1080 if test "x$CODESIGN" != "x"; then |
1080 if test "x$CODESIGN" != "x"; then |
1081 # Verify that the openjdk_codesign certificate is present |
1081 # Verify that the openjdk_codesign certificate is present |
1082 AC_MSG_CHECKING([if openjdk_codesign certificate is present]) |
1082 AC_MSG_CHECKING([if openjdk_codesign certificate is present]) |
1083 rm -f codesign-testfile |
1083 $RM codesign-testfile |
1084 touch codesign-testfile |
1084 $TOUCH codesign-testfile |
1085 codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN= |
1085 $CODESIGN -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN= |
1086 rm -f codesign-testfile |
1086 $RM codesign-testfile |
1087 if test "x$CODESIGN" = x; then |
1087 if test "x$CODESIGN" = x; then |
1088 AC_MSG_RESULT([no]) |
1088 AC_MSG_RESULT([no]) |
1089 else |
1089 else |
1090 AC_MSG_RESULT([yes]) |
1090 AC_MSG_RESULT([yes]) |
1091 fi |
1091 fi |