[Libreoffice] [PATCHES] Renaming to --enable-ext-*

New try.

From 3cad28b8c61f66c06a4e76f398e78c57597ce49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= <ronkko@iki.fi>
Date: Fri, 5 Nov 2010 19:08:58 +0200
Subject: [PATCH] Renaming extension options consistently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

See: b765a28ea9d63b60a14786b1a5484227175d413e

Deprecated old options not removed but commented instead.

¡There are still extensions which are only in build/configure.in!

Changed BUILD_TYPE from OOo to LibO

See: Elide all "SO:" and "OOo:" build.lst prefixes
---
 configure.in |  335 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 242 insertions(+), 93 deletions(-)

diff --git a/configure.in b/configure.in
index aab3995..1caf430 100644
--- a/configure.in
+++ b/configure.in
@@ -8,6 +8,103 @@ echo "$@" >config.parms
 dnl ===================================================================
 dnl Optional Features (--enable/disable-)
 dnl ===================================================================
+
+dnl ---------- Extensions ----------
+
+AC_ARG_ENABLE(ext-barcode,
+    AS_HELP_STRING([--enable-ext-barcode],
+        [Enables the Barcode extension.]),
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+    AS_HELP_STRING([--enable-ext-diagram],
+        [Enables the Diagram extension.]),
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+    AS_HELP_STRING([--enable-ext-google-docs],
+        [Download and enables the Google Documents extension.]),
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+    AS_HELP_STRING([--enable-ext-hunart],
+        [Enables the Hungarian Cross-reference Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+    AS_HELP_STRING([--enable-ext-lightproof],
+        [Enables the Lightproof extension.]),
+,)
+
+AC_ARG_ENABLE(ext-mysql-connector,
+    AS_HELP_STRING([--enable-ext-mysql-connector],
+        [Enables the build of the MySQL Connector/LibO extension. This requires
+         access to the MySQL Connector/C (aka libmysql) to be given, too, with
+         either the --with-system-mysql or --with-libmysql-path option.]),
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+    AS_HELP_STRING([--enable-ext-nlpsolver],
+        [Download and enables the NLPSolver extension.]),
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+    AS_HELP_STRING([--enable-ext-numbertext],
+        [Enables the Numbertext extension.]),
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+    AS_HELP_STRING([--enable-ext-oooblogger],
+        [Download and enables the OOo Blogger extension.]),
+,)
+
+AC_ARG_ENABLE(ext-pdfimport,
+    AS_HELP_STRING([--enable-ext-pdfimport],
+        [Enables the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-console,
+    AS_HELP_STRING([--enable-ext-presenter-console],
+        [Enables the Presenter Console extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-minimizer,
+    AS_HELP_STRING([--enable-ext-presenter-minimizer],
+        [Enables the Presentation Minimizer extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-ui,
+    AS_HELP_STRING([--enable-ext-presenter-ui],
+        [Enables extra functionality during slideshows, e.g. selecting pen color.]),
+,)
+
+AC_ARG_ENABLE(ext-report-builder,
+    AS_HELP_STRING([--enable-ext-report-builder],
+        [Enables the build of the Report Builder extension.]),
+,)
+
+AC_ARG_ENABLE(ext-typo,
+    AS_HELP_STRING([--enable-ext-typo],
+        [Enables the Typography Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-validator,
+    AS_HELP_STRING([--enable-ext-validator],
+        [Enables the Validator extension.]),
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+    AS_HELP_STRING([--enable-ext-watch-window],
+        [Enables the Watch Window extension to Calc.]),
+,)
+
+AC_ARG_ENABLE(ext-wiki-publisher,
+    AS_HELP_STRING([--enable-ext-wiki-publisher],
+        [Enables the Wiki Publisher extension.]),
+,)
+
+dnl ---------- *** ----------
+
 AC_ARG_ENABLE(graphite,
     AS_HELP_STRING([--enable-graphite],
         [Enables the compilation of Graphite smart font rendering.]),
@@ -377,6 +474,64 @@ AC_ARG_ENABLE(cl-x64,
         [Use the Microsoft C/C++ x64 compiler instead of the default x86 one.]),
 ,)
 
+dnl ---------- Deprecated since 2010-11-05 ----------
+
+AC_ARG_ENABLE(mysql-connector,
+    AS_HELP_STRING([--enable-mysql-connector],
+        [Deprecated: use --enable-ext-mysql-connector instead.]),
+    if test -z "$enable_ext_mysql_connector"; then
+        enable_ext_mysql_connector=$enable_mysql_connector;
+    fi ,
+)
+
+AC_ARG_ENABLE(presenter-extra-ui,
+    AS_HELP_STRING([--enable-presenter-extra-ui],
+        [Deprecated: use --enable-ext-presenter-ui instead.]),
+    if test -z "$enable_ext_presenter_ui"; then
+        enable_ext_presenter_ui=$enable_presenter_extra_ui;
+    fi ,
+)
+
+AC_ARG_ENABLE(minimizer,
+    AS_HELP_STRING([--enable-minimizer],
+        [Deprecated: use --enable-ext-presenter-minimizer instead.]),
+    if test -z "$enable_ext_presenter_minimizer"; then
+        enable_ext_presenter_minimizer=$enable_minimizer;
+    fi ,
+)
+
+AC_ARG_ENABLE(presenter-console,
+    AS_HELP_STRING([--enable-presenter-console],
+        [Deprecated: use --enable-ext-presenter-console instead.]),
+    if test -z "$enable_ext_presenter_console"; then
+        enable_ext_presenter_console=$enable_presenter_console;
+    fi ,
+)
+
+AC_ARG_ENABLE(pdfimport,
+    AS_HELP_STRING([--enable-pdfimport],
+        [Deprecated: use --enable-ext-pdfimport instead.]),
+    if test -z "$enable_ext_pdfimport"; then
+        enable_ext_pdfimport=$enable_pdfimport;
+    fi ,
+)
+
+AC_ARG_ENABLE(wiki-publisher,
+    AS_HELP_STRING([--enable-wiki-publisher],
+        [Deprecated: use --enable-ext-wiki-publisher instead.]),
+    if test -z "$enable_ext_wiki_publisher"; then
+        enable_ext_wiki_publisher=$enable_wiki_publisher;
+    fi ,
+)
+
+AC_ARG_ENABLE(report-builder,
+    AS_HELP_STRING([--enable-report-builder],
+        [Deprecated: use --enable-ext-report-builder instead.]),
+    if test -z "$enable_ext_report_builder"; then
+        enable_ext_report_builder=$enable_report_builder;
+    fi ,
+)
+
 dnl ===================================================================
 dnl Optional Packages (--with/without-)
 dnl ===================================================================
@@ -1214,103 +1369,97 @@ AC_ARG_WITH(max-jobs,
          Defaults to 1, unless you configure --enable-icecream - then to 10.]),
 ,)
 
-dnl ===================================================================
-dnl Enable/disable extensions
-dnl ===================================================================
-
-AC_ARG_ENABLE(ext-presenter-ui,
-    AS_HELP_STRING([--enable-ext-presenter-ui],
-        [Enables extra functionality during slideshows, e.g. selecting pen color.]),
-,)
-
-AC_ARG_ENABLE(ext-presenter-minimizer,
-    AS_HELP_STRING([--enable-ext-presenter-minimizer],
-        [Enables the Presentation Minimizer.]),
-,)
-
-AC_ARG_ENABLE(ext-presenter-console,
-    AS_HELP_STRING([--enable-ext-presenter-console],
-        [Enables the Presenter Console extension.]),
-,)
+dnl ---------- Deprecated since 2010-11-05 ----------
 
-AC_ARG_ENABLE(ext-pdfimport,
-    AS_HELP_STRING([--enable-ext-pdfimport],
-        [Enables the PDF Import extension and xpdf.]),
-,)
+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_ENABLE(ext-wiki-publisher,
-    AS_HELP_STRING([--enable-ext-wiki-publisher],
-        [Enables the Wiki Publisher extension.]),
-,)
+AC_ARG_WITH(diagram,
+    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_ENABLE(report-builder,
-    AS_HELP_STRING([--enable-report-builder],
-        [Enables the build of the Report Builder extension.]),
-,)
+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_ENABLE(mysql-connector,
-    AS_HELP_STRING([--enable-mysql-connector],
-        [Enables the build of the MySQL Connector/LibO extension. This requires
-         access to the MySQL Connector/C (aka libmysql) to be given, too, with
-         either the --with-system-mysql or --with-libmysql-path option.]),
-,)
+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(lightproof,
     AS_HELP_STRING([--with-lightproof],
-        [Integrate Lightproof extension.]),
-,)
+        [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],
-        [Integrate Numbertext extension.]),
-,)
+        [Deprecated: use --enable-ext-numbertext instead.]),
+    if test -z "$enable_ext_numbertext"; then
+        enable_ext_numbertext=$with_numbertext;
+    fi ,
+)
 
-AC_ARG_WITH(hunart,
-    AS_HELP_STRING([--with-hunart],
-        [Integrate Hungarian Cross-reference Toolbar extension.]),
-,)
+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],
-        [Integrate Typography Toolbar extension.]),
-,)
-
-AC_ARG_WITH(watch-window,
-    AS_HELP_STRING([--with-watch-window],
-        [Integrate Watch Window extension to Calc.]),
-,)
-
-AC_ARG_WITH(diagram,
-    AS_HELP_STRING([--with-diagram],
-        [Integrate Diagram extension.]),
-,)
+        [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],
-        [Integrate Validator extension.]),
-,)
-
-AC_ARG_WITH(barcode,
-    AS_HELP_STRING([--with-barcode],
-        [Integrate Barcode extension.]),
-,)
-
-AC_ARG_WITH(google-docs,
-    AS_HELP_STRING([--with-google-docs],
-        [Download and integrate Google Documents extension.]),
-,)
-
-AC_ARG_WITH(nlpsolver,
-    AS_HELP_STRING([--with-nlpsolver],
-        [Download and integrate NLPSolver extension.]),
-,)
+        [Deprecated: use --enable-ext-validator instead.]),
+    if test -z "$enable_ext_validator"; then
+        enable_ext_validator=$with_validator;
+    fi ,
+)
 
-AC_ARG_WITH(oooblogger,
-    AS_HELP_STRING([--with-oooblogger],
-        [Download and integrate oooblogger extension.]),
-,)
+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 ,
+)
 
-BUILD_TYPE="OOo"
+BUILD_TYPE="LibO"
 
 dnl ===================================================================
 dnl Message.
@@ -4465,7 +4614,7 @@ AC_SUBST(LUCENE_CORE_JAR)
 AC_SUBST(LUCENE_ANALYZERS_JAR)
 
 AC_MSG_CHECKING([whether to build the MySQL Connector extension])
-if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
+if test -n "$enable_ext_mysql_connector" -a "$enable_ext_mysql_connector" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_MYSQLC=YES
   AC_MSG_CHECKING([for mysqlc module])
@@ -6535,7 +6684,7 @@ AC_SUBST(SYSTEM_SERVLETAPI)
 AC_SUBST(SERVLETAPI_JAR)
 
 AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != 
"no"; then
+if test -n "$enable_ext_report_builder" -a "$enable_ext_report_builder" != "no" && test 
"$WITH_JAVA" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_REPORTBUILDER=YES
   AC_MSG_CHECKING([for reportbuilder module])
@@ -7172,18 +7321,18 @@ dnl ===================================================================
 dnl Test whether to include Lightproof extensions
 dnl ===================================================================
 AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
-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=""
     AC_MSG_RESULT([no integration])
 else
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
     lightproof_supported_langs="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
@@ -7204,7 +7353,7 @@ dnl ===================================================================
 dnl Test whether to include Watch Window extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Watch Window extension integration])
-if test "z$with_watch_window" = "z" -o "z$with_watch_window" = "zno" ; then
+if test "z$enable_ext_watch_window" = "z" -o "z$enable_ext_watch_window" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7216,7 +7365,7 @@ dnl ===================================================================
 dnl Test whether to include Diagram extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Diagram extension integration])
-if test "z$with_diagram" = "z" -o "z$with_diagram" = "zno" ; then
+if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7228,7 +7377,7 @@ dnl ===================================================================
 dnl Test whether to include Validator extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Validator extension integration])
-if test "z$with_validator" = "z" -o "z$with_validator" = "zno" ; then
+if test "z$enable_ext_validator" = "z" -o "z$enable_ext_validator" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7240,7 +7389,7 @@ dnl ===================================================================
 dnl Test whether to include Barcode extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Barcode extension integration])
-if test "z$with_barcode" = "z" -o "z$with_barcode" = "zno" ; then
+if test "z$enable_ext_barcode" = "z" -o "z$enable_ext_barcode" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7264,7 +7413,7 @@ dnl ===================================================================
 dnl Test whether to include Numbertext extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Numbertext extension integration])
