summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristian Rodríguez <crrodriguez@opensuse.org>2013-04-24 21:51:23 -0300
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-25 22:26:58 -0400
commit45df1f2c9a7fee67b37f64ddd00adad5982844fa (patch)
tree5abdf9e500d0d7a67ace6884e6f2e7f2d4a2b8a4
parentfcf8c44041a5138a170f9a442809c032259a26b1 (diff)
build-sys: add --with-debug-shell=PATH
Distributions may have selinux but not sushell or might need to set a custom debug shell. Defaults to /sbin/sushell if selinux is enabled, /bin/sh if not. [zj: Renamed --with-debugshelltty to --with-debug-tty, and added a line in output showing DEBUGSHELL and DEBUGTTY. I figure that debug shell is pretty useful, and I hope the extra line in configure status will draw attention to it.]
-rw-r--r--configure.ac30
1 files changed, 16 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index ce02ff6f80..285fc44fa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,13 +275,23 @@ if test "x$enable_selinux" != "xno"; then
fi
fi
AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
-if test "x${have_selinux}" != xno ; then
- SUSHELL=/sbin/sushell
-else
- SUSHELL=/bin/sh
-fi
+
+AC_ARG_WITH(debug-shell,
+ AS_HELP_STRING([--with-debug-shell=PATH],
+ [Path to debug shell binary]),
+ [SUSHELL="$withval"],[
+ AS_IF([test "x${have_selinux}" != "xno"], [SUSHELL="/sbin/sushell"] , [SUSHELL="/bin/sh"])])
+
AC_SUBST(SUSHELL)
+AC_ARG_WITH([debug-tty],
+ AS_HELP_STRING([--with-debug-tty=PATH],
+ [Specify the tty device for debug shell]),
+ [DEBUGTTY="$withval"],
+ [DEBUGTTY=/dev/tty9])
+
+AC_SUBST(DEBUGTTY)
+
# ------------------------------------------------------------------------------
have_xz=no
AC_ARG_ENABLE(xz, AS_HELP_STRING([--disable-xz], [Disable optional XZ support]))
@@ -758,15 +768,6 @@ 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]))
AS_IF([test "x$enable_manpages" != xno], [
@@ -967,6 +968,7 @@ AC_MSG_RESULT([
Bash completions dir: ${with_bashcompletiondir}
Extra start script: ${RC_LOCAL_SCRIPT_PATH_START}
Extra stop script: ${RC_LOCAL_SCRIPT_PATH_STOP}
+ Debug shell: ${SUSHELL} @ ${DEBUGTTY}
CFLAGS: ${OUR_CFLAGS} ${CFLAGS}
CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}