Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-release-src > by-pkgid > 54ce8541e23a4764f8e42d2087decea1 > files > 1

javasqlite-20140624-3.mga5.src.rpm

From 36e836c23857efec68d8788985e9e475f8710283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 26 Jun 2014 12:55:38 +0300
Subject: [PATCH] Make buildable with Java 1.8

---
 configure    | 2 +-
 configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index cd012c7..fda57ea 100755
--- a/configure
+++ b/configure
@@ -11616,6 +11616,7 @@ if test "x$JDBCVER"  = "x" ; then
   $JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y
   $JAVA_RUN -version 2>&1 | grep 'version "1.6' >/dev/null && JDBCVER=JDBC2z
   $JAVA_RUN -version 2>&1 | grep 'version "1.7' >/dev/null && JDBCVER=JDBC2z1
+  $JAVA_RUN -version 2>&1 | grep 'version "1.8' >/dev/null && JDBCVER=JDBC2z1
   $JAVA_RUN -version 2>&1 | grep 'JSR169' >/dev/null && JDBCVER=JDBC0
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: overriding JDBC driver: $JDBCVER" >&5
diff --git a/configure.in b/configure.in
index 317fc0e..c620bb6 100644
--- a/configure.in
+++ b/configure.in
@@ -566,6 +566,7 @@ if test "x$JDBCVER"  = "x" ; then
   $JAVA_RUN -version 2>&1 | grep 'version "1.5' >/dev/null && JDBCVER=JDBC2y
   $JAVA_RUN -version 2>&1 | grep 'version "1.6' >/dev/null && JDBCVER=JDBC2z
   $JAVA_RUN -version 2>&1 | grep 'version "1.7' >/dev/null && JDBCVER=JDBC2z1
+  $JAVA_RUN -version 2>&1 | grep 'version "1.8' >/dev/null && JDBCVER=JDBC2z1
   $JAVA_RUN -version 2>&1 | grep 'JSR169' >/dev/null && JDBCVER=JDBC0
 else
   AC_MSG_WARN([overriding JDBC driver: $JDBCVER])
-- 
1.9.3