[PATCH] Renaming extension options consistently
=3D?UTF-8?q?Niko=3D20R=3DC3=3DB6nkk=3DC3=3DB6?=3D
ronkko at iki.fi
Fri Nov 5 10:08:58 PDT 2010
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.
=C2=A1There 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
dnl Optional Features (--enable/disable-)
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+
+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 r=
equires
+ 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 p=
en 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.]),
,)
=20
+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=3D$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=3D$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=3D$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=3D$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=3D$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=3D$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=3D$enable_report_builder;
+ fi ,
+)
+
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
dnl Optional Packages (--with/without-)
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -1214,103 +1369,97 @@ AC_ARG_WITH(max-jobs,
Defaults to 1, unless you configure --enable-icecream - then to=
10.]),
,)
=20
-dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-dnl Enable/disable extensions
-dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-
-AC_ARG_ENABLE(ext-presenter-ui,
- AS_HELP_STRING([--enable-ext-presenter-ui],
- [Enables extra functionality during slideshows, e.g. selecting p=
en 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 ----------
=20
-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=3D$with_barcode;
+ fi ,
+)
=20
-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=3D$with_diagram;
+ fi ,
+)
=20
-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=3D$with_google_docs;
+ fi ,
+)
=20
-AC_ARG_ENABLE(mysql-connector,
- AS_HELP_STRING([--enable-mysql-connector],
- [Enables the build of the MySQL Connector/LibO extension. This r=
equires
- 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=3D$with_hunart;
+ fi ,
+)
=20
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=3D$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=3D$with_nlpsolver;
+ fi ,
+)
=20
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=3D$with_numbertext;
+ fi ,
+)
=20
-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=3D$with_oooblogger;
+ fi ,
+)
=20
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=3D$with_typo;
+ fi ,
+)
=20
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=3D$with_validator;
+ fi ,
+)
=20
-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=3D$with_watch_window;
+ fi ,
+)
=20
-BUILD_TYPE=3D"OOo"
+BUILD_TYPE=3D"LibO"
=20
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
dnl Message.
@@ -4465,7 +4614,7 @@ AC_SUBST(LUCENE_CORE_JAR)
AC_SUBST(LUCENE_ANALYZERS_JAR)
=20
AC_MSG_CHECKING([whether to build the MySQL Connector extension])
-if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" !=3D "=
no"; then
+if test -n "$enable_ext_mysql_connector" -a "$enable_ext_mysql_connector=
" !=3D "no"; then
AC_MSG_RESULT([yes])
ENABLE_MYSQLC=3DYES
AC_MSG_CHECKING([for mysqlc module])
@@ -6535,7 +6684,7 @@ AC_SUBST(SYSTEM_SERVLETAPI)
AC_SUBST(SERVLETAPI_JAR)
=20
AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test -n "$enable_report_builder" -a "$enable_report_builder" !=3D "no=
" && test "$WITH_JAVA" !=3D "no"; then
+if test -n "$enable_ext_report_builder" -a "$enable_ext_report_builder" =
!=3D "no" && test "$WITH_JAVA" !=3D "no"; then
AC_MSG_RESULT([yes])
ENABLE_REPORTBUILDER=3DYES
AC_MSG_CHECKING([for reportbuilder module])
@@ -7172,18 +7321,18 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
dnl Test whether to include Lightproof extensions
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Lightproof extensions integration (only supported l=
anguages displayed)])
-if test "z$with_lightproof" =3D "z" -o "z$with_lightproof" =3D "zno" ; t=
hen
+if test "z$enable_ext_lightproof" =3D "z" -o "z$enable_ext_lightproof" =3D=
"zno" ; then
LIGHTPROOF_LANG=3D""
AC_MSG_RESULT([no integration])
else
SCPDEFS=3D"$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
lightproof_supported_langs=3D"hu"
- if test "z$with_lightproof" =3D "zyes" ; then
+ if test "z$enable_ext_lightproof" =3D "zyes" ; then
wanted_lightproof=3D"$lightproof_supported_langs"
else
# check whether the langs are supported by Lightproof
wanted_lightproof=3D
- 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=3D"$wanted_lightproof $lang"
fi
@@ -7204,7 +7353,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Watch Window extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Watch Window extension integration])
-if test "z$with_watch_window" =3D "z" -o "z$with_watch_window" =3D "zno"=
; then
+if test "z$enable_ext_watch_window" =3D "z" -o "z$enable_ext_watch_windo=
w" =3D "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7216,7 +7365,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Diagram extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Diagram extension integration])
-if test "z$with_diagram" =3D "z" -o "z$with_diagram" =3D "zno" ; then
+if test "z$enable_ext_diagram" =3D "z" -o "z$enable_ext_diagram" =3D "zn=
o" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7228,7 +7377,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Validator extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Validator extension integration])
-if test "z$with_validator" =3D "z" -o "z$with_validator" =3D "zno" ; the=
n
+if test "z$enable_ext_validator" =3D "z" -o "z$enable_ext_validator" =3D=
"zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7240,7 +7389,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Barcode extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Barcode extension integration])
-if test "z$with_barcode" =3D "z" -o "z$with_barcode" =3D "zno" ; then
+if test "z$enable_ext_barcode" =3D "z" -o "z$enable_ext_barcode" =3D "zn=
o" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7264,7 +7413,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Numbertext extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Numbertext extension integration])
-if test "z$with_numbertext" =3D "z" -o "z$with_numbertext" =3D "zno" ; t=
hen
+if test "z$enable_ext_numbertext" =3D "z" -o "z$enable_ext_numbertext" =3D=
"zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7276,7 +7425,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Hungarian Cross-reference Toolbar extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integra=
tion])
-if test "z$with_hunart" =3D "z" -o "z$with_hunart" =3D "zno" ; then
+if test "z$enable_ext_hunart" =3D "z" -o "z$enable_ext_hunart" =3D "zno"=
; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7288,7 +7437,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Typography Toolbar extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Typography Toolbar extension integration])
-if test "z$with_typo" =3D "z" -o "z$with_typo" =3D "zno" ; then
+if test "z$enable_ext_typo" =3D "z" -o "z$enable_ext_typo" =3D "zno" ; t=
hen
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7300,7 +7449,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include Google Docs extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for Google Docs extension integration])
-if test "z$with_google_docs" =3D "z" -o "z$with_google_docs" =3D "zno" ;=
then
+if test "z$enable_ext_google_docs" =3D "z" -o "z$enable_ext_google_docs"=
=3D "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7311,7 +7460,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include NLPSolver extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "z$with_nlpsolver" =3D "z" -o "z$with_nlpsolver" =3D "zno" ; the=
n
+if test "z$enable_ext_nlpsolver" =3D "z" -o "z$enable_ext_nlpsolver" =3D=
"zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7335,7 +7484,7 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
dnl Test whether to include oooblogger extension
dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
AC_MSG_CHECKING([for oooblogger extension integration])
-if test "z$with_oooblogger" =3D "z" -o "z$with_oooblogger" =3D "zno" ; t=
hen
+if test "z$enable_ext_oooblogger" =3D "z" -o "z$enable_ext_oooblogger" =3D=
"zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
--=20
1.7.0.4
--------------090300010808040506080008
Content-Type: text/x-patch;
name="0001-Renaming-extension-options-consistently-build.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0001-Renaming-extension-options-consistently-build.patch"
More information about the LibreOffice
mailing list