gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-blog] branch master updated: Installation.


From: gnunet
Subject: [GNUnet-SVN] [taler-blog] branch master updated: Installation.
Date: Mon, 20 May 2019 22:34:03 +0200

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository blog.

The following commit(s) were added to refs/heads/master by this push:
     new 1ef4376  Installation.
1ef4376 is described below

commit 1ef43764f0fd281ba44cdb1832e5a400bd2afa79
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon May 20 22:33:00 2019 +0200

    Installation.
    
    No need for the configure script to check for packages
    that will later be installed by setuptools, since they
    are listed among the dependencies.
---
 configure.ac | 24 ++++--------------------
 setup.py     |  3 ++-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9f8d9b0..2cb4832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,16 +31,10 @@ AC_MSG_RESULT([$VERSION])
 
 AX_COMPARE_VERSION([$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 the desired installation target directory
-pip3 install --help | grep '\-\-system' >> /dev/null
-if test $? -ne 0;
-then
-   DEBIAN_PIP3_SYSTEM=""
-else
-   DEBIAN_PIP3_SYSTEM="--system"
-fi
-AC_SUBST(DEBIAN_PIP3_SYSTEM)
+AC_ARG_VAR(DEBIAN_PIP3_SYSTEM,
+           "Custom flags to be used along 'pip install'
+            (this is mandatory on some Debians to be set as '--system',
+            in order to get 'make install' obey the --prefix switch.)")
 
 #
 # Check for tsc
@@ -49,16 +43,6 @@ AC_CHECK_PROG([tsc],[tsc],[yes],[no])
 AM_CONDITIONAL([HAVE_TSC], [test "x$tsc" = xyes])
 
 #
-# Check for minifier
-#
-AC_MSG_CHECKING([Checking for jsmin])
-python3 -m jsmin &> /dev/null
-if test $? -ne 0;
-  then
-  AC_MSG_ERROR([Please install Python3 module 'jsmin'])
-fi
-
-#
 # Report
 #
 if test x$pyheaders != x1; then
diff --git a/setup.py b/setup.py
index 8304034..e78af80 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,8 @@ setup(name='talerblog',
       license='GPL',
       packages=find_packages(),
       install_requires=["Flask>=0.10",
-                        "beautifulsoup4"],
+                        "beautifulsoup4",
+                        "jsmin"],
       tests_require=["nose", "mock"],
       test_suite="nose.collector",
       package_data={

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]