From 3de6ce9f81e0efe096ef3e5c9d8545d3ddd33c9c Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 25 Jul 2017 21:30:57 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 454961 -> 455689 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 53a04ddaf42..0ab7edca475 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -863,7 +863,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index e310c55ecec720fb79e5d36b9736421dbd731a9b..f767eae73ad307dc3cce3d9c0b6679851ee5f5b5 100644
GIT binary patch
delta 521
zcmY*VOG_J380F@>8D|EK6=|#{l4(Mwfl43hMoRDrttm7WCD4{s(q@XbAubXtf`W@m
z5M4Q#vk}@&A*-1Q2-%2c<;I1SZnNs9qWA+`wYSp{@WSEV`+esDr}`_fbspF_U^U&R
zYT~^4nE9N^F1=5iGY@ZLJ<7V;niC|$tgrQHMA<!_5M0PQizrQwmNkDI`sL)*bIsk&
z>TCj$UN+Ry?M0a$a+A^n1OF3O7K;n>O@sKVQAn36Iur2JDmqP<VCN)BHS(EvIb(h)
z`w8{~PoLR8qQYm<Gt|$SjF*hJwIXKLcn~RzhOlYTFfJ6{h2vfF;?$y`SywrJTNHwN
z;titlT2c_PDPV55cj8t<>VU&I$19t9%AEV5nIz$hP4^Ky;N9hY?!)K~MZ``vLs1!*
zHpN}fv0lazbLcLPxJSm<YwASZFLBH{^cW}K>5lnAk+J7c9LL{C!B0nwQhIm!E%Od5
z|GHn!7mT8o7*CB)B_~zo!=l@dxQtxEaNjo=xN<1=s7armeVP!euol<CqQmeLt+-(1
bRpo|46<#>2P^>gqB>^trtqoSCKcjyE^5>^S

delta 207
zcmeBtA-(aDbi)?L?P~228jL{9v^_$D*{XfI!Ww4o>FdndI3~+la!v2<W0sh{pooQc
z`s?+~%F`V-FdI*ongSH--vA^!0$F*dCrn{xoxXPiv&{6n8<^#%pQ>OJnZB-qg$txZ
zY`Xe4X3^;nLRdMb-`mT~Ha%e@v+(o-ZA^UAJ2x^LPQSU9*>k$|CT0VWUXJO}o0ui1
zYu{tzp5DI+C@c1iSz!8uP0Y5_RW}1Au3u#3pFVvvvvm90&CEc|0>rG_-)?4;aR2~0
C)le7!

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index dc983e2f67d..538409f7aee 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index a72102c9b95..321d76dc6a8 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,11 +42,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2