From: Andy Wingo <wingo@pobox.com>
Date: Wed, 8 Apr 2015 07:39:31 +0000 (+0200)
Subject: Remove HAVE_PYTHON bits
X-Git-Tag: v219.0~157
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3027205011edd137fd935b82e55dadd18a927216;hp=30f5ab518c321a5665880b354a97432f418d4733

Remove HAVE_PYTHON bits
---

diff --git a/Makefile-man.am b/Makefile-man.am
index 9f9ba7715..2ba08e407 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1615,16 +1615,6 @@ man/systemd-user-sessions.html: man/systemd-user-sessions.service.html
 
 endif
 
-if HAVE_PYTHON
-MANPAGES += \
-	man/systemd.directives.7 \
-	man/systemd.index.7
-MANPAGES_ALIAS += \
-	#
-
-
-endif
-
 # Really, do not edit this file.
 
 EXTRA_DIST += \
diff --git a/Makefile.am b/Makefile.am
index 03edc19c5..bc23c2485 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1353,11 +1353,6 @@ DISTCHECK_CONFIGURE_FLAGS += \
 	--with-sysvinit-path= \
 	--with-sysvrcnd-path=
 
-if HAVE_PYTHON
-DISTCHECK_CONFIGURE_FLAGS += \
-	--with-python
-endif
-
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-gtk-doc
@@ -1366,12 +1361,7 @@ endif
 #
 # Require python when making dist
 #
-.PHONY: dist-check-python dist-check-compat-libs dist-check-help
-dist-check-python:
-if !HAVE_PYTHON
-	@echo "*** python and python-lxml module must be installed and enabled in order to make dist"
-	@false
-endif
+.PHONY: dist-check-compat-libs dist-check-help
 
 dist-check-compat-libs:
 if !ENABLE_COMPAT_LIBS
diff --git a/configure.ac b/configure.ac
index f0b9963b3..4ef10ac91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,54 +241,6 @@ AC_CHECK_SIZEOF(rlim_t,,[
        #include <sys/resource.h>
 ])
 
-# ------------------------------------------------------------------------------
-# we use python to build the man page index, and for systemd-python
-have_python=no
-AC_ARG_WITH([python],
-        [AS_HELP_STRING([--without-python], [Disable building the man page index and systemd-python (default: test)])])
-
-have_lxml=no
-AS_IF([test "x$with_python" != "xno"], [
-        AM_PATH_PYTHON(,, [:])
-        AS_IF([test "x$PYTHON" != "x:"], [
-                AC_MSG_CHECKING([for python lxml module])
-                AS_IF(["$PYTHON" -c 'import lxml' 2>/dev/null], [have_lxml=yes])
-                AC_MSG_RESULT([$have_lxml])
-                AS_IF([test "x$have_lxml" = "xyes"], [have_python=yes],
-                      [AC_MSG_WARN([*** python support requires python-lxml module installed])])
-        ])
-])
-AS_IF([test "$have_python" != "yes"], [
-      AS_IF([test "$with_python" = "yes"],
-            [AC_MSG_ERROR([*** python support requested but python support not found])])
-      AS_IF([test "$with_python" != "no"],
-            [AC_MSG_WARN([*** python support not found, some documentation cannot be built])])
-])
-
-AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
-AS_IF([test "x$PYTHON_BINARY" = "x"],
-      [AS_IF([test "x$have_python" = "xyes"],
-             [PYTHON_BINARY="$(which "$PYTHON")"],
-             [PYTHON_BINARY=/usr/bin/python])])
-AC_ARG_VAR(PYTHON_BINARY, [Python binary used to launch installed scripts])
-
-AS_IF([test "x$have_python" != "xyes" -a "x$enable_python_devel" = "xyes"],
-      [AC_MSG_ERROR([*** python-devel support requires --with-python])])
-
-have_python_devel=no
-AC_ARG_ENABLE(python_devel, AS_HELP_STRING([--disable-python-devel], [Do not build python modules]))
-AS_IF([test "x$have_python" = "xyes" -a "x$enable_python_devel" != "xno"], [
-      PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}],
-            [have_python_devel=yes],
-            [PKG_CHECK_MODULES([PYTHON_DEVEL], [python],
-                  [have_python_devel=yes],
-                  [have_python_devel=no])])
-      AS_IF([test "x$have_python_devel" = xno -a "x$enable_python_devel" = xyes],
-            [AC_MSG_ERROR([*** python-devel support requested but libraries not found])])
-      AC_PATH_PROGS(SPHINX_BUILD, sphinx-build-${PYTHON_VERSION} sphinx-build)
-])
-AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"])
-
 # ------------------------------------------------------------------------------
 
 AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])])