X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=5b88bcf0058157f22f09eb92249531c1dd1c2d4b;hp=79a4ec452113d804815704eaf7dac71919c3a3bb;hb=464264ac5a35b655065c5d95b8d8ffbbc7ff3bcf;hpb=7cb2086695fdeed33b2fb148492a224dd951fa7e

diff --git a/configure.ac b/configure.ac
index 79a4ec452..5b88bcf00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([systemd],
-        [198],
+        [199],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
         [systemd],
         [http://www.freedesktop.org/wiki/Software/systemd])
@@ -275,11 +275,11 @@ if test "x$enable_selinux" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
 if test "x${have_selinux}" != xno ; then
-        sushell=/sbin/sushell
+        SUSHELL=/sbin/sushell
 else
-        sushell=/bin/sh
+        SUSHELL=/bin/sh
 fi
-AC_SUBST(sushell)
+AC_SUBST(SUSHELL)
 
 # ------------------------------------------------------------------------------
 have_xz=no
@@ -683,6 +683,16 @@ AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont])
 AC_SUBST(KBD_LOADKEYS)
 AC_SUBST(KBD_SETFONT)
 
+AC_ARG_WITH(telinit,
+        AS_HELP_STRING([--with-telinit=PATH],
+                [Path to telinit]),
+        [TELINIT="$withval"],
+        [TELINIT="/lib/upstart/telinit"])
+
+AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit])
+
+AC_SUBST(TELINIT)
+
 # ------------------------------------------------------------------------------
 have_myhostname=no
 AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))
@@ -744,6 +754,15 @@ AS_IF([test "x$enable_keymap" = "xyes"], [
 ])
 AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
 
+# ------------------------------------------------------------------------------
+DEBUGTTY=/dev/tty9
+AC_ARG_WITH([debugshelltty],
+        [AS_HELP_STRING([--with-debugshelltty=PATH],
+                [Specify the tty device for debug shell])],
+        [DEBUGTTY="$withval"],
+        [])
+AC_SUBST(DEBUGTTY)
+
 # ------------------------------------------------------------------------------
 have_manpages=no
 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))