configure.ac |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 38ec9348eeea29611c1c7ebc626f88474b850ebc
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Feb 29 19:45:45 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Mar 1 07:06:50 2024 +0100

    remove mergelibs warning from configure
    
    It is now known working on Linux/macOS/Windows
    
    Change-Id: Ib529a002a88cc94798a6707af7319ce9e25aca48
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164169
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index ae808e69c5b0..b46ecdfbec4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14871,17 +14871,11 @@ fi
 
 if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
     if test "$enable_mergelibs" = "more"; then
-        if test $_os != Linux; then
-            add_warning "--enable-mergelibs=more is not tested for this 
platform"
-        fi
         MERGELIBS="TRUE"
         MERGELIBS_MORE="TRUE"
         AC_MSG_RESULT([yes (more)])
         AC_DEFINE(ENABLE_MERGELIBS)
     elif test "$enable_mergelibs" = "yes" -o "$enable_mergelibs" = ""; then
-        if test $_os != Linux -a $_os != WINNT; then
-            add_warning "--enable-mergelibs is not tested for this platform"
-        fi
         MERGELIBS="TRUE"
         AC_MSG_RESULT([yes])
         AC_DEFINE(ENABLE_MERGELIBS)

Reply via email to