[Libreoffice-commits] .: configure.in Repository.mk scp2/source

[Michael Meeks]

 Repository.mk                        |    1 +
 configure.in                         |   13 ++++++++-----
 scp2/source/gnome/makefile.mk        |    4 ++++
 scp2/source/gnome/module_gnome.scp   |    3 +++
 scp2/source/ooo/file_library_ooo.scp |    8 ++++++++
 5 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 8c1bff3a053aa3c325264db4ce2ea1691ed60594
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Jun 14 16:30:20 2011 +0100

    more configure, and scp2 pieces for gtk3 integration

diff --git a/Repository.mk b/Repository.mk
index c167dfc..f01ace1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -117,6 +117,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     vcl \
     vclplug_gen \
     vclplug_gtk \
+    vclplug_gtk3 \
     vclplug_kde \
     vclplug_kde4 \
     vclplug_svp \
diff --git a/configure.in b/configure.in
index 2a6a79e..0695bc0 100755
--- a/configure.in
+++ b/configure.in
@@ -269,7 +269,7 @@ AC_ARG_ENABLE(gtk,
 AC_ARG_ENABLE(gtk3,
     AS_HELP_STRING([--disable-gtk3],
         [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
-,enable_gtk3=yes)
+,enable_gtk3=no)
 
 AC_ARG_ENABLE(systray,
     AS_HELP_STRING([--disable-systray],
@@ -6349,10 +6349,13 @@ GTK3_CFLAGS=""
 GTK3_LIBS=""
 ENABLE_GTK3=""
 if test "x$enable_gtk3" = "xyes"; then
-      PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.0, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
-      if test "x$ENABLE_GTK3" = "xTRUE"; then
-            R="gtk3"
-      fi
+   if test "$with_system_cairo" != yes; then
+      echo "System cairo required for gtk3 support, please use --system-cairo"
+   fi
+   PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+   if test "x$ENABLE_GTK3" = "xTRUE"; then
+      R="gtk3"
+   fi
 fi
 AC_SUBST(GTK3_LIBS)
 AC_SUBST(GTK3_CFLAGS)
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 581aae4..43c2440 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 5572a26..8b84916 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 125a50c..27bc0cb 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