[systemd-commits] 3 commits - configure.ac src/main.c src/ratelimit.h

[Lennart Poettering]

 configure.ac    |   24 ++++++++++++------------
 src/main.c      |    4 ++++
 src/ratelimit.h |    2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit acdfc041cc843283c7a92a8448a09370d01ed74c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 7 15:56:53 2012 +0100

    ratelimit: fix macro definition

diff --git a/src/ratelimit.h b/src/ratelimit.h
index a44ef70..a6443e7 100644
--- a/src/ratelimit.h
+++ b/src/ratelimit.h
@@ -46,7 +46,7 @@ typedef struct RateLimit {
                 _r->burst = (_burst);                    \
                 _r->num = 0;                             \
                 _r->begin = 0;                           \
-        } while (false);
+        } while (false)
 
 bool ratelimit_test(RateLimit *r);
 

commit 2c6db6fb9b1a10184b086df0d23228c4c0205a49
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 7 15:56:28 2012 +0100

    main: use a shorter default $PATH if /usr is merged

diff --git a/configure.ac b/configure.ac
index c83067a..2d04ee9 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}
 ])
diff --git a/src/main.c b/src/main.c
index 18cc74a..a849824 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1292,7 +1292,11 @@ int main(int argc, char *argv[]) {
 
         /* Set up PATH unless it is already set */
         setenv("PATH",
+#ifdef HAVE_SPLIT_USR
                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+#else
+               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
+#endif
                arg_running_as == MANAGER_SYSTEM);
 
         if (arg_running_as == MANAGER_SYSTEM) {

commit e9c06c79f2eba0f1ba39e95a5aaee79110513142
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 7 14:43:33 2012 +0100

    configure: it makes no sense to install systemd with stow

diff --git a/configure.ac b/configure.ac
index b44c345..c83067a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,13 +36,6 @@ AS_IF([test "x$host_cpu" = "xmips" || test "x$host_cpu" = "xmipsel" ||
 
 AM_SILENT_RULES([yes])
 
-AC_CHECK_PROG([STOW], [stow], [yes], [no])
-
-AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
-        AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
-        ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
-])
-
 # i18n stuff for the PolicyKit policy files
 IT_PROG_INTLTOOL([0.40.0])