Kaydet (Commit) df54f97a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

UNIXWRAPPERNAME is unused

Change-Id: Ic25acc8413960c2268b5fffc287e8e4f3165a767
üst 9c402abd
...@@ -518,7 +518,6 @@ export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@ ...@@ -518,7 +518,6 @@ export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
export TLS=@TLS@ export TLS=@TLS@
export TMPDIR=@TEMP_DIRECTORY@ export TMPDIR=@TEMP_DIRECTORY@
export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
export UNOWINREG_DLL=@UNOWINREG_DLL@ export UNOWINREG_DLL=@UNOWINREG_DLL@
export UPD=@UPD@ export UPD=@UPD@
export URELIBS=@URELIBS@ export URELIBS=@URELIBS@
......
...@@ -1828,15 +1828,6 @@ AC_ARG_WITH(vendor, ...@@ -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, AC_ARG_WITH(compat-oowrappers,
AS_HELP_STRING([--with-compat-oowrappers], AS_HELP_STRING([--with-compat-oowrappers],
[Install oo* wrappers in parallel with [Install oo* wrappers in parallel with
...@@ -11513,16 +11504,6 @@ else ...@@ -11513,16 +11504,6 @@ else
fi fi
AC_SUBST(OOO_VENDOR) 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]) AC_MSG_CHECKING([whether to install the compat oo* wrappers])
if test "$with_compat_oowrappers" = "yes"; then if test "$with_compat_oowrappers" = "yes"; then
WITH_COMPAT_OOWRAPPERS=YES WITH_COMPAT_OOWRAPPERS=YES
......
--with-vendor=The Document Foundation --with-vendor=The Document Foundation
--with-system-dicts --with-system-dicts
--with-myspell-dicts --with-myspell-dicts
--without-unix-wrapper
--with-system-zlib --with-system-zlib
--without-system-poppler --without-system-poppler
--without-system-openssl --without-system-openssl
......
...@@ -37,6 +37,5 @@ ...@@ -37,6 +37,5 @@
--with-system-zlib --with-system-zlib
--with-vendor=The OpenBSD project --with-vendor=The OpenBSD project
--without-junit --without-junit
--without-unix-wrapper
--without-system-libwpd --without-system-libwpd
--with-help --with-help
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
--enable-gtk --enable-gtk
--enable-evolution2 --enable-evolution2
--enable-lockdown --enable-lockdown
--with-unix-wrapper
--with-fonts --with-fonts
--enable-extra-gallery --enable-extra-gallery
--enable-extra-template --enable-extra-template
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment