diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 66 |
1 files changed, 49 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 2b09b68ee759..2ca1fb09c398 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[6.4.10.41],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.4.10.68],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard @@ -2537,6 +2537,16 @@ if test -z "$BASH"; then fi AC_SUBST(BASH) +# prefer parallel comression tools, if available +AC_PATH_PROG(COMPRESSIONTOOL, pigz) +if test -z "$COMPRESSIONTOOL"; then + AC_PATH_PROG(COMPRESSIONTOOL, gzip) + if test -z "$COMPRESSIONTOOL"; then + AC_MSG_ERROR([gzip not found in \$PATH]) + fi +fi +AC_SUBST(COMPRESSIONTOOL) + AC_MSG_CHECKING([for GNU or BSD tar]) for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do $a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null @@ -2850,7 +2860,7 @@ if test $_os = Darwin; then # higher than or equal to the minimum required should be found. AC_MSG_CHECKING([what macOS SDK to use]) - for _macosx_sdk in ${with_macosx_sdk-11.3 11.1 11.0 10.15 10.14 10.13 10.12}; do + for _macosx_sdk in ${with_macosx_sdk-12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13 10.12}; do MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null` if test -d "$MACOSX_SDK_PATH"; then with_macosx_sdk="${_macosx_sdk}" @@ -2891,8 +2901,14 @@ if test $_os = Darwin; then 11.3) MACOSX_SDK_VERSION=110300 ;; + 12.0) + MACOSX_SDK_VERSION=120000 + ;; + 12.1) + MACOSX_SDK_VERSION=120100 + ;; *) - AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--11.3]) + AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.12--12.1]) ;; esac @@ -2960,8 +2976,14 @@ if test $_os = Darwin; then 11.3) MAC_OS_X_VERSION_MIN_REQUIRED="110300" ;; + 12.0) + MAC_OS_X_VERSION_MIN_REQUIRED="120000" + ;; + 12.1) + MAC_OS_X_VERSION_MIN_REQUIRED="120100" + ;; *) - AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--11.3]) + AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--12.1]) ;; esac MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=$with_macosx_version_min_required @@ -3032,8 +3054,14 @@ if test $_os = Darwin; then 11.3) MAC_OS_X_VERSION_MAX_ALLOWED="110100" ;; + 12.0) + MAC_OS_X_VERSION_MAX_ALLOWED="120000" + ;; + 12.1) + MAC_OS_X_VERSION_MAX_ALLOWED="120100" + ;; *) - AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--11.3]) + AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--12.1]) ;; esac @@ -3153,8 +3181,8 @@ dnl =================================================================== if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) - current_sdk_ver=14.5 - older_sdk_vers="14.4 14.3 14.2 14.1 14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2" + current_sdk_ver=15.2 + older_sdk_vers="15.0 14.5 14.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=12.2 @@ -3359,10 +3387,10 @@ if test "$_os" = "WINNT"; then BITNESS_OVERRIDE=64 fi fi -AC_SUBST(WINDOWS_SDK_ARCH) -if test "$_os" = "iOS" -o "$build_cpu" != "$host_cpu"; then +if test "$_os" = "iOS"; then cross_compiling="yes" fi + if test "$cross_compiling" = "yes"; then export CROSS_COMPILING=TRUE else @@ -4849,7 +4877,6 @@ if test "$cross_compiling" = "yes"; then bin/odfvalidator.sh.in \ bin/officeotron.sh.in \ instsetoo_native/util/openoffice.lst.in \ - setup_native/source/packinfo/finals_instsetoo.txt.in \ config_host/*.in \ sysui/desktop/macosx/Info.plist.in) \ | (cd CONF-FOR-BUILD && tar xf -) @@ -8247,7 +8274,11 @@ else SYSTEM_ZLIB= BUILD_TYPE="$BUILD_TYPE ZLIB" ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib" - ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + if test "$COM" = "MSC"; then + ZLIB_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/zlib.lib" + else + ZLIB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lzlib" + fi fi AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) @@ -8539,10 +8570,10 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1]) libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1]) libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) -libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.15]) +libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16]) libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) -libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8]) +libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) @@ -8945,14 +8976,14 @@ int main(int argc, char **argv) { internal) SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 - PYTHON_VERSION_MINOR=7 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10 + PYTHON_VERSION_MINOR=8 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) fi AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"3.7.7"]) BUILD_TYPE="$BUILD_TYPE PYTHON" - if test "$OS" = LINUX; then + if test "$OS" = LINUX -o "$OS" = WNT ; then BUILD_TYPE="$BUILD_TYPE LIBFFI" fi # Embedded Python dies without Home set @@ -12260,6 +12291,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar elif test -e /usr/share/java/hamcrest/core.jar; then HAMCREST_JAR=/usr/share/java/hamcrest/core.jar + elif test -e /usr/share/java/hamcrest/hamcrest.jar; then + HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar else HAMCREST_JAR=/usr/share/java/hamcrest.jar fi @@ -13085,7 +13118,6 @@ AC_CONFIG_FILES([config_host.mk bin/odfvalidator.sh bin/officeotron.sh instsetoo_native/util/openoffice.lst - setup_native/source/packinfo/finals_instsetoo.txt sysui/desktop/macosx/Info.plist]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) |