-if test "z$with_numbertext" = "z" -o "z$with_numbertext" = "zno" ; then
+if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7276,7 +7425,7 @@ dnl ===================================================================
 dnl Test whether to include Hungarian Cross-reference Toolbar extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
-if test "z$with_hunart" = "z" -o "z$with_hunart" = "zno" ; then
+if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7288,7 +7437,7 @@ dnl ===================================================================
 dnl Test whether to include Typography Toolbar extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Typography Toolbar extension integration])
-if test "z$with_typo" = "z" -o "z$with_typo" = "zno" ; then
+if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7300,7 +7449,7 @@ dnl ===================================================================
 dnl Test whether to include Google Docs extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Google Docs extension integration])
-if test "z$with_google_docs" = "z" -o "z$with_google_docs" = "zno" ; then
+if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7311,7 +7460,7 @@ dnl ===================================================================
 dnl Test whether to include NLPSolver extension
 dnl ===================================================================
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "z$with_nlpsolver" = "z" -o "z$with_nlpsolver" = "zno" ; then
+if test "z$enable_ext_nlpsolver" = "z" -o "z$enable_ext_nlpsolver" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7335,7 +7484,7 @@ dnl ===================================================================
 dnl Test whether to include oooblogger extension
 dnl ===================================================================
 AC_MSG_CHECKING([for oooblogger extension integration])
-if test "z$with_oooblogger" = "z" -o "z$with_oooblogger" = "zno" ; then
+if test "z$enable_ext_oooblogger" = "z" -o "z$enable_ext_oooblogger" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
-- 
1.7.0.4

From a80b09d7d65217e61e7b401de73a7c3f6542309c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= <ronkko@iki.fi>
Date: Fri, 5 Nov 2010 23:38:12 +0200
Subject: [PATCH 1/2] 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: --without-java (from Wol)
---
 configure.in |  296 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 205 insertions(+), 91 deletions(-)

diff --git a/configure.in b/configure.in
index b7d7852..8db9da5 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,
+[
+  --without-java          Build LibO without a JDK & Java support.],
+,with_java=yes)
+
 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.4.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.4.oxt"
         WITH_TYPO=YES
         AC_MSG_RESULT([yes])
-- 
1.7.0.4

From 34b3ba37ed6e9db174402a562c75bf766baf9d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= <ronkko@iki.fi>
Date: Fri, 5 Nov 2010 23:41:56 +0200
Subject: [PATCH 2/2] Distro-configs: adapt to new configure options for extensions

Some extensions options for configure were renamed to --enable-ext-*
---
 distro-configs/GoOoLinux.conf.in             |    4 ++--
 distro-configs/GoOoMacOSX.conf.in            |    4 ++--
 distro-configs/LibreOfficeLinux.conf.in      |    4 ++--
 distro-configs/LibreOfficeLinuxDevel.conf.in |    6 +++---
 distro-configs/LibreOfficeMacOSX.conf.in     |    4 ++--
 distro-configs/LibreOfficeOpenBSD.conf.in    |   10 +++++-----
 distro-configs/OxygenOfficeLinux.conf.in     |    5 ++---
 distro-configs/OxygenOfficeWindows.conf.in   |    5 ++---
 distro-configs/SUSE-10.3.conf.in             |    4 ++--
 distro-configs/SUSE-11.0.conf.in             |    4 ++--
 distro-configs/SUSE-11.1.conf.in             |    4 ++--
 distro-configs/SUSE-11.2.conf.in             |    4 ++--
 distro-configs/SUSE.conf.in                  |    4 ++--
 13 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/distro-configs/GoOoLinux.conf.in b/distro-configs/GoOoLinux.conf.in
index fb78eaf..c0224db 100644
--- a/distro-configs/GoOoLinux.conf.in
+++ b/distro-configs/GoOoLinux.conf.in
@@ -39,11 +39,11 @@
 --without-unix-wrapper
 --with-fonts
 --enable-ext-presenter-minimizer
