Still to master and MPL 1.1 / GPLv3+ / LGPLv3+
>From f284735c1be452cf65a9f8b93fa535e00471aff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= <ron...@iki.fi>
Date: Thu, 19 May 2011 00:28:04 +0300
Subject: [PATCH] Removal of deprecated options
Removed all deprecated options of extensions from configure and
fixed style of next subtitle.
Fixed distro-configs LibreOfficeWin32 and NovellWin32 correspondingly.
---
configure.in | 110 +------------------------------
distro-configs/LibreOfficeWin32.conf.in | 2 +-
distro-configs/NovellWin32.conf.in | 2 +-
3 files changed, 4 insertions(+), 110 deletions(-)
diff --git a/configure.in b/configure.in
index cfc9aa1..18ef132 100755
--- a/configure.in
+++ b/configure.in
@@ -524,117 +524,11 @@ AC_ARG_WITH(win32,
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,
- 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(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(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(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
-dnl
+dnl ===================================================================
dnl Setup the misc. tweaks we need.
-dnl
+dnl ===================================================================
BASEDIR=$PWD
TOOLSDIR=$BASEDIR
diff --git a/distro-configs/LibreOfficeWin32.conf.in b/distro-configs/LibreOfficeWin32.conf.in
index 5a675d9..18d6bbd 100644
--- a/distro-configs/LibreOfficeWin32.conf.in
+++ b/distro-configs/LibreOfficeWin32.conf.in
@@ -3,9 +3,9 @@
--without-junit
--without-helppack-integration
--without-agfa-monotype-fonts
---with-nlpsolver
--with-java-target-version=1.5
--with-extension-integration
+--enable-ext-nlpsolver
--enable-wiki-publisher
--enable-report-builder
--enable-presenter-console
diff --git a/distro-configs/NovellWin32.conf.in b/distro-configs/NovellWin32.conf.in
index 461ede0..33c9e70 100644
--- a/distro-configs/NovellWin32.conf.in
+++ b/distro-configs/NovellWin32.conf.in
@@ -7,10 +7,10 @@
--enable-activex-component
--disable-xrender-link
--without-junit
---with-nlpsolver
--with-java-target-version=1.5
--with-extension-integration
--without-helppack-integration
+--enable-ext-nlpsolver
--enable-ext-pdfimport
--enable-ext-presenter-console
--enable-ext-presenter-minimizer
--
1.7.4.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
