From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 10 Sep 2020 19:20:03 +0000 (-0400)
Subject: Rename AM_CHECK_PYTHON_SPHINX to AE_CHECK_PYTHON_SPHINX
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=435aa29aff0527d36aafa1b657ae70b9db5f9ea5

Rename AM_CHECK_PYTHON_SPHINX to AE_CHECK_PYTHON_SPHINX

The AM prefix is reserved for upstream automake macros, use our own AE
prefix which stands for "Autotools EfficiOS".

This is part of an effort to standardize our custom macros across all
our autotools based projects.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I5e03597945c38710ccad84fa1959834dabeab60d
---

diff --git a/configure.ac b/configure.ac
index 70cd018a..f424973d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -525,7 +525,7 @@ AS_IF([AE_IS_FEATURE_ENABLED([python-bindings]) || AE_IS_FEATURE_ENABLED([python
 
 AE_IF_FEATURE_ENABLED([python-bindings-doc],
   [
-    AM_CHECK_PYTHON_SPHINX([PYTHON])
+    AE_CHECK_PYTHON_SPHINX([PYTHON])
     AS_IF([test "x$PYTHON_SPHINX_EXISTS" = xno], [
       AC_MSG_ERROR([The Sphinx package for Python 3 is required to build the Python bindings documentation])
     ])
diff --git a/m4/ae_check_sphinx.m4 b/m4/ae_check_sphinx.m4
new file mode 100644
index 00000000..4a9e85d8
--- /dev/null
+++ b/m4/ae_check_sphinx.m4
@@ -0,0 +1,32 @@
+# check_sphinx.m4 -- check for Sphinx Python package
+#
+# Copyright (C) 2015 - Philippe Proulx <pproulx@efficios.com>
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Sphinx ships with a script named "sphinx-build", which is usually
+# installed in "/usr/bin". Unfortunately, this script uses
+# "/usr/bin/python" as its interpreter. Since "/usr/bin/python" can
+# be either Python 2 or Python 3, depending on the distribution, and
+# since we absolutely need the Python 3 Sphinx package for Babeltrace
+# because it needs to import our bindings for autodocumentation,
+# there's no way to tell if "sphinx-build" is actually using Python 2
+# or Python 3.
+#
+# This macro checks if the Sphinx package ("sphinx") is installed
+# and visible from the interpreter designated by the PYTHON variable.
+# It sets PYTHON_SPHINX_EXISTS to "yes" if Sphinx is found for the
+# given Python interpreter, otherwise "no".
+
+# AE_CHECK_PYTHON_SPHINX(PYTHON)
+# ---------------------------------------------------------------------------
+AC_DEFUN([AE_CHECK_PYTHON_SPHINX],
+    [prog="
+try:
+    import sphinx
+    print('yes')
+except ImportError:
+    print('no')"
+    PYTHON_SPHINX_EXISTS=`${$1} -c "$prog"`])
diff --git a/m4/check_sphinx.m4 b/m4/check_sphinx.m4
deleted file mode 100644
index 5e9dcbc1..00000000
--- a/m4/check_sphinx.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# check_sphinx.m4 -- check for Sphinx Python package
-#
-# Copyright (C) 2015 - Philippe Proulx <pproulx@efficios.com>
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Sphinx ships with a script named "sphinx-build", which is usually
-# installed in "/usr/bin". Unfortunately, this script uses
-# "/usr/bin/python" as its interpreter. Since "/usr/bin/python" can
-# be either Python 2 or Python 3, depending on the distribution, and
-# since we absolutely need the Python 3 Sphinx package for Babeltrace
-# because it needs to import our bindings for autodocumentation,
-# there's no way to tell if "sphinx-build" is actually using Python 2
-# or Python 3.
-#
-# This macro checks if the Sphinx package ("sphinx") is installed
-# and visible from the interpreter designated by the PYTHON variable.
-# It sets PYTHON_SPHINX_EXISTS to "yes" if Sphinx is found for the
-# given Python interpreter, otherwise "no".
-
-# AM_CHECK_PYTHON_SPHINX(PYTHON)
-# ---------------------------------------------------------------------------
-AC_DEFUN([AM_CHECK_PYTHON_SPHINX],
-    [prog="
-try:
-    import sphinx
-    print('yes')
-except ImportError:
-    print('no')"
-    PYTHON_SPHINX_EXISTS=`${$1} -c "$prog"`])