libbluray | branch: master | Sebastian Ramacher <[email protected]> | Wed Dec 2 11:34:52 2015 +0200| [4e6c4a8078696db4c38983cae3ddb06afb713655] | committer: hpi1
configure: add extra argument to enable building of JAR file > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=4e6c4a8078696db4c38983cae3ddb06afb713655 --- Makefile.am | 4 ++++ configure.ac | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 300deec..860f246 100644 --- a/Makefile.am +++ b/Makefile.am @@ -186,10 +186,12 @@ endif if USING_BDJAVA +if USING_BDJAVA_BUILD_JAR jardir=$(datadir)/java/ jar_DATA=$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local +endif libbluray_la_SOURCES += \ src/libbluray/bdj/bdj.h \ @@ -214,6 +216,7 @@ libbluray_la_SOURCES += \ AM_CFLAGS += $(BDJAVA_CFLAGS) +if USING_BDJAVA_BUILD_JAR all-local: ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ @@ -229,6 +232,7 @@ clean-local: -Dversion='$(BDJ_TYPE)-$(VERSION)' \ clean endif +endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = src/libbluray.pc diff --git a/configure.ac b/configure.ac index be309c6..8381b38 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,12 @@ AC_ARG_ENABLE([udf], [enable_udf=$enableval], [enable_udf=yes]) +AC_ARG_ENABLE([bdjava-jar], + [AS_HELP_STRING([--enable-bdjava-jar], + [enable JAR file for BD-Java support (default is no)])], + [use_bdjava_jar=$enableval], + [use_bdjava_jar=no]) + AC_ARG_WITH([libxml2], [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])]) @@ -226,7 +232,7 @@ if [[ $use_bdjava = "yes" ]]; then ]) AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) - if test "x$HAVE_ANT" = "xno"; then + 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.]) fi @@ -235,6 +241,7 @@ if [[ $use_bdjava = "yes" ]]; then AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) fi AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ]) +AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) dnl BD-J type if test "$BDJ_TYPE" = "j2me"; then @@ -294,6 +301,7 @@ echo " --------" echo " BD-J support: $use_bdjava" if [[ $use_bdjava = "yes" ]]; then echo " BD-J type: $BDJ_TYPE" +echo " build JAR: $use_bdjava_jar" if test x"$BDJ_BOOTCLASSPATH" != x""; then echo " BD-J bootclasspath: $BDJ_BOOTCLASSPATH" fi _______________________________________________ libbluray-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libbluray-devel
