Changeset 2511

Show
Ignore:
Timestamp:
01/29/06 12:16:33
Author:
chipx86
Message:

- 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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/notification-daemon/ChangeLog

    r2498 r2511  
     1Sun Jan 29 12:12:43 PST 2006  Christian Hammond <chipx86@chipx86.com> 
     2 
     3    * configure.ac: 
     4      - Fix a couple missing commas in the list of package modules. Also 
     5        take the time to clean this up a bit and put each module on its own 
     6        line, and put the required versions into their own variables. 
     7      - Bump the version to 0.3.3.90. 
     8 
    19==================== 0.3.3 ==================== 
    210 

  • trunk/notification-daemon/configure.ac

    r2498 r2511  
    44dnl # Initialize autoconf 
    55dnl ################################################################ 
    6 AC_INIT(notification-daemon, 0.3.3, galago-devel@lists.freedesktop.org) 
     6AC_INIT(notification-daemon, 0.3.3.90, galago-devel@lists.freedesktop.org) 
    77AC_PREREQ(2.50) 
    88AC_CONFIG_SRCDIR(config.h.in) 
    …… 
    1616NOTIFICATION_DAEMON_MINOR_VERSION=3 
    1717NOTIFICATION_DAEMON_MICRO_VERSION=3 
    18 NOTIFICATION_DAEMON_DEVEL_VERSION=0 
     18NOTIFICATION_DAEMON_DEVEL_VERSION=90 
    1919 
    2020NOTIFICATION_DAEMON_VERSION=$NOTIFICATION_DAEMON_MAJOR_VERSION.$NOTIFICATION_DAEMON_MINOR_VERSION.$NOTIFICATION_DAEMON_MICRO_VERSION 
    …… 
    7676AC_CHECK_LIB([popt], [poptGetArg], , AC_MSG_ERROR([Popt is required])) 
    7777 
     78REQ_GTK_VERSION=2.4.0 
     79REQ_GLIB_VERSION=$REQ_GTK_VERSION 
     80REQ_SEXY_VERSION=0.1.3 
    7881REQ_DBUS_VERSION=0.36 
    79 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" 
    80 PKG_CHECK_MODULES(NOTIFICATION_DAEMON, [$pkg_modules]) 
     82PKG_CHECK_MODULES(NOTIFICATION_DAEMON, [\ 
     83    gtk+-2.0 >= $REQ_GTK_VERSION, \ 
     84    glib-2.0 >= $REQ_GLIB_VERSION, \ 
     85    dbus-1 >= $REQ_DBUS_VERSION, \ 
     86    dbus-glib-1 >= $REQ_DBUS_VERSION, \ 
     87    libsexy >= $REQ_SEXY_VERSION, \ 
     88    gconf-2.0, \ 
     89    libwnck-1.0 \ 
     90]) 
    8191AC_SUBST(NOTIFICATION_DAEMON_CFLAGS) 
    8292AC_SUBST(NOTIFICATION_DAEMON_LIBS) 
    8393 
    84 gdk_modules="gdk-2.0 gdk-pixbuf-2.0" 
    85 PKG_CHECK_MODULES(GDK, [$gdk_modules], have_gdk=yes, 
    86 [ 
     94PKG_CHECK_MODULES(GDK, 
     95    gdk-2.0 >= $REQ_GTK_VERSION, \ 
     96    gdk-pixbuf-2.0 >= $REQ_GTK_VERSION \ 
     97],[ 
     98    have_gdk=yes, 
     99],[ 
    87100    have_gdk=no 
    88101