[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - configure.in

[Andras Timar]

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

New commits:
commit 61d371f9de3fc05d1e537ede87bac498f484af19
Author: Andras Timar <ati...@suse.com>
Date:   Fri Feb 22 12:19:06 2013 +0100

    fdo#54087 build npsoplugin on Windows, it does not depend on GTK+ there
    
    Conflicts:
    
        configure.ac
    
    Change-Id: I033ee2316337dab549f1beddbfb7919a35d73c8e
    Reviewed-on: https://gerrit.libreoffice.org/2335
    Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>

diff --git a/configure.in b/configure.in
index 071380a..0bd6937 100644
--- a/configure.in
+++ b/configure.in
@@ -8014,7 +8014,7 @@ if test $_os = Darwin -o $_os = iOS -o $_os = Android; 
then
     enable_gtk=no
 fi
 if test "$enable_nsplugin" != "no"; then
-    if test "$enable_gtk" != "no"; then
+    if test "$enable_gtk" != "no" -o "$_os" == WINNT; then
         AC_MSG_RESULT([yes])
         ENABLE_NSPLUGIN=YES
     else

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits