From 5ad60c5d69042a73d7a1632d3c04e15783817db4 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Tue, 14 Jun 2011 16:30:20 +0100
Subject: more configure, and scp2 pieces for gtk3 integration

---
 scp2/source/gnome/makefile.mk        | 4 ++++
 scp2/source/gnome/module_gnome.scp   | 3 +++
 scp2/source/ooo/file_library_ooo.scp | 8 ++++++++
 3 files changed, 15 insertions(+)

(limited to 'scp2')

diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 581aae447a55..43c2440695a9 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -61,6 +61,10 @@ SCPDEFS+=-DENABLE_GNOMEVFS
 SCPDEFS+=-DENABLE_GIO
 .ENDIF
 
+.IF "$(ENABLE_GTK3)" != ""
+SCPDEFS+=-DENABLE_GTK3
+.ENDIF
+
 PARFILES =                   \
         module_gnome.par     \
         file_gnome.par
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 5572a26a64ef..8b84916172ac 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -44,6 +44,9 @@ Module gid_Module_Optional_Gnome
       gid_File_Lib_Evoab_2,
       gid_File_Lib_Fps_Gnome,
       gid_File_Lib_Vclplug_Gtk,
+#ifdef ENABLE_GTK3
+      gid_File_Lib_Vclplug_Gtk3,
+#endif
       gid_File_Bin_Gnome_Open_Url,
       gid_File_Bin_Gnome_Open_Url_Bin,
 #ifdef ENABLE_SYSTRAY_GTK
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 125a50c5ccd2..27bc0cb44583 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1052,6 +1052,14 @@ File gid_File_Lib_Vclplug_Gtk
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
+#ifdef ENABLE_GTK3
+File gid_File_Lib_Vclplug_Gtk3
+    Name = LIBNAME(vclplug_gtk3);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
 #ifdef ENABLE_KDE
 #ifndef MACOSX
 File gid_File_Lib_Vclplug_Kde
-- 
cgit