[SCM] libbluray/master: Don't fail if ant is not there and we don't build the jar

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fa3baee50a29fc82f200a3750b6bb66e4ae9a45a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Aug 4 21:27:03 2014 +0200

    Don't fail if ant is not there and we don't build the jar

diff --git a/debian/patches/03_split-jar-build-for-arch-all.patch b/debian/patches/03_split-jar-build-for-arch-all.patch
index fe986d4..bdbc6ae 100644
--- a/debian/patches/03_split-jar-build-for-arch-all.patch
+++ b/debian/patches/03_split-jar-build-for-arch-all.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-02-09
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -80,6 +80,12 @@
+@@ -83,6 +83,12 @@
    [use_bdjava=$enableval],
    [use_bdjava=no])
  
@@ -21,7 +21,16 @@ Last-Update: 2014-02-09
  AC_ARG_WITH([libxml2],
    [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])])
  
-@@ -204,6 +210,7 @@
+@@ -204,7 +210,7 @@
+   ])
+ 
+   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
+ 
+@@ -213,6 +219,7 @@
    AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
  fi
  AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
@@ -29,7 +38,7 @@ Last-Update: 2014-02-09
  
  dnl BD-J type
  if test "$BDJ_TYPE" = "j2me"; then
-@@ -245,6 +252,7 @@
+@@ -254,6 +261,7 @@
  echo "  BD-J support:                  $use_bdjava"
  if [[ $use_bdjava = "yes" ]]; then
  echo "  BD-J type:                     $BDJ_TYPE"

-- 
libbluray packaging