[Libreoffice-commits] .: configure.in

[Norbert Thiebaud]

 configure.in |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 6207ae5e0bca8540a5d27ccacd300099a97665cd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Nov 11 11:57:28 2011 -0600

    nsplugin check must occurs after enable_gtk value is completely settled.

diff --git a/configure.in b/configure.in
index b5d21ee..3d1830d 100644
--- a/configure.in
+++ b/configure.in
@@ -6015,23 +6015,6 @@ AC_SUBST(MOZILLA_HEADERS_CFLAGS)
 AC_SUBST(SYSTEM_MOZILLA_HEADERS)
 
 dnl ===================================================================
-dnl Check for nsplugin
-dnl ===================================================================
-AC_MSG_CHECKING([wether to build nsplugin extension])
-ENABLE_NSPLUGIN=NO
-if test "$enable_nsplugin" != "no"; then
-    if test "$enable_gtk" != "no"; then
-        AC_MSG_RESULT([yes])
-	ENABLE_NSPLUGIN=YES
-    else
-        AC_MSG_RESULT([no, disabled gtk2])
-    fi
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_NSPLUGIN)
-
-dnl ===================================================================
 dnl Check for system sane
 dnl ===================================================================
 AC_MSG_CHECKING([which sane header to use])
@@ -6174,6 +6157,23 @@ if test $_os = iOS -o $_os = Android; then
     enable_gtk=no
 fi
 
+dnl ===================================================================
+dnl Check for nsplugin
+dnl ===================================================================
+AC_MSG_CHECKING([wether to build nsplugin extension])
+ENABLE_NSPLUGIN=NO
+if test "$enable_nsplugin" != "no"; then
+    if test "$enable_gtk" != "no"; then
+        AC_MSG_RESULT([yes])
+	ENABLE_NSPLUGIN=YES
+    else
+        AC_MSG_RESULT([no, disabled gtk2])
+    fi
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_NSPLUGIN)
+
 dnl ***************************************
 dnl testing for X libraries and includes...
 dnl ***************************************