[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-bank] 01/02: Attempt to detect more valid pip execut
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-bank] 01/02: Attempt to detect more valid pip executables. Tested with pip3.7 |
Date: |
Wed, 24 Apr 2019 12:52:22 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository bank.
commit b71b064e2ed8e3547c411234a24f5e7a1e0a4de1
Author: ng0 <address@hidden>
AuthorDate: Wed Apr 24 09:32:34 2019 +0000
Attempt to detect more valid pip executables. Tested with pip3.7
---
configure.ac | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index d70c52a..0da5d9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,20 +28,46 @@ PC_PYTHON_CHECK_HEADERS([pyheaders=1])
PC_PYTHON_CHECK_VERSION()
#
-# Check for pip3
+# Check for pip3.
+# It is either pip3 or pip[3.4,3.5,3.6,3.7].
+# XXX: This check might be bad.
+# XXX: We might want to write proper m4 or an
+# XXX: external script for the pip detection and usage.
#
AC_MSG_CHECKING([pip3])
pip3 --version >/dev/null
if test $? -ne 0;
then
- AC_MSG_ERROR([Please install pip3>=6.0])
+ pip3.4 --version >/dev/null
+ if test $? -ne 0;
+ then
+ pip3.5 --version >/dev/null
+ if test $? -ne 0;
+ then
+ pip3.6 --version >/dev/null
+ if test $? -ne 0;
+ then
+ pip3.7 --version >/dev/null
+ if test $? -ne 0;
+ then
+ AC_MSG_ERROR([Please install pip3>=6.0])
+fi
+fi
+fi
+fi
fi
PIP_VERSION=$(pip3 --version | $AWK '{ print $2 }')
+PIP_VERSION=$(pip3.4 --version | $AWK '{ print $2 }')
+PIP_VERSION=$(pip3.5 --version | $AWK '{ print $2 }')
+PIP_VERSION=$(pip3.6 --version | $AWK '{ print $2 }')
+PIP_VERSION=$(pip3.7 --version | $AWK '{ print $2 }')
AC_MSG_RESULT([$PIP_VERSION])
+# FIXME: Also check for equal 6.0? At this point 19.0 is out, so
+# checking for >6.0 should be enough.
AX_COMPARE_VERSION([$PIP_VERSION],[lt],[6.0], [AC_MSG_ERROR([Please install
pip3>=6.0])])
# On Debian systems, we may need to pass "--system" to pip3 to get
--
To stop receiving notification emails like this one, please contact
address@hidden