[Libreoffice-commits] core.git: configure.ac

[Miklos Vajna]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac8461c6287f39c600333fb7a8df90a6f44dbee0
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Apr 12 07:45:09 2013 +0200

    configure: fix typo that enabled mergelibs by default
    
    The commit message of 0e5f2ea0de71439fe121da47deaba68585541808? didn't
    mention this, so I guess flipping over the default was just an accident.
    
    Change-Id: I9078cc56a6064e3498b012848b860c7b414b37e6

diff --git a/configure.ac b/configure.ac
index cd9f0d0..6e45005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11640,7 +11640,7 @@ if test $_os = iOS -o $_os = Android; then
     enable_mergelibs=no
 fi
 
-if test "$enable_mergelibs" != "no"; then
+if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
     if test $_os != Linux -a $_os != WINNT; then
         add_warning "--enable-mergelibs is not tested for this platform"
     fi