diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-02-07 15:56:28 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-02-07 15:56:28 +0100 |
| commit | 2c6db6fb9b1a10184b086df0d23228c4c0205a49 (patch) | |
| tree | d1dc178ae74fb8c62652d9e4ef550ce3b6da9dc0 /configure.ac | |
| parent | e9c06c79f2eba0f1ba39e95a5aaee79110513142 (diff) | |
main: use a shorter default $PATH if /usr is merged
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c83067a274..2d04ee9e6b 100644 --- a/configure.ac +++ b/configure.ac @@ -612,6 +612,12 @@ AC_ARG_WITH([pamlibdir], [], [with_pamlibdir=${with_rootlibdir}/security]) +have_split_usr=no +if test "x${ac_default_prefix}" != "x${with_rootprefix}" ; then + AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks into /usr]) + have_split_usr=yes +fi + AC_SUBST([dbuspolicydir], [$with_dbuspolicydir]) AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir]) AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir]) @@ -654,10 +660,11 @@ AC_MSG_RESULT([ libexec dir: ${libexecdir} lib dir: ${libdir} rootlib dir: ${with_rootlibdir} - pam modules dir: ${with_pamlibdir} + PAM modules dir: ${with_pamlibdir} udev rules dir: ${with_udevrulesdir} - dbus policy dir: ${with_dbuspolicydir} - dbus session dir: ${with_dbussessionservicedir} - dbus system dir: ${with_dbussystemservicedir} - dbus interfaces dir: ${with_dbusinterfacedir} + D-Bus policy dir: ${with_dbuspolicydir} + D-Bus session dir: ${with_dbussessionservicedir} + D-Bus system dir: ${with_dbussystemservicedir} + D-Bus interfaces dir: ${with_dbusinterfacedir} + Split /usr: ${have_split_usr} ]) |