diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 1 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeOpenBSD.conf | 1 | ||||
| -rw-r--r-- | distro-configs/OxygenOfficeLinux.conf | 1 |
5 files changed, 0 insertions, 23 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 2b1d189f154b..c73116790dc0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -518,7 +518,6 @@ export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@ export TLS=@TLS@ export TMPDIR=@TEMP_DIRECTORY@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ -export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@ export UNOWINREG_DLL=@UNOWINREG_DLL@ export UPD=@UPD@ export URELIBS=@URELIBS@ diff --git a/configure.ac b/configure.ac index be863741f29e..eaaf34b919fe 100644 --- a/configure.ac +++ b/configure.ac @@ -1828,15 +1828,6 @@ AC_ARG_WITH(vendor, ], ,) -AC_ARG_WITH(unix-wrapper, - AS_HELP_STRING([--with-unix-wrapper], - [Redefines the name of the UNIX wrapper that will be used in the desktop - files and in the desktop-integration RPMs.]) - [ - Usage: --with-unix-wrapper=ooffice - ], -,) - AC_ARG_WITH(compat-oowrappers, AS_HELP_STRING([--with-compat-oowrappers], [Install oo* wrappers in parallel with @@ -11513,16 +11504,6 @@ else fi AC_SUBST(OOO_VENDOR) -UNIXWRAPPERNAME= -AC_MSG_CHECKING([for UNIX wrapper name]) -if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes"; then - AC_MSG_RESULT([not set]) -else - UNIXWRAPPERNAME="$with_unix_wrapper" - AC_MSG_RESULT([$UNIXWRAPPERNAME]) -fi -AC_SUBST(UNIXWRAPPERNAME) - AC_MSG_CHECKING([whether to install the compat oo* wrappers]) if test "$with_compat_oowrappers" = "yes"; then WITH_COMPAT_OOWRAPPERS=YES diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 1b841e4a8628..d9cd2d7f4da7 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -1,7 +1,6 @@ --with-vendor=The Document Foundation --with-system-dicts --with-myspell-dicts ---without-unix-wrapper --with-system-zlib --without-system-poppler --without-system-openssl diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 3492b7e3ce75..9967da547f36 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -37,6 +37,5 @@ --with-system-zlib --with-vendor=The OpenBSD project --without-junit ---without-unix-wrapper --without-system-libwpd --with-help diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 91da2264e96a..7a3da9c073fc 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -20,7 +20,6 @@ --enable-gtk --enable-evolution2 --enable-lockdown ---with-unix-wrapper --with-fonts --enable-extra-gallery --enable-extra-template |