From d14e14ad8e4b64203c87b64f176f72803dfccf4e Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 21 Jan 2016 20:17:16 +0000
Subject: Use AX_PYTHON_MODULE from autoconf-archive instead of AM_CHECK_PYMOD

---
 configure.ac         |  8 ++++----
 m4/am-check-pymod.m4 | 37 -------------------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 m4/am-check-pymod.m4

diff --git a/configure.ac b/configure.ac
index ad8ad68..3091c56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,8 +108,8 @@ AC_MSG_RESULT([$enable_api_docs])
 
 
 if test "$enable_api_docs" != no || test "$enable_html_docs" != no; then
-  AM_CHECK_PYMOD([docutils], [__version__], [have_docutils=yes], [have_docutils=no])
-  if test "$have_docutils" = no; then
+  AX_PYTHON_MODULE([docutils])
+  if test "$HAVE_PYMOD_DOCUTILS" = no; then
     if test "$enable_api_docs" = "if possible"; then
        enable_api_docs=no
     fi
@@ -125,9 +125,9 @@ fi
 AS_IF([test "${enable_api_docs}" != no],
   [
   AC_PATH_PROG([EPYDOC], [epydoc])
-  AM_CHECK_PYMOD([epydoc], [__version__], [have_epydoc_module=yes], [have_epydoc_module=no])
+  AX_PYTHON_MODULE([epydoc])
   AC_MSG_CHECKING([epydoc 3])
-  AS_IF([test -n "$EPYDOC" && test "$have_epydoc_module" = yes],
+  AS_IF([test -n "$EPYDOC" && test "$HAVE_PYMOD_EPYDOC" = yes],
     [
     EPYDOC_VERSION=`$EPYDOC --version`
     AS_CASE(["$EPYDOC_VERSION"],
diff --git a/m4/am-check-pymod.m4 b/m4/am-check-pymod.m4
deleted file mode 100644
index 22e1ae2..0000000
--- a/m4/am-check-pymod.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN([AM_CHECK_PYMOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-- 
cgit v1.2.1