summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-07 19:40:25 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-07 19:40:25 +0200
commitd2d12cd1bfd90f3a13273d82331a7cbd36a93231 (patch)
tree9b766323fa50822303a838e0d8326040485c19f5
parentb1a954eace84207225e09f318728e90eae03fe97 (diff)
build-sys: make make distcheck work again
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac43
2 files changed, 32 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index 56047c3971..7c0f793db6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -565,5 +565,9 @@ if TARGET_GENTOO
endif
DISTCHECK_CONFIGURE_FLAGS = \
+ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
+ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
+ --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
+ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-rootdir=$$dc_install_base/$(rootdir)
diff --git a/configure.ac b/configure.ac
index 5a4b5e2dc8..7ad3e2ba8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,13 +236,13 @@ AC_ARG_WITH([sysvrcd-path],
[])
AC_ARG_WITH([dbus-service],
- [AS_HELP_STRING([--with-dbus-service=PATH],
+ [AS_HELP_STRING([--with-dbus-service=UNIT],
[Specify the name of the special DBus service @<:@default=based on distro@:>@])],
[SPECIAL_DBUS_SERVICE="$withval"],
[])
AC_ARG_WITH([syslog-service],
- [AS_HELP_STRING([--with-syslog-service=PATH],
+ [AS_HELP_STRING([--with-syslog-service=UNIT],
[Specify the name of the special syslog service @<:@default=based on distro@:>@])],
[SPECIAL_SYSLOG_SERVICE="$withval"],
[])
@@ -263,28 +263,41 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name])
AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
-dbuspolicydir=`pkg-config --variable=sysconfdir dbus-1`/dbus-1/system.d
-AC_SUBST([dbuspolicydir], [$dbuspolicydir])
+AC_ARG_WITH([dbuspolicydir],
+ AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),
+ [],
+ [with_dbuspolicydir=`pkg-config --variable=sysconfdir dbus-1`/dbus-1/system.d])
-dbussessionservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`
-AC_SUBST([dbussessionservicedir], [$dbussessionservicedir])
+AC_ARG_WITH([dbussessionservicedir],
+ AS_HELP_STRING([--with-dbussessionservicedir=DIR], [D-Bus session service directory]),
+ [],
+ [with_dbussessionservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`])
-dbussystemservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../system-services
-AC_SUBST([dbussystemservicedir], [$dbussystemservicedir])
+AC_ARG_WITH([dbussystemservicedir],
+ AS_HELP_STRING([--with-dbussystemservicedir=DIR], [D-Bus system service directory]),
+ [],
+ [with_dbussystemservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../system-services])
-dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces
-AC_SUBST([dbusinterfacedir], [$dbusinterfacedir])
+AC_ARG_WITH([dbusinterfacedir],
+ AS_HELP_STRING([--with-dbusinterfacedir=DIR], [D-Bus interface directory]),
+ [],
+ [with_dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces])
AC_ARG_WITH([udevrulesdir],
AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]),
[],
[with_udevrulesdir=/lib/udev/rules.d])
-AC_SUBST([udevrulesdir], [$with_udevrulesdir])
AC_ARG_WITH([rootdir],
AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
[],
[with_rootdir=${ac_default_prefix}])
+
+AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
+AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
+AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
+AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir])
+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
AC_SUBST([rootdir], [$with_rootdir])
AC_CONFIG_FILES([Makefile])
@@ -302,8 +315,8 @@ echo "
prefix: ${prefix}
root dir: ${with_rootdir}
udev rules dir: ${with_udevrulesdir}
- dbus policy dir: ${dbuspolicydir}
- dbus session dir: ${dbussessionservicedir}
- dbus system dir: ${dbussystemservicedir}
- dbus interfaces dir: ${dbusinterfacedir}
+ dbus policy dir: ${with_dbuspolicydir}
+ dbus session dir: ${with_dbussessionservicedir}
+ dbus system dir: ${with_dbussystemservicedir}
+ dbus interfaces dir: ${with_dbusinterfacedir}
"