diff options
| author | Deepak Bhole <[email protected]> | 2012-09-17 16:40:25 -0400 |
|---|---|---|
| committer | Deepak Bhole <[email protected]> | 2012-09-17 16:40:25 -0400 |
| commit | 213d115df151044458968274cca3352d81e6da93 (patch) | |
| tree | b11cce19856d7148e2c61ecb493e4316ee863b8c /acinclude.m4 | |
| parent | 0981b57894fefab486ac7b2fad37690ad1a139b6 (diff) | |
PR1161: X509VariableTrustManager does not work correctly with OpenJDK7
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1ab4c9a..fc22891 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -715,9 +715,12 @@ AC_DEFUN_ONCE([IT_FIND_JAVA], AC_MSG_RESULT(${JAVA}) AC_SUBST(JAVA) JAVA_VERSION=`$JAVA -version 2>&1 | sed -n '1s/@<:@^"@:>@*"\(.*\)"$/\1/p'` - case "${JAVA_VERSION}" in - 1.7*) VERSION_DEFS='-DHAVE_JAVA7';; - esac + HAVE_JAVA7=`echo $JAVA_VERSION | awk '{if ($(0) >= 1.7) print "yes"}'` + if ! test -z "$HAVE_JAVA7" ; then + VERSION_DEFS='-DHAVE_JAVA7' + fi + + AM_CONDITIONAL([HAVE_JAVA7], test x"${HAVE_JAVA7}" = "xyes" ) AC_SUBST(VERSION_DEFS) ]) |