aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-09 11:13:50 -0500
committerTed Gould <ted@canonical.com>2009-09-09 11:13:50 -0500
commit7623fd9959b213e529288f80f2708457d4e9fb67 (patch)
treec49b289c316fb202c765264c7e6823efeb0b4302 /configure.ac
parentf585e51aa9ebce21b54262ac8fa6151c01f3cb34 (diff)
parent3891bd9fd2b325d18d734b4de9c52a0162cebd3b (diff)
downloadayatana-indicator-messages-7623fd9959b213e529288f80f2708457d4e9fb67.tar.gz
ayatana-indicator-messages-7623fd9959b213e529288f80f2708457d4e9fb67.tar.bz2
ayatana-indicator-messages-7623fd9959b213e529288f80f2708457d4e9fb67.zip
Updated to current trunk.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac21
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