aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-06-28 18:37:27 -0400
committerWilliam Hua <william.hua@canonical.com>2013-06-28 18:37:27 -0400
commit1d9713e62d9f89e4249d4305fa2e744b0ad45238 (patch)
tree73b3b49efca6c7ec498b50f2db2bbd6def0681c0
parentaf2cd91dd1af9f2bde385428526db1e78f065c74 (diff)
downloadayatana-indicator-keyboard-1d9713e62d9f89e4249d4305fa2e744b0ad45238.tar.gz
ayatana-indicator-keyboard-1d9713e62d9f89e4249d4305fa2e744b0ad45238.tar.bz2
ayatana-indicator-keyboard-1d9713e62d9f89e4249d4305fa2e744b0ad45238.zip
Remove local install option.
-rw-r--r--configure.ac7
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 4674acc5..0852bb50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,11 +18,8 @@ AC_PROG_LIBTOOL
AC_PROG_INSTALL
PKG_PROG_PKG_CONFIG([0.26])
-AC_ARG_ENABLE([local-install], AS_HELP_STRING([--enable-local-install], [Enable local install]))
-AS_IF([test "x$enable_local_install" = "xyes"], [dbus_service_dir=$prefix/share/dbus-1/services], [dbus_service_dir=`pkg-config --variable=session_bus_services_dir dbus-1`])
-
-AC_ARG_WITH([dbus-service-dir], [AS_HELP_STRING([--with-dbus-service-dir=DIR], [D-Bus service directory [default=$dbus_service_dir]])], [], [with_dbus_service_dir=$dbus_service_dir])
-AC_ARG_WITH([indicator-dir], [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$prefix/share/unity/indicators]])], [], [with_indicator_dir=$prefix/share/unity/indicators])
+AC_ARG_WITH([dbus-service-dir], [AS_HELP_STRING([--with-dbus-service-dir=DIR], [D-Bus service directory [default=$datadir/dbus-1/services]])], [], [with_dbus_service_dir=$datadir/dbus-1/services])
+AC_ARG_WITH([indicator-dir], [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])], [], [with_indicator_dir=$datadir/unity/indicators])
AC_SUBST([DBUS_SERVICE_DIR], [$with_dbus_service_dir])
AC_SUBST([INDICATOR_DIR], [$with_indicator_dir])