From 68967eb10e82a071cd84fcd9e9b954793afda0c8 Mon Sep 17 00:00:00 2001 From: Gilles Espinasse Date: Wed, 5 Dec 2012 00:08:01 +0100 Subject: [PATCH] Fix python detection code Signed-off-by: Gilles Espinasse Compiling libnl versions that include doc or the git tree produce this checking for python build information... checking for python2.6... python2.6 checking for main in -lpython2.6... yes checking python2.6/Python.h usability... yes checking python2.6/Python.h presence... yes checking for python2.6/Python.h... yes ./configure: line 4272: test: !=: unary operator expected checking for python2.5... (cached) python2.6 checking for main in -lpython2.6... (cached) yes checking for python2.6/Python.h... (cached) yes ./configure: line 4272: test: !=: unary operator expected checking for python2.4... (cached) python2.6 checking for main in -lpython2.6... (cached) yes checking for python2.6/Python.h... (cached) yes ./configure: line 4272: test: !=: unary operator expected checking for python2.3... (cached) python2.6 checking for main in -lpython2.6... (cached) yes checking for python2.6/Python.h... (cached) yes ./configure: line 4272: test: !=: unary operator expected checking for python2.2... (cached) python2.6 checking for main in -lpython2.6... (cached) yes checking for python2.6/Python.h... (cached) yes ./configure: line 4272: test: !=: unary operator expected checking for python2.1... (cached) python2.6 checking for main in -lpython2.6... (cached) yes checking for python2.6/Python.h... (cached) yes ./configure: line 4272: test: !=: unary operator expected checking for python... (cached) python2.6 checking for main in -lpython2.6... (cached) yes checking for python2.6/Python.h... (cached) yes ./configure: line 4272: test: !=: unary operator expected results of the Python check: Binary: python2.6 Library: python2.6 Include Dir: no Fix the unary operator warning allow to break when one python version is found Add the more recent python versions Change send upstream as http://savannah.gnu.org/patch/index.php?7897 Signed-off-by: Thomas Graf --- doc/m4/ax_python.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/m4/ax_python.m4 b/doc/m4/ax_python.m4 index 1bc9d8a..f9a5135 100644 --- a/doc/m4/ax_python.m4 +++ b/doc/m4/ax_python.m4 @@ -56,7 +56,7 @@ AC_DEFUN([AX_PYTHON], [AC_MSG_CHECKING(for python build information) AC_MSG_RESULT([]) -for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do +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 AC_CHECK_PROGS(PYTHON_BIN, [$python]) ax_python_bin=$PYTHON_BIN if test x$ax_python_bin != x; then @@ -64,8 +64,8 @@ if test x$ax_python_bin != x; then AC_CHECK_HEADER([$ax_python_bin/Python.h], [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], ax_python_header=no) - if test $ax_python_lib != no; then - if test $ax_python_header != no; then + if test x$ax_python_lib != xno; then + if test x$ax_python_header != xno; then break; fi fi -- 2.40.0