summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-09-22 10:01:34 -0400
committerDavid Tardon <dtardon@redhat.com>2012-10-07 10:42:25 +0200
commitcaa51aedc139cc6af678323658d352d6ea8509bf (patch)
tree5245371efadab1436c9eeb37a62199afe6cdd2fe /configure.in
parentprevent libmerged warning spam (diff)
downloadcore-caa51aedc139cc6af678323658d352d6ea8509bf.tar.gz
core-caa51aedc139cc6af678323658d352d6ea8509bf.zip
mergelibs works on windows now
Change-Id: I536921b4734a50b90aa0007ebf2120306ce497a0
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index e8e0295df290..faf2679fb54d 100644
--- a/configure.in
+++ b/configure.in
@@ -12574,7 +12574,7 @@ if test "$enable_mergelibs" = "yes" ; then
add_warning "--enable-mergelibs conflicts with --enable-binfilter. Disabling mergelibs."
AC_MSG_RESULT([no])
else
- if test $_os != Linux -a $_os != Android; then
+ if test $_os != Linux -a $_os != Android -a $_os != WINNT; then
add_warning "--enable-mergelibs is not tested for this platform"
fi
MERGELIBS="TRUE"