2018-06-08 06:22:51 +01:00
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
|
|
index 5fd3c8de..7ae343e0 100644
|
|
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
|
|
|
|
@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
|
|
|
|
|
AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
|
2015-02-22 03:39:37 +00:00
|
|
|
fi
|
|
|
|
|
|
2018-06-08 06:22:51 +01:00
|
|
|
+if test "x$use_bdjava_jar" = "xyes"; then
|
|
|
|
|
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
|
|
|
|
|
+fi
|
|
|
|
|
+
|
|
|
|
|
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
|
|
|
|
|
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
|
|
|
|
|
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
|
|
|
|
|
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
|
|
|
|
|
index 511ad533..e273b9e0 100644
|
|
|
|
|
--- a/src/libbluray/bdj/bdj.c
|
|
|
|
|
+++ b/src/libbluray/bdj/bdj.c
|
|
|
|
|
@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
|
|
|
|
|
// pre-defined search paths for libbluray.jar
|
|
|
|
|
static const char * const jar_paths[] = {
|
|
|
|
|
#ifndef _WIN32
|
2015-02-22 03:39:37 +00:00
|
|
|
+ JARDIR "/" BDJ_JARFILE,
|
2015-05-18 15:04:50 +01:00
|
|
|
"/usr/share/java/" BDJ_JARFILE,
|
|
|
|
|
"/usr/share/libbluray/lib/" BDJ_JARFILE,
|
2015-02-22 03:39:37 +00:00
|
|
|
#endif
|
