diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-10-02 11:52:35 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-10-02 11:52:35 +0100 |
| commit | a52034266a60fb471e759a6c3349b11ce6494fdf (patch) | |
| tree | 9eb2e237c7df4398bbb9a5dba71ade7651bb5054 /configure.ac | |
| parent | 3a2d78998c8aa5bd83bb00eb0d7be38e8f746794 (diff) | |
| parent | c99d733f3747004baf05a2d997812c04d1087ef9 (diff) | |
Merge branch 'dbus-1.10'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b41b221d..6078ce7b 100644 --- a/configure.ac +++ b/configure.ac @@ -1651,9 +1651,21 @@ AC_SUBST(DBUS_LIBEXECDIR) AC_DEFINE_UNQUOTED(DBUS_LIBEXECDIR,"$DBUS_LIBEXECDIR", [Directory for installing the libexec binaries]) #### Directory to source sysconfdir configuration from -DBUS_SYSCONFDIR="$EXPANDED_SYSCONFDIR" -AC_SUBST(DBUS_SYSCONFDIR) -AC_DEFINE_UNQUOTED(DBUS_SYSCONFDIR,"$DBUS_SYSCONFDIR", [Directory to source sysconfdir configuration from]) + +# On Windows this is relative to where we put the bus setup, in +# ${datadir}/dbus-1. For simplicity, we only do this if +# ${sysconfdir} = ${prefix}/etc and ${datadir} = ${prefix}/share. +# +# On Unix, or on Windows with weird install layouts, it's the absolute path. +AS_IF([test "${dbus_win}" = yes && \ + test "$EXPANDED_SYSCONFDIR" = "$EXPANDED_PREFIX/etc" && \ + test "$EXPANDED_DATADIR" = "$EXPANDED_PREFIX/share"], + [SYSCONFDIR_FROM_PKGDATADIR="../../etc" + DATADIR_FROM_PKGSYSCONFDIR="../../share"], + [SYSCONFDIR_FROM_PKGDATADIR="$EXPANDED_SYSCONFDIR" + DATADIR_FROM_PKGSYSCONFDIR="$EXPANDED_DATADIR"]) +AC_SUBST([SYSCONFDIR_FROM_PKGDATADIR]) +AC_SUBST([DATADIR_FROM_PKGSYSCONFDIR]) #### Tell tests where to find certain stuff in builddir |