X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=ea9fafe2a48aab8fe6b0062959152244c0be75df;hp=5737c65257c76c360332faa2256b4f6bdcdabb94;hb=41330ddb033f2cbeeb565e43708be91d5df28fb2;hpb=9015fa646e04fc3cb180bea24c33d34edbb48ed7

diff --git a/configure.ac b/configure.ac
index 5737c6525..ea9fafe2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,23 +176,11 @@ AS_IF([test "x$with_python" != "xno"], [
               PYTHON_LIBS="`$PYTHON_CONFIG --ldflags`"
               AC_SUBST(PYTHON_CFLAGS)
               AC_SUBST(PYTHON_LIBS)
+              AC_PATH_PROGS(SPHINX_BUILD, sphinx-build-${PYTHON_VERSION} sphinx-build)
         ])
 ])
 AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"])
 
-AC_ARG_ENABLE(sphinx, AS_HELP_STRING([--enable-sphinx],
-              [use sphinx to build documentation for python-systemd]))
-AS_IF([test "x$enable_sphinx" = "xyes"], [
-        AC_PATH_PROGS(SPHINX_BUILD, sphinx-build-${PYTHON_VERSION} sphinx-build)
-        AS_IF([test -z "$SPHINX_BUILD"], [
-              AC_MSG_ERROR([*** sphinx build requested, but sphinx-build not found])
-        ])
-        AS_IF([test "x$have_python_devel" != "xyes"], [
-              AC_MSG_ERROR([*** sphinx build requested, but python support not enabled])
-        ])
-])
-AM_CONDITIONAL(ENABLE_SPHINX, [test "x$enable_sphinx" = "xyes"])
-
 # ------------------------------------------------------------------------------
 
 AC_SEARCH_LIBS([mq_open], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
@@ -289,7 +277,7 @@ AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
 if test "x${have_selinux}" != xno ; then
         sushell=/sbin/sushell
 else
-        sushell=/bin/bash
+        sushell=/bin/sh
 fi
 AC_SUBST(sushell)
 
@@ -915,7 +903,6 @@ AC_MSG_RESULT([
         Python Headers:          ${have_python_devel}
         man pages:               ${have_manpages}
         gtk-doc:                 ${enable_gtk_doc}
-        sphinx documentation:    ${enable_sphinx}
         Split /usr:              ${enable_split_usr}
         SysV compatibility:      ${SYSTEM_SYSV_COMPAT}