diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 11:54:32 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 16:48:47 +0100 |
| commit | 17608c5718dbebfaf301b3a00d735161f66b1a69 (patch) | |
| tree | 6e63c552ee6128195118a9696c81242ac0c2a77a /configure.ac | |
| parent | 4fcbf4df8effc91b08d83922bfe0033f43aaa1f6 (diff) | |
Refactor some buildsytem stuff (mostly whitespace)
Change-Id: Idfca786ecc7251e08525bd5b45936143727c43d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126731
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 52b3b5f14d1e..760f03ebf9de 100644 --- a/configure.ac +++ b/configure.ac @@ -2987,14 +2987,6 @@ if test -z "$enable_extensions"; then fi fi -if test "$enable_extensions" = yes; then - BUILD_TYPE="$BUILD_TYPE EXTENSIONS" - AC_DEFINE(HAVE_FEATURE_EXTENSIONS) -else - enable_extension_integration=no - enable_extension_update=no -fi - DISABLE_SCRIPTING='' if test "$enable_scripting" = yes; then BUILD_TYPE="$BUILD_TYPE SCRIPTING" @@ -3020,6 +3012,14 @@ else fi AC_SUBST(DISABLE_DYNLOADING) +if test "$enable_extensions" = yes; then + BUILD_TYPE="$BUILD_TYPE EXTENSIONS" + AC_DEFINE(HAVE_FEATURE_EXTENSIONS) +else + enable_extension_integration=no + enable_extension_update=no +fi + # remember SYSBASE value AC_SUBST(SYSBASE) @@ -11582,7 +11582,6 @@ if test "x$enable_qt6" = "xyes"; then fi AC_SUBST(ENABLE_QT6) - ENABLE_KF5="" if test "x$enable_kf5" = "xyes"; then ENABLE_KF5="TRUE" @@ -12414,15 +12413,13 @@ AC_SUBST([HAVE_LO_CLANG_DLLEXPORTINLINES]) SYSTEM_GPGMEPP= +AC_MSG_CHECKING([whether to enable gpgmepp]) if test "$enable_gpgmepp" = no; then - AC_MSG_CHECKING([whether to enable gpgmepp]) AC_MSG_RESULT([no]) elif test "$enable_mpl_subset" = "yes"; then - AC_MSG_CHECKING([whether gpgmepp should be disabled due to building just MPL]) - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([no (MPL only]) elif test "$enable_fuzzers" = "yes"; then - AC_MSG_CHECKING([whether gpgmepp should be disabled due to oss-fuzz]) - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([no (oss-fuzz)]) elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then dnl =================================================================== dnl Check for system gpgme @@ -12498,6 +12495,8 @@ elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then AC_MSG_RESULT([no]) fi fi +else + AC_MSG_RESULT([no (unsuppoted OS)]) fi AC_SUBST(ENABLE_GPGMEPP) AC_SUBST(SYSTEM_GPGMEPP) |