Re: [Libreoffice] [PATCH] Convert --enable-java to --with-java

2010-11-05 Thread Wols Lists
On 05/11/10 09:53, Rene Engelhard wrote:
> On Fri, Nov 05, 2010 at 08:42:34AM +0100, Sebastian Spaeth wrote:
>> On Thu, 04 Nov 2010 18:24:04 +, Wols Lists  wrote:
>>> +  --with-java Build LibO with a JDK & Java support.],
>> So, what should be the default? Including Java? Then I would argue for
>> making this a --without option and having Java enabled by default... ?
> This is already the case. (Java on per default that is)
>
If that's the case, can we just change the word "with" to "without" in
both places on that line, and apply?

Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [PATCH] Convert --enable-java to --with-java

2010-11-05 Thread Rene Engelhard
On Fri, Nov 05, 2010 at 08:42:34AM +0100, Sebastian Spaeth wrote:
> On Thu, 04 Nov 2010 18:24:04 +, Wols Lists  wrote:
> > +  --with-java Build LibO with a JDK & Java support.],
> 
> So, what should be the default? Including Java? Then I would argue for
> making this a --without option and having Java enabled by default... ?

This is already the case. (Java on per default that is)

Grüße/Regards,

René
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [PATCH] Convert --enable-java to --with-java

2010-11-05 Thread Wols Lists
On 05/11/10 07:42, Sebastian Spaeth wrote:
> On Thu, 04 Nov 2010 18:24:04 +, Wols Lists  wrote:
>> +  --with-java Build LibO with a JDK & Java support.],
> So, what should be the default? Including Java? Then I would argue for
> making this a --without option and having Java enabled by default... ?
I'll check to see what exactly is in the make system.  What I did was
look to see if enable-java was used anywhere (it isn't), and just change
it to with-java so the macro definition (a) matched the documentation,
and (b) matched what the rest of the build system used.

In other words, this patch is a "do nothing bug fix" and should be safe
"as is". Your suggestion is actually a functional change so yes, it
makes sense, but imho it should be a separate patch.

Cheers,
Wol
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] [PATCH] Convert --enable-java to --with-java

2010-11-05 Thread Sebastian Spaeth
On Thu, 04 Nov 2010 18:24:04 +, Wols Lists  wrote:
> +  --with-java Build LibO with a JDK & Java support.],

So, what should be the default? Including Java? Then I would argue for
making this a --without option and having Java enabled by default... ?


pgppmfCzt4N2n.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] [PATCH] Convert --enable-java to --with-java

2010-11-04 Thread Wols Lists
Resubmitting :-) now we've split the release and dev versions. It just
does a clean rename of the option. As I said last time, I can't find any
other reference to enable-java, but loads of references to with-java.

Cheers,
Wol


>From 67d623baf651958070cbc7de3773b6a77ca7 Mon Sep 17 00:00:00 2001
From: Wol 
Date: Wed, 3 Nov 2010 20:17:33 +
Subject: [PATCH 2/2] Change --enable-java to --with-java

---
 configure.in |   11 +--
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 0ec66b7..e0a0d41 100755
--- a/configure.in
+++ b/configure.in
@@ -132,12 +132,6 @@ AC_ARG_ENABLE(tests,
   --enable-tests  Enables the execution of the tests.],
 ,)
 
-# 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,
-[
-  --with-java Build LibO with a JDK & Java support.],
-,)
 
 # Optional Packages:
 AC_ARG_WITH(additional-sections,
@@ -295,6 +289,11 @@ AC_ARG_WITH(internal-gcc,
   binutils 2.18).],
 ,)
 
+AC_ARG_WITH(java,
+[
+  --with-java Build LibO with a JDK & Java support.],
+,)
+
 AC_ARG_WITH(lang,
 [
   --with-lang Define the localizations to build. The English one is
-- 
1.7.2.2

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice