[Libreoffice-commits] core.git: 10 commits - config_host.mk.in configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf include/sal
Tor Lillqvist
tml at iki.fi
Wed May 15 00:20:09 PDT 2013
config_host.mk.in | 7 -----
configure.ac | 44 +--------------------------------
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/LibreOfficeOpenBSD.conf | 1
distro-configs/OxygenOfficeLinux.conf | 1
include/sal/log-areas.dox | 1
6 files changed, 3 insertions(+), 52 deletions(-)
New commits:
commit 5b9c27b6e5def4b55cd832626624c6c41df08989
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:52:05 2013 +0300
Also just "xmloff" is (misguidedly?) used as a log area nowadays
Change-Id: I5af86a56b723d5f4b706cc8af6e1b25faf918469
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 9257dee..a570731 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -302,6 +302,7 @@ certain functionality.
@section xmloff
+ at li @c xmloff
@li @c xmloff.core
@li @c xmloff.draw
@li @c xmloff.forms
commit f3f6c11ee2da108ab5c0d54979d7925f9175a6b6
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:41:57 2013 +0300
No idea what use_shl_version is
Change-Id: I85ae4a65c32fda4b6cf79e0e9ed1c3add3941364
diff --git a/configure.ac b/configure.ac
index eaaf34b..21384ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,6 @@ cygwin*|interix*|mingw32*)
test_freetype=no
test_fontconfig=no
_os=WINNT
- use_shl_version="TRUE"
DLLPOST=".dll"
LINKFLAGSNOUNDEFS=
@@ -615,8 +614,6 @@ if test "$_os" = "AIX"; then
fi
fi
-AC_SUBST(use_shl_version)
-
AC_SUBST(WITH_MINGW)
AC_SUBST(OSVERSION)
AC_SUBST(PTHREAD_CFLAGS)
commit df54f97aaf613714d785461859a35fdf7a899990
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:38:31 2013 +0300
UNIXWRAPPERNAME is unused
Change-Id: Ic25acc8413960c2268b5fffc287e8e4f3165a767
diff --git a/config_host.mk.in b/config_host.mk.in
index 2b1d189..c731167 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 be86374..eaaf34b 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 1b841e4..d9cd2d7 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 3492b7e..9967da5 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 91da226..7a3da9c 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
commit 9c402abdd5e12fca6f0cc8fc41e6b248866cbb67
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:34:16 2013 +0300
What is PSPRINT, seems unused
Change-Id: Ib194156122c91a8911b748004e658835986ffc67
diff --git a/config_host.mk.in b/config_host.mk.in
index 3fc5474..2b1d189 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -408,7 +408,6 @@ export PROGRESSPOSITION=@PROGRESSPOSITION@
export PROGRESSSIZE=@PROGRESSSIZE@
export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@
export PROGRESSTEXTCOLOR=@PROGRESSTEXTCOLOR@
-export PSPRINT=TRUE
export PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
export PTHREAD_LIBS=@PTHREAD_LIBS@
export PYTHON_CFLAGS=$(gb_SPACE)@PYTHON_CFLAGS@
commit 9bf0ff2e714d803b892d429a623f8309aa7c2202
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:28:52 2013 +0300
MKDEPENDSOLVER seems unused
Change-Id: I35c5ec82a59e28c887ece8dc3ad10de764a3e66e
diff --git a/config_host.mk.in b/config_host.mk.in
index 28f6640..3fc5474 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -334,7 +334,6 @@ export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@
export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@
export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@
export MINGW_SYSROOT=@MINGW_SYSROOT@
-export MKDEPENDSOLVER=TRUE
export ML_EXE=@ML_EXE@
export MOC4=@MOC4@
export MOC=@MOC@
commit bf0534dad63bda9112c71f56dca42fd8afa27479
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:27:19 2013 +0300
MINGW_PYTHON_EXE is unused
Change-Id: I4fb439a3605fc031b0f2e5ca4c91b6413e188181
diff --git a/config_host.mk.in b/config_host.mk.in
index cff9208..28f6640 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -330,7 +330,6 @@ export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
export MINGW_DLLS=@MINGW_DLLS@
export MINGW_GCCDLL=@MINGW_GCCDLL@
export MINGW_GXXDLL=@MINGW_GXXDLL@
-export MINGW_PYTHON_EXE=@MINGW_PYTHON_EXE@
export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@
export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@
export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@
diff --git a/configure.ac b/configure.ac
index cb5a476..be86374 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7512,11 +7512,6 @@ if test $enable_python = system; then
PYTHON_CFLAGS="-I${MINGW_SYSROOT}/include/python$python_version"
PYTHON_LIBS="-L${MINGW_SYSROOT}/lib -lpython$python_version $python_libs"
AC_MSG_CHECKING([for python.exe])
- AS_IF([test -f "$MINGW_SYSROOT/bin/python.exe"],
- [AC_MSG_RESULT([$MINGW_SYSROOT/bin/python.exe])
- MINGW_PYTHON_EXE=python.exe],
- [AC_MSG_RESULT([not found])
- AC_MSG_ERROR([could not find python.exe])])
libo_MINGW_CHECK_DLL([libpython$python_version])
libo_MINGW_CHECK_DLL([libreadline6])
libo_MINGW_CHECK_DLL([libtermcap])
@@ -7610,7 +7605,6 @@ AC_SUBST(PYTHON_LIBS)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(PYTHON_VERSION_MAJOR)
AC_SUBST(PYTHON_VERSION_MINOR)
-AC_SUBST([MINGW_PYTHON_EXE])
AC_MSG_CHECKING([whether to build the MariaDB/MySQL Connector extension])
if test "x$enable_ext_mariadb_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then
commit b28f25aa9eeed71bd3f399a9c8fc4f1497b92e82
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:25:23 2013 +0300
MINGW_CLIB_DIR is unused
Change-Id: I0bb3e52866b182ed112c49725e4efd7f1018031e
diff --git a/configure.ac b/configure.ac
index d76af04..cb5a476 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5315,9 +5315,6 @@ _ACEOF
MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
AC_SUBST(MINGW_LIB_INCLUDE_PATH)
- mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
- MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
-
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([for dynamic libgcc])
@@ -5363,7 +5360,6 @@ using namespace std;
AC_LANG_POP([C++])
- AC_SUBST(MINGW_CLIB_DIR)
AC_SUBST(MINGW_SHARED_GCCLIB)
AC_SUBST(MINGW_SHARED_GXXLIB)
AC_SUBST(MINGW_SHARED_LIBSTDCPP)
commit 0904be013e30458c933c7fb971b325e3f67d8198
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:23:54 2013 +0300
MFC_LIB is unused
Change-Id: I43fb5190f3dff8b2ab1d4ca043a8c852cc353ba8
diff --git a/config_host.mk.in b/config_host.mk.in
index 8ce5ea3..cff9208 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -324,7 +324,6 @@ export MD5SUM=@MD5SUM@
export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
export MERGELIBS=@MERGELIBS@
export MERGE_MODULES=@MERGE_MODULES@
-export MFC_LIB=@MFC_LIB@
export MINGWCXX=@MINGWCXX@
export MINGWSTRIP=@MINGWSTRIP@
export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
diff --git a/configure.ac b/configure.ac
index ff7242b..d76af04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11784,15 +11784,12 @@ if test "$build_os" = "cygwin"; then
if test "$DISABLE_ACTIVEX" = "YES"; then
ATL_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE
ATL_INCLUDE="$WINDOWS_SDK_HOME/include/atl"
- MFC_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE
else
ATL_LIB="$COMPATH/atlmfc/lib"
ATL_INCLUDE="$COMPATH/atlmfc/include"
- MFC_LIB="$COMPATH/atlmfc/lib"
fi
if test "$BITNESS_OVERRIDE" = 64; then
ATL_LIB="$ATL_LIB/amd64"
- MFC_LIB="$MFC_LIB/amd64"
fi
PathFormat "/usr/bin/grep.exe"
WIN_GREP="$formatted_path"
@@ -11806,7 +11803,6 @@ fi
AC_SUBST(ATL_INCLUDE)
AC_SUBST(ATL_LIB)
-AC_SUBST(MFC_LIB)
AC_SUBST(WIN_FIND)
AC_SUBST(WIN_GREP)
AC_SUBST(WIN_LS)
commit bafd9479aad91b9c7dc2ad1d3f27c560989ce549
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:23:11 2013 +0300
MFC_INCLUDE is unused
Change-Id: I8aa68985734aa3a2931727415b5bd412af6e6cd0
diff --git a/config_host.mk.in b/config_host.mk.in
index dd8400a..8ce5ea3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -324,7 +324,6 @@ export MD5SUM=@MD5SUM@
export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
export MERGELIBS=@MERGELIBS@
export MERGE_MODULES=@MERGE_MODULES@
-export MFC_INCLUDE=@MFC_INCLUDE@
export MFC_LIB=@MFC_LIB@
export MINGWCXX=@MINGWCXX@
export MINGWSTRIP=@MINGWSTRIP@
diff --git a/configure.ac b/configure.ac
index eb7ce82..ff7242b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11785,12 +11785,10 @@ if test "$build_os" = "cygwin"; then
ATL_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE
ATL_INCLUDE="$WINDOWS_SDK_HOME/include/atl"
MFC_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE
- MFC_INCLUDE="$WINDOWS_SDK_HOME/include/mfc"
else
ATL_LIB="$COMPATH/atlmfc/lib"
ATL_INCLUDE="$COMPATH/atlmfc/include"
MFC_LIB="$COMPATH/atlmfc/lib"
- MFC_INCLUDE="$WINDOWS_SDK_HOME/include/mfc"
fi
if test "$BITNESS_OVERRIDE" = 64; then
ATL_LIB="$ATL_LIB/amd64"
@@ -11808,7 +11806,6 @@ fi
AC_SUBST(ATL_INCLUDE)
AC_SUBST(ATL_LIB)
-AC_SUBST(MFC_INCLUDE)
AC_SUBST(MFC_LIB)
AC_SUBST(WIN_FIND)
AC_SUBST(WIN_GREP)
commit 32bec67bc644fbb7f5024113b24702547f7f8950
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 15 09:19:51 2013 +0300
LIBO_THIS_YEAR is used only as an AC_DEFINEd variable
Change-Id: I0c9676fcffbb1080a7d8dd26c80f9a9af08aa04c
diff --git a/config_host.mk.in b/config_host.mk.in
index ada0151b..dd8400a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -291,7 +291,6 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
export LIBLOADER_JAR=@LIBLOADER_JAR@
-export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
diff --git a/configure.ac b/configure.ac
index 31e07e4..eb7ce82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4204,13 +4204,12 @@ AC_SUBST(LIBO_VERSION_PATCH)
AC_SUBST(LIBO_VERSION_SUFFIX)
AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX)
-LIBO_THIS_YEAR=`date +%Y`
-AC_SUBST(LIBO_THIS_YEAR)
-
AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
+
+LIBO_THIS_YEAR=`date +%Y`
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
# This UPD silly thing must go away soon
More information about the Libreoffice-commits
mailing list