diff options
| author | Michał Górny <mgorny@gentoo.org> | 2012-02-10 12:10:41 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-02-11 00:28:30 +0100 |
| commit | bc9bdbbab45ea2c10fdd8ad7c517b5e4a358bdfb (patch) | |
| tree | deb08ebd15edc6a5f2f769d7c0f1035043b53493 | |
| parent | 4099a281bb1e7bbb941c55de559dbfb9abf5897b (diff) | |
build-sys: Support explicitly specifying --enable-split-usr.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45875
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index a41cf41a2d..1506382b74 100644 --- a/configure.ac +++ b/configure.ac @@ -605,11 +605,18 @@ AC_ARG_WITH([pamlibdir], [], [with_pamlibdir=${with_rootlibdir}/security]) -have_split_usr=no -if test "x${ac_default_prefix}" != "x${with_rootprefix}" ; then +AC_ARG_ENABLE([split-usr], + AS_HELP_STRING([--enable-split-usr], [Assume that /bin, /sbin aren\'t symlinks into /usr]), + [], + [AS_IF([test "x${ac_default_prefix}" != "x${with_rootprefix}"], [ + enable_split_usr=yes + ], [ + enable_split_usr=no + ])]) + +AS_IF([test "x${enable_split_usr}" = "xyes"], [ 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]) @@ -659,6 +666,6 @@ AC_MSG_RESULT([ D-Bus session dir: ${with_dbussessionservicedir} D-Bus system dir: ${with_dbussystemservicedir} D-Bus interfaces dir: ${with_dbusinterfacedir} - Split /usr: ${have_split_usr} + Split /usr: ${enable_split_usr} Build man pages: ${have_manpages} ]) |