libegg r842 - in trunk: . libegg

[hasselmm svn gnome org]

Author: hasselmm
Date: Mon Jan 14 08:46:32 2008
New Revision: 842
URL: http://svn.gnome.org/viewvc/libegg?rev=842&view=rev

Log:
Request GTK+ 2.15 for EggToolPalette.

* configure.in: Add HAVE_GTK215 conditional.
* libegg/Makefile.am: Check HAVE_GTK215 conditional
and set gtk215_SUBDIRS variable accordingly.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libegg/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan 14 08:46:32 2008
@@ -123,6 +123,9 @@
 ## check if we have gtk+ 2.10.x
 AM_CONDITIONAL(HAVE_GTK210, $PKG_CONFIG --atleast-version=2.10.0 gtk+-2.0)
 
+## check if we have gtk+ 2.15.x
+AM_CONDITIONAL(HAVE_GTK215, $PKG_CONFIG --atleast-version=2.15.0 gtk+-2.0)
+
 ## check if we have the X11 gtk+ backend
 AM_CONDITIONAL(HAVE_GTK_TARGET_X11, test `$PKG_CONFIG --variable=target gtk+-2.0` = x11)
 

Modified: trunk/libegg/Makefile.am
==============================================================================
--- trunk/libegg/Makefile.am	(original)
+++ trunk/libegg/Makefile.am	Mon Jan 14 08:46:32 2008
@@ -22,6 +22,11 @@
   iconchooser
 endif
 
+if HAVE_GTK215
+gtk215_SUBDIRS = \
+  toolpalette
+endif
+
 if HAVE_GTK_TARGET_X11
 background_monitor_SUBDIRS = \
   background-monitor
@@ -31,7 +36,7 @@
   sidebar druid filesystem $(background_monitor_SUBDIRS) recent-files \
   $(tray_SUBDIRS) dock datetime desktopentries $(thumbnail_SUBDIRS) \
   $(iconchooser_SUBDIRS) bookmarkfile recentchooser regex sequence smclient \
-  fileformatchooser toolpalette
+  fileformatchooser $(gtk215_SUBDIRS)
 
 INCLUDES = \
   $(EGG_CFLAGS)  \