[Libreoffice-commits] .: configure.in extensions/source set_soenv.in

[Tomáš Chvátal]

 configure.in                                  |   24 +++++++++++++++++++++++-
 extensions/source/nsplugin/source/makefile.mk |    8 ++++----
 set_soenv.in                                  |    1 +
 3 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit db7ab4ac1412143c2151787224e64e0cd090efb4
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Fri Nov 11 15:50:29 2011 +0100

    Add nsplugin switch so we dont bind nsplugin building to gtk switch.

diff --git a/configure.in b/configure.in
index 421289b..b5d21ee 100644
--- a/configure.in
+++ b/configure.in
@@ -740,6 +740,11 @@ AC_ARG_ENABLE(zenity,
         [Do not display a build icon in the notification area (on unix) during build.]),
 ,enable_zenity=yes)
 
+AC_ARG_ENABLE(nsplugin,
+    AS_HELP_STRING([--disable-nsplugin],
+        [Do not build nsplugin extension for browser embedding.])
+)
+
 AC_ARG_ENABLE(ccache,
     AS_HELP_STRING([--disable-ccache],
         [Do not try to use ccache automatically.
@@ -1313,7 +1318,7 @@ WITH_SYSTEM_MOZILLA=no)
 
 AC_ARG_WITH(system-mozilla-headers,
     AS_HELP_STRING([--with-system-mozilla-headers],
-        [Use mozilla headers provided by system instead of bundled ones. Needed for
+        [Use mozilla headers provided by system instead of bundled ones. Used in
          nsplugin]),,
     [with_system_mozilla_headers="$with_system_headers"]
 )
@@ -6010,6 +6015,23 @@ 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])
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 17a348e..5b74764 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -47,19 +47,19 @@ INCPRE=$(SOLARINCDIR)$/npsdk
 # not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
 CFLAGS+=-DMOZ_X11
 
-.IF "$(ENABLE_GTK)"==""
+.IF "$(ENABLE_NSPLUGIN)"=="NO"
 
 dummy:
-    @echo GTK disabled - nothing to build
+    @echo Nsplugin disabled, nothing to build
 
-.ELSE           # "$(ENABLE_GTK)"==""
+.ELSE           # ENABLE_NSPLUGIN
 .IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
     "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
 INC+= -DNP_LINUX
 .ENDIF
 PKGCONFIG_MODULES=gtk+-2.0
 .INCLUDE: pkg_config.mk
-.ENDIF          # "$(ENABLE_GTK)"==""
+.ENDIF          # ENABLE_NSPLUGIN
 .ENDIF          # "$(GUI)"=="UNX"
 .IF "$(GUI)"=="WNT" 
 INC+= -DENGLISH
diff --git a/set_soenv.in b/set_soenv.in
index a3d81c3..35ab64e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1486,6 +1486,7 @@ ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
 ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
 ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
+ToFile( "ENABLE_NSPLUGIN",     "@ENABLE_NSPLUGIN@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );