[Libreoffice-commits] .: 2 commits - configure.in splitbuild/extern.lst

[Michael Meeks]

 configure.in          |    5 +++--
 splitbuild/extern.lst |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 282ff4ed0de54faff018167bcc2c3925611b0421
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Dec 6 15:07:44 2010 +0000

    remove, obsolete libegg everywhere

diff --git a/configure.in b/configure.in
index 66ac8fe..481c9ea 100644
--- a/configure.in
+++ b/configure.in
@@ -6369,7 +6369,6 @@ if test  "$test_gtk" = "yes"; then
          PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
 			    [ ENABLE_SYSTRAY_GTK="TRUE" ],
 			    [ ENABLE_SYSTRAY_GTK="" ])
-         BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
       fi
 
       AC_MSG_CHECKING([whether to enable DBUS support])
diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst
index a3e8595..9876dd7 100644
--- a/splitbuild/extern.lst
+++ b/splitbuild/extern.lst
@@ -1 +1 @@
-afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
+afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib 
commit d6f9f4315dc37acbee1b09b925eb96ae6e34b9b7
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Dec 6 15:02:40 2010 +0000

    disable systray icon if gtk+ version is < 2.10.0

diff --git a/configure.in b/configure.in
index e30ae00..66ac8fe 100644
--- a/configure.in
+++ b/configure.in
@@ -6366,7 +6366,9 @@ if test  "$test_gtk" = "yes"; then
       BUILD_TYPE="$BUILD_TYPE GTK"
 
       if test "x$enable_systray" = "xyes"; then
-         ENABLE_SYSTRAY_GTK="TRUE"
+         PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
+			    [ ENABLE_SYSTRAY_GTK="TRUE" ],
+			    [ ENABLE_SYSTRAY_GTK="" ])
          BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK"
       fi