---enable-presenter-console
+--enable-ext-presenter-console
 --enable-ext-pdfimport
 --without-system-poppler
 --enable-ext-wiki-publisher
---enable-report-builder
+--enable-ext-report-builder
 --with-extension-integration
 --with-linker-hash-style=both
 --with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/distro-configs/GoOoMacOSX.conf.in b/distro-configs/GoOoMacOSX.conf.in
index ba03e81..8bafb33 100644
--- a/distro-configs/GoOoMacOSX.conf.in
+++ b/distro-configs/GoOoMacOSX.conf.in
@@ -3,8 +3,8 @@
 --with-vendor=\"Go-oo Project\"
 --enable-hids
 --enable-ext-presenter-minimizer
---enable-presenter-console
+--enable-ext-presenter-console
 --enable-ext-pdfimport
 --enable-ext-wiki-publisher
---enable-report-builder
+--enable-ext-report-builder
 --with-extension-integration
diff --git a/distro-configs/LibreOfficeLinux.conf.in b/distro-configs/LibreOfficeLinux.conf.in
index cbc4339..d870e66 100644
--- a/distro-configs/LibreOfficeLinux.conf.in
+++ b/distro-configs/LibreOfficeLinux.conf.in
@@ -34,11 +34,11 @@
 --without-unix-wrapper
 --with-fonts
 --enable-ext-presenter-minimizer
---enable-presenter-console
+--enable-ext-presenter-console
 --enable-ext-pdfimport
 --without-system-poppler
 --enable-ext-wiki-publisher
---enable-report-builder
+--enable-ext-report-builder
 --with-extension-integration
 --with-linker-hash-style=both
 --with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in 
b/distro-configs/LibreOfficeLinuxDevel.conf.in
index 704e43d..1070f61 100644
--- a/distro-configs/LibreOfficeLinuxDevel.conf.in
+++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
@@ -31,11 +31,11 @@
 --without-unix-wrapper
 --with-fonts
 --enable-ext-presenter-minimizer
---enable-presenter-console
+--enable-ext-presenter-console
 --enable-ext-pdfimport
 --without-system-poppler
 --enable-ext-wiki-publisher
---enable-report-builder
+--enable-ext-report-builder
 --with-extension-integration
 --with-ant-home=$BUILDDIR/$APACHE_ANT
 --with-system-dicts
@@ -45,4 +45,4 @@
 --with-dict=ALL
 --without-system-openssl
 --disable-epm
---enable-broffice
\ No newline at end of file
+--enable-broffice
diff --git a/distro-configs/LibreOfficeMacOSX.conf.in b/distro-configs/LibreOfficeMacOSX.conf.in
index 1ebbf3a..c2c1c32 100644
--- a/distro-configs/LibreOfficeMacOSX.conf.in
+++ b/distro-configs/LibreOfficeMacOSX.conf.in
@@ -1,9 +1,9 @@
 --with-vendor=\"The Document Foundation\"
 --enable-hids
 --enable-ext-presenter-minimizer
---enable-presenter-console
+--enable-ext-presenter-console
 --enable-ext-pdfimport
 --enable-ext-wiki-publisher
---enable-report-builder
+--enable-ext-report-builder
 --with-extension-integration
 --enable-broffice
diff --git a/distro-configs/LibreOfficeOpenBSD.conf.in b/distro-configs/LibreOfficeOpenBSD.conf.in
index a94c74c..c862228 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf.in
+++ b/distro-configs/LibreOfficeOpenBSD.conf.in
@@ -19,11 +19,11 @@
 --enable-gstreamer
 --enable-hids
 --enable-lockdown
---enable-minimizer
---enable-pdfimport
---enable-presenter-console
---enable-report-builder
---enable-wiki-publisher
+--enable-ext-presenter-minimizer
+--enable-ext-pdfimport
+--enable-ext-presenter-console
+--enable-ext-report-builder
+--enable-ext-wiki-publisher
 --with-alloc=system
 --with-ant-home=/usr/local/ant/lib
 --with-dict=ALL
diff --git a/distro-configs/OxygenOfficeLinux.conf.in b/distro-configs/OxygenOfficeLinux.conf.in
index 2a97bc9..c70e401 100644
--- a/distro-configs/OxygenOfficeLinux.conf.in
+++ b/distro-configs/OxygenOfficeLinux.conf.in
@@ -31,16 +31,15 @@
 --enable-gnome-vfs
 --enable-mono
 --enable-ext-presenter-minimizer
---enable-presenter-console
+--enable-ext-presenter-console
 --enable-ext-pdfimport
 --without-system-poppler
 --enable-ext-wiki-publisher
 --enable-ogltrans
---enable-report-builder
+--enable-ext-report-builder
 --enable-neon
 --without-system-stdlibs
 --with-system-nas
 --with-system-freetype
 --with-jdk-home=/usr/local/jdk1.6.0_21/
 
-
diff --git a/distro-configs/OxygenOfficeWindows.conf.in b/distro-configs/OxygenOfficeWindows.conf.in
index ce4d64e..95546c9 100644
--- a/distro-configs/OxygenOfficeWindows.conf.in
+++ b/distro-configs/OxygenOfficeWindows.conf.in
@@ -15,11 +15,10 @@
 --with-extra-accessory
 --with-lang=\"hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko sl\"
 --enable-ext-presenter-minimizer
---enable-presenter-console
+--enable-ext-presenter-console
 --enable-ext-pdfimport
 --enable-ext-wiki-publisher
 --enable-ogltrans
---enable-report-builder
+--enable-ext-report-builder
 --disable-cairo
 --with-jdk-home=/usr/local/jdk1.6.0_21/
-
diff --git a/distro-configs/SUSE-10.3.conf.in b/distro-configs/SUSE-10.3.conf.in
index c99c7af..18c8c53 100644
--- a/distro-configs/SUSE-10.3.conf.in
+++ b/distro-configs/SUSE-10.3.conf.in
@@ -9,8 +9,8 @@
 --enable-mono
 --enable-opengl
 --enable-ogltrans
---enable-presenter-console
---enable-report-builder
+--enable-ext-presenter-console
+--enable-ext-report-builder
 --enable-ext-wiki-publisher
 --with-ant-home=/usr/share/ant
 --with-external-dict-dir=/usr/share/myspell
diff --git a/distro-configs/SUSE-11.0.conf.in b/distro-configs/SUSE-11.0.conf.in
index 3208fbc..c89cc76 100644
--- a/distro-configs/SUSE-11.0.conf.in
+++ b/distro-configs/SUSE-11.0.conf.in
@@ -10,8 +10,8 @@
 --enable-opengl
 --enable-ogltrans
 --enable-ext-pdfimport
---enable-presenter-console
---enable-report-builder
+--enable-ext-presenter-console
+--enable-ext-report-builder
 --enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
diff --git a/distro-configs/SUSE-11.1.conf.in b/distro-configs/SUSE-11.1.conf.in
index f935385..7bac313 100644
--- a/distro-configs/SUSE-11.1.conf.in
+++ b/distro-configs/SUSE-11.1.conf.in
@@ -10,8 +10,8 @@
 --enable-opengl
 --enable-ogltrans
 --enable-ext-pdfimport
---enable-presenter-console
---enable-report-builder
+--enable-ext-presenter-console
+--enable-ext-report-builder
 --enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
diff --git a/distro-configs/SUSE-11.2.conf.in b/distro-configs/SUSE-11.2.conf.in
index fcf1e0a..f9799ce 100644
--- a/distro-configs/SUSE-11.2.conf.in
+++ b/distro-configs/SUSE-11.2.conf.in
@@ -9,8 +9,8 @@
 --enable-opengl
 --enable-ogltrans
 --enable-ext-pdfimport
---enable-presenter-console
---enable-report-builder
+--enable-ext-presenter-console
+--enable-ext-report-builder
 --enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
diff --git a/distro-configs/SUSE.conf.in b/distro-configs/SUSE.conf.in
index 9377f8c..0141476 100644
--- a/distro-configs/SUSE.conf.in
+++ b/distro-configs/SUSE.conf.in
@@ -9,8 +9,8 @@
 --enable-opengl
 --enable-ogltrans
 --enable-ext-pdfimport
---enable-presenter-console
---enable-report-builder
+--enable-ext-presenter-console
+--enable-ext-report-builder
 --enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
-- 
1.7.0.4