config_host.mk.in | 2 --
configure.ac | 6 ------
2 files changed, 8 deletions(-)
New commits:
commit 0328bd0adeafafaa79501a1cf31557fd4c7a6c2a
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Oct 11 08:44:57 2021 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Oct 11 11:30:45 2021 +0200
remove unused variables
The if is even wrong, testing for WINNT nested inside testing
for not WINNT.
Change-Id: I797ff61099064f1b66fea34fb25a00a88df4fca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123255
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/config_host.mk.in b/config_host.mk.in
index 8d8b6e013db1..f9d4e2f0d05d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -126,7 +126,6 @@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
export DISABLE_PYTHON=@DISABLE_PYTHON@
export DLOPEN_LIBS=@DLOPEN_LIBS@
-export DLLTOOL=@DLLTOOL@
export DOCDIR=@DOCDIR@
export DOXYGEN=@DOXYGEN@
export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
@@ -683,7 +682,6 @@ export WINDOWS_SDK_LIB_SUBDIR=@WINDOWS_SDK_LIB_SUBDIR@
export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
export WINDOWS_X64=@WINDOWS_X64@
-export WINDRES=@WINDRES@
export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@
export WITH_EXTENSION_INTEGRATION=@WITH_EXTENSION_INTEGRATION@
export WITH_EXTRA_EXTENSIONS=@WITH_EXTRA_EXTENSIONS@
diff --git a/configure.ac b/configure.ac
index 90fc05c31f80..4c9690d01007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6262,13 +6262,8 @@ if test "$_os" != "WINNT"; then
AC_CHECK_TOOL(OBJDUMP,objdump)
AC_CHECK_TOOL(READELF,readelf)
AC_CHECK_TOOL(STRIP,strip)
- if test "$_os" = "WINNT"; then
- AC_CHECK_TOOL(DLLTOOL,dlltool)
- AC_CHECK_TOOL(WINDRES,windres)
- fi
fi
AC_SUBST(AR)
-AC_SUBST(DLLTOOL)
AC_SUBST(LD)
AC_SUBST(NM)
AC_SUBST(OBJDUMP)
@@ -6278,7 +6273,6 @@ AC_SUBST(PKG_CONFIG_LIBDIR)
AC_SUBST(RANLIB)
AC_SUBST(READELF)
AC_SUBST(STRIP)
-AC_SUBST(WINDRES)
dnl ===================================================================
dnl pkg-config checks on macOS
