1.1 --- a/common/autoconf/basics.m4 Wed May 22 13:49:12 2013 +0100
1.2 +++ b/common/autoconf/basics.m4 Wed May 22 17:26:31 2013 +0200
1.3 @@ -23,14 +23,23 @@
1.4 # questions.
1.5 #
1.6
1.7 +# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
1.8 +# If so, then append $1 to $2\
1.9 +# Also set JVM_ARG_OK to true/false depending on outcome.
1.10 AC_DEFUN([ADD_JVM_ARG_IF_OK],
1.11 [
1.12 - # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
1.13 - # If so, then append $1 to $2
1.14 - FOUND_WARN=`$3 $1 -version 2>&1 | grep -i warn`
1.15 - FOUND_VERSION=`$3 $1 -version 2>&1 | grep " version \""`
1.16 + $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
1.17 + $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
1.18 + OUTPUT=`$3 $1 -version 2>&1`
1.19 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
1.20 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
1.21 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
1.22 $2="[$]$2 $1"
1.23 + JVM_ARG_OK=true
1.24 + else
1.25 + $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
1.26 + $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
1.27 + JVM_ARG_OK=false
1.28 fi
1.29 ])
1.30
