[Libreoffice-commits] .: configure.in set_soenv.in

[Michael Meeks]

 configure.in |   21 ++++++++++++++++++++-
 set_soenv.in |    7 +++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit e5e55a0e9000aa3e5ea2a8ec5a599eb455ea7957
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Jun 14 12:28:52 2011 +0100

    first cut of gtk3 auto-detection, and autoconf-foo

diff --git a/configure.in b/configure.in
index 6d600c8..2a6a79e 100755
--- a/configure.in
+++ b/configure.in
@@ -266,6 +266,11 @@ AC_ARG_ENABLE(gtk,
         [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]),
 ,enable_gtk=yes)
 
+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)
+
 AC_ARG_ENABLE(systray,
     AS_HELP_STRING([--disable-systray],
         [Determines whether to build the systray quickstarter.]),
@@ -6339,11 +6344,25 @@ fi
 dnl ===================================================================
 dnl Test which vclplugs have to be built.
 dnl ===================================================================
+R=""
+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
+fi
+AC_SUBST(GTK3_LIBS)
+AC_SUBST(GTK3_CFLAGS)
+AC_SUBST(ENABLE_GTK3)
+
 AC_MSG_CHECKING([which VCLplugs shall be built])
 ENABLE_GTK=""
 if test "x$enable_gtk" = "xyes"; then
     ENABLE_GTK="TRUE"
-    R="gtk"
+    R="gtk $R"
 fi
 AC_SUBST(ENABLE_GTK)
 
diff --git a/set_soenv.in b/set_soenv.in
index ac810ca..754d451 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1540,8 +1540,11 @@ ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
 ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
 ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
 ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
-ToFile( "GTHREAD_CFLAGS",        "@GTHREAD_CFLAGS@",       "e" );
-ToFile( "GTHREAD_LIBS",          "@GTHREAD_LIBS@",         "e" );
+ToFile( "ENABLE_GTK3",       "@ENABLE_GTK3@",      "e" );
+ToFile( "GTK3_CFLAGS",       "@GTK3_CFLAGS@",      "e" );
+ToFile( "GTK3_LIBS",         "@GTK3_LIBS@",        "e" );
+ToFile( "GTHREAD_CFLAGS",    "@GTHREAD_CFLAGS@",   "e" );
+ToFile( "GTHREAD_LIBS",      "@GTHREAD_LIBS@",     "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );