From 749d758bd237bb91024a89ded6a989add71baffc Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 18 Apr 2018 16:17:55 +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
---
 configure.ac                | Bin 464688 -> 465416 bytes
 odk/CustomTarget_check.mk   |   2 +-
 odk/Module_odk.mk           |   6 ++++--
 odk/util/check.pl           |   2 +-
 scp2/InstallModule_sdkoo.mk |   6 ++++++
 scp2/source/sdkoo/sdkoo.scp |   2 ++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a3c3c7023dc1b34e3499926875aa455dd9a747b5..ffbfd958ddb23e7b91966c630d925d18f1e51f89 100644
GIT binary patch
delta 569
zcmY*WO=}ZT6y@bkrZZy`X`|^_Q+zW8KcG^J?n<Ds1!ELj5L76kiOxu?Az37?2rja)
zM)9M;DIQP+$x2+*m!VMIh$y(~!o8dR1B-D{q*PzW5a@%$d-vXR?z!A2RuT_a6V+9A
z)ruHgp6Ofpg}hU`;nknUF~C_*S37}e&iXsSJ<g6P8A-)k&Ia{1hdbWNhqyL5ae)W5
z7H4Pi`zW(eI>>rE;#7>qkmf9QB(Tg54gI&iGgq0NX}3z=b<5dW+F}x+wX{X!&mfjn
zwZ|>yuNT~zl5^YUR+1M>-goPOSDn|vm*@n(2<k<x!6MjLU>c@gsa+l4yd5$<aZ$nM
zdpeD4_rp<$C5mEHkcmHkr6yNZ732h2sD334i-Hd0-3}$N^Mee064dWK?%t1Fi*@78
zHVdOAs1KVBio<Nu2(~sTwp)!N`yw<5&O#daVpv0cnId@Jq*EAsq{^{Al7eqd8o=;R
z)`uy`Fv$IC(n&P7nCV^8H4OWd#OK#?l7df%@ZbrVXY}1)nlF~!3eTjjq$VcE4gKa^
zut0gag|ZvG_b^cN>G(*Se*W^gj8xe?$!)o0dz4pZ-J+rIQ5dq9fw65hf%;3@S6lZ<
NLXilst^2Cu`~!6rzp(%S

delta 231
zcmXBMu}cDB00nUF-hJO0(ODv9b%WX@A}BfpVY6f4;ObD|*xV2zg3=Hj4sVNF+EVoH
zyBu?Da}NXm0%?eFQ95z>z2QB0J!OxEc1vmXba$1}Li%KtLHUU<ZMo0Nt&DJ5Gemz;
z5^Ri7<<}S`UcMp8tQSVhL5y_|Ha`?hK5V<0gE;5UusHRQU~X+#y#Cbp=ys&RKM%+J
zdDSc~9Y|(<<am)1N8C_9XCsLS?*=$v;G?iR{q=Fm?*XFBE9Co$+9B^1D%<gd@1`DQ
ZF~Av@SHk4%5wWftAY_EZ#0_Ng<{uvjSj+$b

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 109a0c924ca..bed36df6198 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,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_lib) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 1dea6578c88..ee1679b6f84 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,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 8dfbfcc6ba5..cade5a9a098 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")) {
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 0669195323f..09a89f5c323 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -17,6 +17,12 @@ $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
 ))
 endif
 
+ifneq ($(JAVADOC),)
+$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
+	-DJAVADOC \
+))
+endif
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
     scp2/source/sdkoo/sdkoo \
 ))
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f73e3e8ef59..abfeb880320 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -126,6 +126,7 @@ File gid_File_Package_odk_html
 End
 
 #if defined(ENABLE_JAVA)
+#if defined(JAVADOC)
 File gid_File_Package_odk_javadoc
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;
@@ -133,6 +134,7 @@ File gid_File_Package_odk_javadoc
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 #endif
+#endif
 
 File gid_File_Package_odk_lib
     TXT_FILE_BODY;
-- 
2.30.2