Skip to content

Commit

Permalink
new python m4 macros
Browse files Browse the repository at this point in the history
  • Loading branch information
sveseli committed Jan 24, 2019
1 parent ad3cfc1 commit 627f95f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions tools/autoconf/configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([pvaPy], [1.0.1], [[email protected]])
AC_INIT([pvaPy], [1.3.0], [[email protected]])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_MACRO_DIR([m4])
Expand All @@ -9,6 +9,6 @@ AX_BOOST_PYTHON_NUM_PY
AX_BOOST_NUM_PY
AX_EPICS_BASE([3.14.12])
AX_EPICS4([4.0.3])
AX_PVA_PY([1.0.1])
AX_PVA_PY([1.3.0])
#AC_OUTPUT

14 changes: 7 additions & 7 deletions tools/autoconf/m4/ax_python.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_python.html
# https://www.gnu.org/software/autoconf-archive/ax_python.html
# ===========================================================================
#
# SYNOPSIS
Expand All @@ -10,9 +10,8 @@
#
# This macro does a complete Python development environment check.
#
# It recurses through several python versions (from 2.1 to 2.6 in this
# version), looking for an executable. When it finds an executable, it
# looks to find the header files and library.
# It checks for all known versions. When it finds an executable, it looks
# to find the header files and library.
#
# It sets PYTHON_BIN to the name of the python executable,
# PYTHON_INCLUDE_DIR to the directory holding the header files, and
Expand All @@ -36,7 +35,7 @@
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
# with this program. If not, see <https://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
Expand All @@ -51,12 +50,12 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.

#serial 14
#serial 18

AC_DEFUN([AX_PYTHON],
[AC_MSG_CHECKING(for python build information)
AC_MSG_RESULT([])
for python in python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
for python in python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
AC_CHECK_PROGS(PYTHON_BIN, [$python])
ax_python_bin=$PYTHON_BIN
if test x$ax_python_bin != x; then
Expand Down Expand Up @@ -96,3 +95,4 @@ if test x$ax_python_lib != xno; then
AC_SUBST(PYTHON_LIB)
fi
])dnl

0 comments on commit 627f95f

Please sign in to comment.