diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 84c66a9de130..a93bcccba733 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([LibreOffice powered by CIB],[6.1.7.35],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([CIB Office],[6.1.7.41],[],[],[https://www.cib.de/office/]) AC_PREREQ([2.59]) @@ -7214,7 +7214,7 @@ if test "$with_export_validation" != "no"; then ODFVALIDATOR="$BUILDDIR/bin/odfvalidator.sh" # and fetch name of odfvalidator jar name from download.lst - ODFVALIDATOR_JAR=`$SED -n -e "s/export *ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst` + ODFVALIDATOR_JAR=`$SED -n -e "s/^ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst` AC_SUBST(ODFVALIDATOR_JAR) if test -z "$ODFVALIDATOR_JAR"; then @@ -7241,7 +7241,7 @@ if test "$with_export_validation" != "no"; then OFFICEOTRON="$BUILDDIR/bin/officeotron.sh" # and fetch name of officeotron jar name from download.lst - OFFICEOTRON_JAR=`$SED -n -e "s/export *OFFICEOTRON_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst` + OFFICEOTRON_JAR=`$SED -n -e "s/^OFFICEOTRON_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst` AC_SUBST(OFFICEOTRON_JAR) if test -z "$OFFICEOTRON_JAR"; then @@ -8254,13 +8254,16 @@ int main(int argc, char **argv) { internal) SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 - PYTHON_VERSION_MINOR=5 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.9 + 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"${PYTHON_VERSION}"]) BUILD_TYPE="$BUILD_TYPE PYTHON" + if test "$OS" = LINUX -o "$OS" = WNT ; then + BUILD_TYPE="$BUILD_TYPE LIBFFI" + fi # Embedded Python dies without Home set if test "$HOME" = ""; then export HOME="" |