[Galago-commits] r2511 - trunk/notification-daemon

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-29 12:16:33 -0800 (Sun, 29 Jan 2006)
New Revision: 2511

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/configure.ac
Log:
- Fix a couple missing commas in the list of package modules. Also take the time to clean this up a bit and put each module on its own line, and put the required versions into their own variables.
- Bump the version to 0.3.3.90.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-01-27 19:15:15 UTC (rev 2510)
+++ trunk/notification-daemon/ChangeLog	2006-01-29 20:16:33 UTC (rev 2511)
@@ -1,3 +1,11 @@
+Sun Jan 29 12:12:43 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* configure.ac:
+	  - Fix a couple missing commas in the list of package modules. Also
+	    take the time to clean this up a bit and put each module on its own
+	    line, and put the required versions into their own variables.
+	  - Bump the version to 0.3.3.90.
+
 ==================== 0.3.3 ====================
 
 Wed Jan 25 00:29:59 PST 2006  Christian Hammond <chipx86 at chipx86.com>

Modified: trunk/notification-daemon/configure.ac
===================================================================
--- trunk/notification-daemon/configure.ac	2006-01-27 19:15:15 UTC (rev 2510)
+++ trunk/notification-daemon/configure.ac	2006-01-29 20:16:33 UTC (rev 2511)
@@ -3,7 +3,7 @@
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT(notification-daemon, 0.3.3, galago-devel at lists.freedesktop.org)
+AC_INIT(notification-daemon, 0.3.3.90, galago-devel at lists.freedesktop.org)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2006 Christian Hammond])
@@ -15,7 +15,7 @@
 NOTIFICATION_DAEMON_MAJOR_VERSION=0
 NOTIFICATION_DAEMON_MINOR_VERSION=3
 NOTIFICATION_DAEMON_MICRO_VERSION=3
-NOTIFICATION_DAEMON_DEVEL_VERSION=0
+NOTIFICATION_DAEMON_DEVEL_VERSION=90
 
 NOTIFICATION_DAEMON_VERSION=$NOTIFICATION_DAEMON_MAJOR_VERSION.$NOTIFICATION_DAEMON_MINOR_VERSION.$NOTIFICATION_DAEMON_MICRO_VERSION
 
@@ -75,15 +75,28 @@
 
 AC_CHECK_LIB([popt], [poptGetArg], , AC_MSG_ERROR([Popt is required]))
 
+REQ_GTK_VERSION=2.4.0
+REQ_GLIB_VERSION=$REQ_GTK_VERSION
+REQ_SEXY_VERSION=0.1.3
 REQ_DBUS_VERSION=0.36
-pkg_modules="gtk+-2.0 >= 2.2.2 glib-2.0 >= 2.2.2, dbus-1 >= $REQ_DBUS_VERSION, dbus-glib-1 >= $REQ_DBUS_VERSION libsexy >= 0.1.3 gconf-2.0 libwnck-1.0"
-PKG_CHECK_MODULES(NOTIFICATION_DAEMON, [$pkg_modules])
+PKG_CHECK_MODULES(NOTIFICATION_DAEMON, [\
+	gtk+-2.0 >= $REQ_GTK_VERSION, \
+	glib-2.0 >= $REQ_GLIB_VERSION, \
+	dbus-1 >= $REQ_DBUS_VERSION, \
+	dbus-glib-1 >= $REQ_DBUS_VERSION, \
+	libsexy >= $REQ_SEXY_VERSION, \
+	gconf-2.0, \
+	libwnck-1.0 \
+])
 AC_SUBST(NOTIFICATION_DAEMON_CFLAGS)
 AC_SUBST(NOTIFICATION_DAEMON_LIBS)
 
-gdk_modules="gdk-2.0 gdk-pixbuf-2.0"
-PKG_CHECK_MODULES(GDK, [$gdk_modules], have_gdk=yes,
-[
+PKG_CHECK_MODULES(GDK,
+	gdk-2.0 >= $REQ_GTK_VERSION, \
+	gdk-pixbuf-2.0 >= $REQ_GTK_VERSION \
+],[
+	have_gdk=yes,
+],[
 	have_gdk=no
 
 	AC_WARN("Some test apps will not be built")