Renamed all extensions to --with-ext-*
If "we do want to present them together in ./configure --help",
then they all must be a same type of.
=> Changed all extensions to be AC_ARG_WITH
See: b765a28ea9d63b60a14786b1a5484227175d413e
Also: We don't want to break builders scripts (as Michael Meeks said) so
deprecated old options not removed but commented instead.
¡There are still extensions which are only in build/configure!
---
configure.in | 311
++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 228 insertions(+), 83 deletions(-)
diff --git a/configure.in b/configure.in
index 9855b3b..17440b5 100644
--- a/configure.in
+++ b/configure.in
@@ -317,6 +317,62 @@ AC_ARG_ENABLE(gstreamer,
[Disable building the gstreamer avmedia backend.]),
,enable_gstreamer=yes)
+AC_ARG_ENABLE(mysql-connector,
+ AS_HELP_STRING([--enable-mysql-connector],
+ [Deprecated: use --with-ext-mysql-connector instead.]),
+ if test -z "$with_ext_mysql_connector"; then
+ with_ext_mysql_connector=$enable_mysql_connector;
+ fi ,
+)
+
+AC_ARG_ENABLE(presenter-extra-ui,
+ AS_HELP_STRING([--enable-presenter-extra-ui],
+ [Deprecated: use --with-ext-presenter-ui instead.]),
+ if test -z "$with_ext_presenter_ui"; then
+ with_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 "$with_ext_presenter_minimizer"; then
+ with_ext_presenter_minimizer=$enable_minimizer;
+ fi ,
+)
+
+AC_ARG_ENABLE(presenter-console,
+ AS_HELP_STRING([--enable-presenter-console],
+ [Deprecated: use --with-ext-presenter-console instead.]),
+ if test -z "$with_ext_presenter_console"; then
+ with_ext_presenter_console=$enable_presenter_console;
+ fi ,
+)
+
+AC_ARG_ENABLE(pdfimport,
+ AS_HELP_STRING([--enable-pdfimport],
+ [Deprecated: use --with-ext-pdfimport instead.]),
+ if test -z "$with_ext_pdfimport"; then
+ with_ext_pdfimport=$enable_pdfimport;
+ fi ,
+)
+
+AC_ARG_ENABLE(wiki-publisher,
+ AS_HELP_STRING([--enable-wiki-publisher],
+ [Deprecated: use --with-ext-wiki-publisher instead.]),
+ if test -z "$with_ext_wiki_publisher"; then
+ with_ext_wiki_publisher=$enable_wiki_publisher;
+ fi ,
+)
+
+AC_ARG_ENABLE(report-builder,
+ AS_HELP_STRING([--enable-report-builder],
+ [Deprecated: use --with-ext-report-builder instead.]),
+ if test -z "$with_ext_report_builder"; then
+ with_ext_report_builder=$enable_report_builder;
+ fi ,
+)
+
AC_ARG_ENABLE(neon,
AS_HELP_STRING([--disable-neon],
[Disable neon and the compilation of webdav binding.]),
@@ -386,6 +442,7 @@ AC_ARG_ENABLE(zenity,
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
+
AC_ARG_WITH(gnu-patch,
AS_HELP_STRING([--with-gnu-patch],
[Specify location of GNU patch on Solaris or FreeBSD.]),
@@ -401,6 +458,102 @@ AC_ARG_WITH(system-graphite,
[Use graphite library already installed on system.]),
,)
+dnl ===================================================================
+dnl Extensions
+dnl ===================================================================
+
+AC_ARG_WITH(ext-barcode,
+ AS_HELP_STRING([--with-ext-barcode],
+ [Integrate Barcode extension.]),
+,)
+
+AC_ARG_WITH(ext-diagram,
+ AS_HELP_STRING([--with-ext-diagram],
+ [Integrate Diagram extension.]),
+,)
+
+AC_ARG_WITH(ext-google-docs,
+ AS_HELP_STRING([--with-ext-google-docs],
+ [Download and integrate Google Documents extension.]),
+,)
+
+AC_ARG_WITH(ext-hunart,
+ AS_HELP_STRING([--with-ext-hunart],
+ [Integrate Hungarian Cross-reference Toolbar extension.]),
+,)
+
+AC_ARG_WITH(ext-lightproof,
+ AS_HELP_STRING([--with-ext-lightproof],
+ [Integrate Lightproof extension.]),
+,)
+
+AC_ARG_WITH(ext-mysql-connector,
+ AS_HELP_STRING([--with-mysql-connector],
+ [Integrate 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(ext-nlpsolver,
+ AS_HELP_STRING([--with-ext-nlpsolver],
+ [Download and integrate NLPSolver extension.]),
+,)
+
+AC_ARG_WITH(ext-numbertext,
+ AS_HELP_STRING([--with-ext-numbertext],
+ [Integrate Numbertext extension.]),
+,)
+
+AC_ARG_WITH(ext-oooblogger,
+ AS_HELP_STRING([--with-ext-oooblogger],
+ [Download and integrate oooblogger extension.]),
+,)
+
+AC_ARG_WITH(ext-pdfimport,
+ AS_HELP_STRING([--with-ext-pdfimport],
+ [Integrate the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_WITH(ext-presenter-console,
+ AS_HELP_STRING([--with-ext-presenter-console],
+ [Integrate the Presenter Console extension.]),
+,)
+
+AC_ARG_WITH(ext-presenter-minimizer,
+ AS_HELP_STRING([--with-ext-presenter-minimizer],
+ [Integrate the Presentation Minimizer extension.]),
+,)
+
+AC_ARG_WITH(ext-presenter-ui,
+ AS_HELP_STRING([--with-ext-presenter-ui],
+ [Integrate Presenter UI extension which add some extra functionality during slideshows, e.g. selecting pen color.]),
+,)
+
+AC_ARG_WITH(ext-report-builder,
+ AS_HELP_STRING([--with-ext-report-builder],
+ [Integrate the build of the Report Builder extension.]),
+,)
+
+AC_ARG_WITH(ext-typo,
+ AS_HELP_STRING([--with-ext-typo],
+ [Integrate Typography Toolbar extension.]),
+,)
+
+AC_ARG_WITH(ext-validator,
+ AS_HELP_STRING([--with-ext-validator],
+ [Integrate Validator extension.]),
+,)
+
+AC_ARG_WITH(ext-watch-window,
+ AS_HELP_STRING([--with-ext-watch-window],
+ [Integrate Watch Window extension to Calc.]),
+,)
+
+AC_ARG_WITH(ext-wiki-publisher,
+ AS_HELP_STRING([--with-ext-wiki-publisher],
+ [Integrate the Wiki Publisher extension.]),
+,)
+
AC_ARG_WITH(external-tar,
AS_HELP_STRING([--with-external-tar=<TARFILE PATH>],
[Specify path to tarfiles manually.]),
@@ -1220,101 +1373,93 @@ 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.]),
-,)
-
-AC_ARG_ENABLE(ext-pdfimport,
- AS_HELP_STRING([--enable-ext-pdfimport],
- [Enables the PDF Import extension and xpdf.]),
-,)
-
-AC_ARG_ENABLE(ext-wiki-publisher,
- AS_HELP_STRING([--enable-ext-wiki-publisher],
- [Enables the Wiki Publisher extension.]),
-,)
-
-AC_ARG_ENABLE(report-builder,
- AS_HELP_STRING([--enable-report-builder],
- [Enables the build of the Report Builder extension.]),
-,)
-
-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(lightproof,
AS_HELP_STRING([--with-lightproof],
- [Integrate Lightproof extension.]),
-,)
+ [Deprecated: use --with-ext-lightproof instead.]),
+ if test -z "$with_ext_lightproof"; then
+ with_ext_lightproof="$with_lightproof"
+ fi ,
+)
AC_ARG_WITH(numbertext,
AS_HELP_STRING([--with-numbertext],
- [Integrate Numbertext extension.]),
-,)
+ [Deprecated: use --with-ext-numbertext instead.]),
+ if test -z "$with_ext_numbertext"; then
+ with_ext_numbertext="$with_numbertext"
+ fi ,
+)
AC_ARG_WITH(hunart,
AS_HELP_STRING([--with-hunart],
- [Integrate Hungarian Cross-reference Toolbar extension.]),
-,)
+ [Deprecated: use --with-ext-hunart instead.]),
+ if test -z "$with_ext_hunart"; then
+ with_ext_hunart="$with_hunart"
+ fi ,
+)
AC_ARG_WITH(typo,
AS_HELP_STRING([--with-typo],
- [Integrate Typography Toolbar extension.]),
-,)
+ [Deprecated: use --with-ext-typo instead.]),
+ if test -z "$with_ext_typo"; then
+ with_ext_typo="$with_typo"
+ fi ,
+)
AC_ARG_WITH(watch-window,
AS_HELP_STRING([--with-watch-window],
- [Integrate Watch Window extension to Calc.]),
-,)
+ [Deprecated: use --with-ext-watch-window instead.]),
+ if test -z "$with_ext_watch_window"; then
+ with_ext_watch_window="$with_watch_window"
+ fi ,
+)
AC_ARG_WITH(diagram,
AS_HELP_STRING([--with-diagram],
- [Integrate Diagram extension.]),
-,)
+ [Deprecated: use --with-ext-diagram instead.]),
+ if test -z "$with_ext_diagram"; then
+ with_ext_diagram="$with_diagram"
+ fi ,
+)
AC_ARG_WITH(validator,
AS_HELP_STRING([--with-validator],
- [Integrate Validator extension.]),
-,)
+ [Deprecated: use --with-ext-validator instead.]),
+ if test -z "$with_ext_validator"; then
+ with_ext_validator="$with_validator"
+ fi ,
+)
AC_ARG_WITH(barcode,
AS_HELP_STRING([--with-barcode],
- [Integrate Barcode extension.]),
-,)
+ [Deprecated: use --with-ext-barcode instead.]),
+ if test -z "$with_ext_barcode"; then
+ with_ext_barcode="$with_barcode"
+ fi ,
+)
AC_ARG_WITH(google-docs,
AS_HELP_STRING([--with-google-docs],
- [Download and integrate Google Documents extension.]),
-,)
+ [Deprecated: use --with-ext-google-docs instead.]),
+ if test -z "$with_ext_google_docs"; then
+ with_ext_google_docs="$with_google_docs"
+ fi ,
+)
AC_ARG_WITH(nlpsolver,
AS_HELP_STRING([--with-nlpsolver],
- [Download and integrate NLPSolver extension.]),
-,)
+ [Deprecated: use --with-ext-nlpsolver instead.]),
+ if test -z "$with_ext_nlpsolver"; then
+ with_ext_nlpsolver="$with_nlpsolver"
+ fi ,
+)
AC_ARG_WITH(oooblogger,
AS_HELP_STRING([--with-oooblogger],
- [Download and integrate oooblogger extension.]),
-,)
+ [Deprecated: use --with-ext-oooblogger instead.]),
+ if test -z "$with_ext_oooblogger"; then
+ with_ext_oooblogger="$with_oooblogger"
+ fi ,
+)
BUILD_TYPE="OOo"
@@ -4454,7 +4599,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 "$with_ext_mysql_connector" -a "$with_ext_mysql_connector" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_MYSQLC=YES
AC_MSG_CHECKING([for mysqlc module])
@@ -6403,7 +6548,7 @@ AC_SUBST(ENABLE_OPENGL)
# presenter extra ui extension?
AC_MSG_CHECKING([whether to build extra presenter ui])
-AS_IF([test "x$enable_ext_presenter_ui" = "xyes"], [
+AS_IF([test "x$with_ext_presenter_ui" = "xyes"], [
AC_MSG_RESULT([yes])
ENABLE_PRESENTER_EXTRA_UI=YES
],[
@@ -6414,7 +6559,7 @@ AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
# presenter minimizer extension?
AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
-AS_IF([test "x$enable_ext_presenter_minimizer" = "xyes"], [
+AS_IF([test "x$with_ext_presenter_minimizer" = "xyes"], [
AC_MSG_RESULT([yes])
ENABLE_MINIMIZER=YES
],[
@@ -6426,7 +6571,7 @@ AC_SUBST(ENABLE_MINIMIZER)
# presenter console extension?
AC_MSG_CHECKING([whether to build the Presenter Console extension])
-AS_IF([test "x$enable_ext_presenter_console" = "xyes"], [
+AS_IF([test "x$with_ext_presenter_console" = "xyes"], [
AC_MSG_RESULT([yes])
ENABLE_PRESENTER_SCREEN=YES
],[
@@ -6438,7 +6583,7 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
# pdf import extension?
AC_MSG_CHECKING([whether to build the PDF Import extension])
-AS_IF([test "x$enable_ext_pdfimport" = "xyes"], [
+AS_IF([test "x$with_ext_pdfimport" = "xyes"], [
AC_MSG_RESULT([yes])
ENABLE_PDFIMPORT=YES
@@ -6484,7 +6629,7 @@ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$E
fi
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [
+AS_IF([test "x$with_ext_wiki_publisher" = "xyes"], [
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([for swext module])
if test -d ./swext; then
@@ -6524,7 +6669,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 "$with_ext_report_builder" -a "$with_ext_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_REPORTBUILDER=YES
AC_MSG_CHECKING([for reportbuilder module])
@@ -7161,18 +7306,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$with_ext_lightproof" = "z" -o "z$with_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$with_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 $with_ext_lightproof ; do
if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
wanted_lightproof="$wanted_lightproof $lang"
fi
@@ -7193,7 +7338,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$with_ext_watch_window" = "z" -o "z$with_ext_watch_window" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7205,7 +7350,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$with_ext_diagram" = "z" -o "z$with_ext_diagram" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7217,7 +7362,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$with_ext_validator" = "z" -o "z$with_ext_validator" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7229,7 +7374,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$with_ext_barcode" = "z" -o "z$with_ext_barcode" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7253,7 +7398,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$with_ext_numbertext" = "z" -o "z$with_ext_numbertext" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7265,7 +7410,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$with_ext_hunart" = "z" -o "z$with_ext_hunart" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7277,7 +7422,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$with_ext_typo" = "z" -o "z$with_ext_typo" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7289,7 +7434,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$with_ext_google_docs" = "z" -o "z$with_ext_google_docs" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7300,7 +7445,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$with_ext_nlpsolver" = "z" -o "z$with_ext_nlpsolver" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
@@ -7324,7 +7469,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$with_ext_oooblogger" = "z" -o "z$with_ext_oooblogger" = "zno" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
