diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-09 10:06:37 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-09 10:06:37 -0500 |
| commit | 52dbb0b28c963d2bb90712dbce0981a0e8baf277 (patch) | |
| tree | 604b03719ccab9a1765fb196366627872bfb7904 /configure.ac | |
| parent | 160f7ecc905bd9bfa7d0d354d03e3fa101c3a545 (diff) | |
| parent | 3891bd9fd2b325d18d734b4de9c52a0162cebd3b (diff) | |
| download | ayatana-indicator-messages-52dbb0b28c963d2bb90712dbce0981a0e8baf277.tar.gz ayatana-indicator-messages-52dbb0b28c963d2bb90712dbce0981a0e8baf277.tar.bz2 ayatana-indicator-messages-52dbb0b28c963d2bb90712dbce0981a0e8baf277.zip | |
Merging in v2-api stuff which will become 0.2.1
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a3d937b..e00a725 100644 --- a/configure.ac +++ b/configure.ac @@ -34,23 +34,37 @@ 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 |