[Libreoffice] [PATCH] Deprecate --enable-java

As far as I can see, <loroot>/build doesn't actually use enable-java,
but it does use with-java. <loroot>/build/libreoffice... makes extensive
use of with-java and no sign of enable-java.

The comment implies that it was only meant to have an impact on --help,
anyway, and moving it to a "with" should be the same.

It now builds fine with the patch, but I get a load of strange warnings.
They don't seem too important, but it would be wise for someone else to
check the patch builds okay.

errror: Longname not in hid.lst:
/home/anthony/gitstuff/loffice/build/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/win/etab_e_g.win
desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER
errror: Longname not in hid.lst:
/home/anthony/gitstuff/loffice/build/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/win/etab_e_g.win
desktop:Edit:TP_USER:ED_USER_FIRST
errror: Longname not in hid.lst:
/home/anthony/gitstuff/loffice/build/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/win/etab_e_g.win
desktop:Edit:TP_USER:ED_USER_LAST
errror: Longname not in hid.lst:
/home/anthony/gitstuff/loffice/build/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/win/etab_e_g.win
desktop:Edit:TP_USER:ED_USER_INITIALS
errror: Longname not in hid.lst:
/home/anthony/gitstuff/loffice/build/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/win/etab_e_g.win
desktop:Edit:TP_USER:ED_USER_FATHER
errror: Longname not in hid.lst:
/home/anthony/gitstuff/loffice/build/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/win/etab_p_s.win
desktop:CheckBox:TP_MIGRATION:CB_MIGRATION
No EPM: do no packaging at this stage

Multiprocessing build is finished
Maximal number of processes run: 3
 __________  ____
|          \ \..|
|           \ \.|
|            \ \|
|             \ |              |       Congratulation ! You have
successfully built
|              | (  )  (  )(  ,)(  ,) (  _)  /  \(  _)(  _)(  )/ _)(  _)
|              |  )(__  )(  ) ,\ )  \  ) _) ( () )) _) ) _) )(( (_  ) _)
|______________| (____)(__)(___/(_)\_)(___)  \__/(_)  (_)  (__)\__)(___)
touch stamp/build


From b13ec97e33b9e2aa99703a94a9549a9f24643c41 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Wed, 27 Oct 2010 16:55:01 +0100
Subject: [PATCH] Deprecate --enable-java

---
 configure.in |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure.in b/configure.in
index 523104b..f4fc947 100755
--- a/configure.in
+++ b/configure.in
@@ -125,6 +125,7 @@ AC_ARG_ENABLE(tests,
   --enable-tests          Enables the execution of the tests.],
 ,)
 
+# DEPRECATED - DELETE AFTER 3.3 IS RELEASED - NOW AN AC_ARG_WITH
 # This is here only to make --help work nicely:
 # Shouldn't this be a --enabe-java or AC_ARG_WITH instead?
 AC_ARG_ENABLE(java,
@@ -288,6 +289,13 @@ AC_ARG_WITH(internal-gcc,
                           binutils 2.18).],
 ,)
 
+# this was wrongly ac_arg_enable
+AC_ARG_WITH(java,
+[
+  --with-java             Build LibO with a JDK & Java support.],
+                         enable_java = "yes" # deprecated - set old flag for the moment
+,)
+
 AC_ARG_WITH(lang,
 [
   --with-lang             Define the localizations to build. The English one is
-- 
1.7.2.2