[Libreoffice] [PATCH] Renaming extension options consistently

Renamed all extensions to --enable-ext-* because
"we do want to present them together in ./configure --help"

Deprecated old options not removed but commented instead.

Fixed: --with-java
---
 configure.in |  296 
++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 205 insertions(+), 91 deletions(-)


diff --git a/configure.in b/configure.in
index cf26c86..a752ecd 100755
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,9 @@ AC_SUBST(OOO_BUILDVERSION)
 PROPAGATED_ARGS=$ac_configure_args
 AC_SUBST(PROPAGATED_ARGS)
 
-# Optional Features:
+dnl ===================================================================
+dnl Optional Features (--enable/disable-)
+dnl ===================================================================
 AC_ARG_ENABLE(access,
 [
   --disable-access        Disable the Access import pieces.],
@@ -55,6 +57,81 @@ AC_ARG_ENABLE(dbgutil,
                           (This generates a non-product build.)],
 ,)
 
+AC_ARG_ENABLE(ext-barcode,
+[
+  --enable-ext-barcode    Download and integrate Barcode extension.],
+,)
+
+AC_ARG_ENABLE(ext-ct2n,
+[
+  --enable-ext-ct2n       Download and integrate ConvertTextToNumber extension.],
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+[
+  --enable-ext-diagram    Download and integrate Diagram extension.],
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+[
+  --enable-ext-google-docs
+                          Download and integrate Google Documents extension.],
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+[
+  --enable-ext-hunart     Download and integrate the Hungarian cross-reference
+                          toolbar extension.],
+,)
+
+AC_ARG_ENABLE(ext-languagetool,
+[
+  --enable-ext-languagetool
+                          Download and integrate LanguageTool extension.],
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+[
+  --enable-ext-lightproof
+                          Download and integrate the Lightproof "grammar
+                          checker" extension.],
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+[
+  --enable-ext-nlpsolver  Download and integrate NLPSolver extension.],
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+[
+  --enable-ext-numbertext
+                          Download and integrate the Numbertext Calc numerical
+                          extension.],
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+[
+  --enable-ext-oooblogger
+                          Download and integrate oooblogger extension.],
+,)
+
+AC_ARG_ENABLE(ext-typo,
+[
+  --enable-ext-typo       Download and integrate the Typography toolbar
+                          extension.],
+,)
+
+AC_ARG_ENABLE(ext-validator,
+[
+  --enable-ext-validator  Download and integrate Validator extension to Calc.],
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+[
+  --enable-ext-watch-window
+                          Download and integrate Watch Window extension to Calc.],
+,)
+
 AC_ARG_ENABLE(extensions,
 [
   --enable-extensions     Enables the unpacking of the extensions sources.],
@@ -125,14 +202,9 @@ 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:
+dnl ===================================================================
+dnl Optional Packages (--with/without-)
+dnl ===================================================================
 AC_ARG_WITH(additional-sections,
 [
   --with-additional-sections
@@ -168,11 +240,6 @@ AC_ARG_WITH(binsuffix,
                           Default:   --with-binsuffix=2.0],
 ,)
 
-AC_ARG_WITH(ct2n,
-[
-  --with-ct2n             Download and integrate ConvertTextToNumber extension.],
-,)
-
 AC_ARG_WITH(dejavu-fonts,
 [
   --with-dejavu-fonts     Download and install updated DejaVu fonts.
@@ -254,17 +321,6 @@ AC_ARG_WITH(gnu-tar,
                           Example:   --with-gnu-cp=/usr/local/bin/gtar],
 ,)
 
-AC_ARG_WITH(google-docs,
-[
-  --with-google-docs      Download and integrate Google Documents extension.],
-,)
-
-AC_ARG_WITH(hunart,
-[
-  --with-hunart           Download and integrate the Hungarian cross-reference
-                          toolbar extension.],
-,)
-
 AC_ARG_WITH(icecream-bindir,
 [
   --with-icecream-bindir  Location of icecream's gcc and g++.
@@ -288,6 +344,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
@@ -297,11 +358,6 @@ AC_ARG_WITH(lang,
                                      --with-lang=ALL],
 ,)
 
-AC_ARG_WITH(languagetool,
-[
-  --with-languagetool     Download and integrate LanguageTool extension.],
-,)
-
 AC_ARG_WITH(liberation-fonts,
 [
   --with-liberation-fonts
@@ -311,12 +367,6 @@ AC_ARG_WITH(liberation-fonts,
                           Example:   --with-liberation-fonts=1.1],
 ,)
 
-AC_ARG_WITH(lightproof,
-[
-  --with-lightproof       Download and integrate the Lightproof "grammar
-                          checker" extension.],
-,)
-
 AC_ARG_WITH(max-jobs,
 [
   --with-max-jobs         Maximum number of jobs that make will issue at the
@@ -358,11 +408,6 @@ AC_ARG_WITH(mono-gac-root,
                           Example:   --with-mono-gac-root=/usr/lib],
 ,)
 
-AC_ARG_WITH(nlpsolver,
-[
-  --with-nlpsolver        Download and integrate NLPSolver extension.],
-,)
-
 AC_ARG_WITH(num-cpus,
 [
   --with-num-cpus         Number of build processes/cpus to use (number of
@@ -371,23 +416,12 @@ AC_ARG_WITH(num-cpus,
                           on multi-cpu machines.],
 ,)
 
-AC_ARG_WITH(numbertext,
-[
-  --with-numbertext       Download and integrate the Numbertext Calc numerical
-                          extension.],
-,)
-
 AC_ARG_WITH(ooo-builddir,
 [
   --with-ooo-builddir     Define the directory where libreoffice will be
                           compiled, e.g. the root of an ooo cvs checkout.],
 ,)
 
-AC_ARG_WITH(oooblogger,
-[
-  --with-oooblogger       Download and integrate oooblogger extension.],
-,)
-
 AC_ARG_WITH(openclipart,
 [
   --with-openclipart      Build and install OOo galleries from the Open Clip Art
@@ -460,42 +494,122 @@ AC_ARG_WITH(system-libwps,
   --with-system-libwps    Use system libwps* library.],
 ,)
 
-AC_ARG_WITH(typo,
-[
-  --with-typo             Download and integrate the Typography toolbar
-                          extension.],
-,)
-
 AC_ARG_WITH(unstable-wp,
 [
   --with-unstable-wp      Use new unstable libwp* libraries.],
 ,)
 
-AC_ARG_WITH(watch-window,
+AC_ARG_WITH(win32,
 [
-  --with-watch-window     Download and integrate Watch Window extension to Calc.],
+  --with-win32            Define the build to be on Win32; this sets a number of
+                          defaults suitable for that platform.],
 ,)
 
+dnl ---------- Deprecated since 2010-11-05 ----------
+
+AC_ARG_WITH(barcode,
+    AS_HELP_STRING([--with-barcode],
+        [Deprecated: use --enable-ext-barcode instead.]),
+    if test -z "$enable_ext_barcode"; then
+        enable_ext_barcode=$with_barcode;
+    fi ,
+)
+
+AC_ARG_WITH(ct2n,
+    AS_HELP_STRING([--with-ct2n],
+        [Deprecated: use --enable-ext-ct2n instead.]),
+    if test -z "$enable_ext_ct2n"; then
+        enable_ext_ct2n=$with_ct2n;
+    fi ,
+)
+
 AC_ARG_WITH(diagram,
-[
-  --with-diagram          Download and integrate Diagram extension.],
-,)
+    AS_HELP_STRING([--with-diagram],
+        [Deprecated: use --enable-ext-diagram instead.]),
+    if test -z "$enable_ext_diagram"; then
+        enable_ext_diagram=$with_diagram;
+    fi ,
+)
 
-AC_ARG_WITH(validator,
-[
-  --with-validator        Download and integrate Validator extension to Calc.],
-,)
+AC_ARG_WITH(google-docs,
+    AS_HELP_STRING([--with-google-docs],
+        [Deprecated: use --enable-ext-google-docs instead.]),
+    if test -z "$enable_ext_google_docs"; then
+        enable_ext_google_docs=$with_google_docs;
+    fi ,
+)
 
-AC_ARG_WITH(barcode,
-[
-  --with-barcode        Download and integrate Barcode extension.],
-,)
+AC_ARG_WITH(hunart,
+    AS_HELP_STRING([--with-hunart],
+        [Deprecated: use --enable-ext-hunart instead.]),
+    if test -z "$enable_ext_hunart"; then
+        enable_ext_hunart=$with_hunart;
+    fi ,
+)
 
-AC_ARG_WITH(win32,
-[
-  --with-win32            Define the build to be on Win32; this sets a number of
-                          defaults suitable for that platform.],
-,)
+AC_ARG_WITH(languagetool,
+    AS_HELP_STRING([--with-languagetool],
+        [Deprecated: use --enable-ext-languagetool instead.]),
+    if test -z "$enable_ext_languagetool"; then
+        enable_ext_languagetool=$with_languagetool;
+    fi ,
+)
+
+AC_ARG_WITH(lightproof,
+    AS_HELP_STRING([--with-lightproof],
+        [Deprecated: use --enable-ext-lightproof instead.]),
+    if test -z "$enable_ext_lightproof"; then
+        enable_ext_lightproof=$with_lightproof;
+    fi ,
+)
+
+AC_ARG_WITH(nlpsolver,
+    AS_HELP_STRING([--with-nlpsolver],
+        [Deprecated: use --enable-ext-nlpsolver instead.]),
+    if test -z "$enable_ext_nlpsolver"; then
+        enable_ext_nlpsolver=$with_nlpsolver;
+    fi ,
+)
+
+AC_ARG_WITH(numbertext,
+    AS_HELP_STRING([--with-numbertext],
+        [Deprecated: use --enable-ext-numbertext instead.]),
+    if test -z "$enable_ext_numbertext"; then
+        enable_ext_numbertext=$with_numbertext;
+    fi ,
+)
+
+AC_ARG_WITH(oooblogger,
+    AS_HELP_STRING([--with-oooblogger],
+        [Deprecated: use --enable-ext-oooblogger instead.]),
+    if test -z "$enable_ext_oooblogger"; then
+        enable_ext_oooblogger=$with_oooblogger;
+    fi ,
+)
+
+AC_ARG_WITH(typo,
+    AS_HELP_STRING([--with-typo],
+        [Deprecated: use --enable-ext-typo instead.]),
+    if test -z "$enable_ext_typo"; then
+        enable_ext_typo=$with_typo;
+    fi ,
+)
+
+AC_ARG_WITH(validator,
+    AS_HELP_STRING([--with-validator],
+        [Deprecated: use --enable-ext-validator instead.]),
+    if test -z "$enable_ext_validator"; then
+        enable_ext_validator=$with_validator;
+    fi ,
+)
+
+AC_ARG_WITH(watch-window,
+    AS_HELP_STRING([--with-watch-window],
+        [Deprecated: use --enable-ext-watch-window instead.]),
+    if test -z "$enable_ext_watch_window"; then
+        enable_ext_watch_window=$with_watch_window;
+    fi ,
+)
 
 AM_MAINTAINER_MODE
 
@@ -1357,7 +1471,7 @@ AC_SUBST(SUNTEMPLATES_LANG)
 
 AC_MSG_CHECKING([whether to include ConvertTextToNumber extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_ct2n" = "zyes" ; then
+    if test "z$enable_ext_ct2n" = "zyes" ; then
         CT2N_EXTENSION="ConvertTextToNumber-1.3.2.oxt"
         WITH_CT2N=YES
         AC_MSG_RESULT([yes])
@@ -1371,7 +1485,7 @@ AC_SUBST(CT2N_EXTENSION)
 
 AC_MSG_CHECKING([whether to include Watch Window extension for Calc])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_watch_window" = "zyes" ; then
+    if test "z$enable_ext_watch_window" = "zyes" ; then
         WATCH_WINDOW_EXTENSION="WatchWindow_1.2.0.0.oxt"
         WITH_WATCH_WINDOW=YES
         AC_MSG_RESULT([yes])
@@ -1385,7 +1499,7 @@ AC_SUBST(WATCH_WINDOW_EXTENSION)
 
 AC_MSG_CHECKING([whether to include Diagram extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_diagram" = "zyes" ; then
+    if test "z$enable_ext_diagram" = "zyes" ; then
         DIAGRAM_EXTENSION="Diagram_1.1.0.0.oxt"
         WITH_DIAGRAM=YES
         AC_MSG_RESULT([yes])
@@ -1399,7 +1513,7 @@ AC_SUBST(DIAGRAM_EXTENSION)
 
 AC_MSG_CHECKING([whether to include Validator extension for Calc])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_validator" = "zyes" ; then
+    if test "z$enable_ext_validator" = "zyes" ; then
         VALIDATOR_EXTENSION="Validator_1.1.0.0.oxt"
         WITH_VALIDATOR=YES
         AC_MSG_RESULT([yes])
@@ -1413,7 +1527,7 @@ AC_SUBST(VALIDATOR_EXTENSION)
 
 AC_MSG_CHECKING([whether to include Barcode extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_barcode" = "zyes" ; then
+    if test "z$enable_ext_barcode" = "zyes" ; then
         BARCODE_EXTENSION="Barcode_1.3.1.0.oxt"
         WITH_BARCODE=YES
         AC_MSG_RESULT([yes])
@@ -1427,7 +1541,7 @@ AC_SUBST(BARCODE_EXTENSION)
 
 AC_MSG_CHECKING([whether to include Google Docs extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_google_docs" = "zyes" ; then
+    if test "z$enable_ext_google_docs" = "zyes" ; then
         GOOGLE_DOCS_EXTENSION="gdocs_2.1.0_modified.oxt"
         WITH_GOOGLE_DOCS=YES
         AC_MSG_RESULT([yes])
@@ -1441,7 +1555,7 @@ AC_SUBST(GOOGLE_DOCS_EXTENSION)
 
 AC_MSG_CHECKING([whether to include NLPSolver extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_nlpsolver" = "zyes" ; then
+    if test "z$enable_ext_nlpsolver" = "zyes" ; then
         NLPSOLVER_EXTENSION="90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
         WITH_NLPSOLVER=YES
         AC_MSG_RESULT([yes])
@@ -1455,7 +1569,7 @@ AC_SUBST(NLPSOLVER_EXTENSION)
 
 AC_MSG_CHECKING([whether to include LanguageTool extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_languagetool" = "zyes" ; then
+    if test "z$enable_ext_languagetool" = "zyes" ; then
         LANGUAGETOOL_EXTENSION="47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
         WITH_LANGUAGETOOL=YES
         AC_MSG_RESULT([yes])
@@ -1469,7 +1583,7 @@ AC_SUBST(LANGUAGETOOL_EXTENSION)
 
 AC_MSG_CHECKING([whether to include oooblogger extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_oooblogger" = "zyes" ; then
+    if test "z$enable_ext_oooblogger" = "zyes" ; then
         OOOBLOGGER_EXTENSION="oooblogger-0.1.oxt"
         WITH_OOOBLOGGER=YES
         AC_MSG_RESULT([yes])
@@ -1483,18 +1597,18 @@ AC_SUBST(OOOBLOGGER_EXTENSION)
 
 AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
 if test "$enable_extensions" != "no" ; then
-        if test "z$with_lightproof" = "z" -o "z$with_lightproof" = "zno" ; then
+        if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; then
             LIGHTPROOF_LANG=""
                 LIGHTPRROF_FILENAMES=""
             AC_MSG_RESULT([no integration])
         else
             lightproof_supported_langs="en-US hu"
-            if test "z$with_lightproof" = "zyes" ; then
+            if test "z$enable_ext_lightproof" = "zyes" ; then
                         wanted_lightproof="$lightproof_supported_langs"
             else
                         # check whether the langs are supported by Lightproof
                         wanted_lightproof=
-                        for lang in $with_lightproof ; do
+                        for lang in $enable_ext_lightproof ; do
                     if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
                                 wanted_lightproof="$wanted_lightproof $lang"
                     fi
@@ -1521,7 +1635,7 @@ AC_SUBST(LIGHTPROOF_FILENAMES)
 
 AC_MSG_CHECKING([whether to include numbertext extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_numbertext" = "zyes" ; then
+    if test "z$enable_ext_numbertext" = "zyes" ; then
         NUMBERTEXT_EXTENSION="numbertext-0.9.3.oxt"
         WITH_NUMBERTEXT=YES
         AC_MSG_RESULT([yes])
@@ -1535,7 +1649,7 @@ AC_SUBST(NUMBERTEXT_EXTENSION)
 
 AC_MSG_CHECKING([whether to include hunart extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_hunart" = "zyes" ; then
+    if test "z$enable_ext_hunart" = "zyes" ; then
         HUNART_EXTENSION="hunart-0.3.oxt"
         WITH_HUNART=YES
         AC_MSG_RESULT([yes])
@@ -1549,7 +1663,7 @@ AC_SUBST(HUNART_EXTENSION)
 
 AC_MSG_CHECKING([whether to include typo extension])
 if test "$enable_extensions" != "no" ; then
-    if test "z$with_typo" = "zyes" ; then
+    if test "z$enable_ext_typo" = "zyes" ; then
         TYPO_EXTENSION="typo-0.3.oxt"
         WITH_TYPO=YES
         AC_MSG_RESULT([yes])