diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2009-09-10 10:08:18 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2009-09-10 10:08:18 -0400 |
| commit | 72003f10d90c8392af14a6352e05c667c30ac4db (patch) | |
| tree | bc567620d6d28ab84ce27be00e6158e05bbcdb2c /configure.ac | |
| parent | 08950edeb4c7a65eb120313c24c02a2555d73977 (diff) | |
| parent | 5439c24a959d39d9ab54e637d2db3bc3d1227d47 (diff) | |
| download | ayatana-indicator-messages-72003f10d90c8392af14a6352e05c667c30ac4db.tar.gz ayatana-indicator-messages-72003f10d90c8392af14a6352e05c667c30ac4db.tar.bz2 ayatana-indicator-messages-72003f10d90c8392af14a6352e05c667c30ac4db.zip | |
* New release (LP: #427357)
* Merging in v2-api stuff which will become 0.2.1
* debian/control:
- Requiring > 0.2.0 of libindicate-*
- bump dbusmenu dependencies.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index ef2239b..171c988 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.0) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.1) AM_MAINTAINER_MODE @@ -28,29 +28,43 @@ GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 INDICATE_REQUIRED_VERSION=0.2.0 INDICATOR_REQUIRED_VERSION=0.2.0 -DBUSMENUGTK_REQUIRED_VERSION=0.0.2 +DBUSMENUGTK_REQUIRED_VERSION=0.1.1 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION indicate >= $INDICATE_REQUIRED_VERSION - indicate-gtk >= $INDICATE_REQUIRED_VERSION dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) ########################### +# Check to see if we're local +########################### + +with_localinstall="no" +AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) + +########################### # Indicator Info ########################### -INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` +if test "x$with_localinstall" = "xyes"; then + INDICATORDIR="${libdir}/indicators/2/" +else + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` +fi AC_SUBST(INDICATORDIR) ########################### # DBus Service Info ########################### -DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` +if test "x$with_localinstall" = "xyes"; then + DBUSSERVICEDIR="${datadir}/dbus-1/services/" +else + DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` +fi AC_SUBST(DBUSSERVICEDIR) ########################### @@ -61,7 +75,6 @@ AC_OUTPUT([ Makefile src/Makefile data/Makefile -data/indicator-messages.service data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/status/Makefile |