From 873d2149f76b2031a8bc83daba3d6fad7560588a Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 12 Apr 2013 02:37:46 +0300
Subject: No point in even considering mergelibs for Android or iOS

Change-Id: I2b587946f094cd4e83f4148d6e3359452ec36bf6
---
 configure.ac | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 96ddaf761b54..cd9f0d06b684 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11633,8 +11633,15 @@ fi
 # ===================================================================
 AC_MSG_CHECKING([whether to create huge library])
 MERGELIBS=
+
+if test $_os = iOS -o $_os = Android; then
+    # Never any point in mergelibs for these as we build just static
+    # libraries anyway...
+    enable_mergelibs=no
+fi
+
 if test "$enable_mergelibs" != "no"; then
-    if test $_os != Linux -a $_os != Android -a $_os != WINNT; then
+    if test $_os != Linux -a $_os != WINNT; then
         add_warning "--enable-mergelibs is not tested for this platform"
     fi
     if test "$enable_mergelibs" = "all"; then
-- 
cgit