diff options
-rw-r--r-- | configure.ac | 17 | ||||
-rw-r--r-- | src/fs/Makefile.am | 2 | ||||
-rw-r--r-- | src/integration-tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 2 |
4 files changed, 3 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index ececc8e71..02271fdad 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -647,23 +647,6 @@ LIBS=$SAVE_LIBS | |||
647 | AM_PATH_PYTHON([2.6],, [:]) | 647 | AM_PATH_PYTHON([2.6],, [:]) |
648 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) | 648 | AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) |
649 | 649 | ||
650 | if test "$PYTHON" != : | ||
651 | then | ||
652 | AC_MSG_CHECKING([for pexpect]) | ||
653 | $PYTHON -c "import pexpect" > /dev/null 2> /dev/null | ||
654 | PYEX=$? | ||
655 | AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0) | ||
656 | if test $PYEX -eq 0 | ||
657 | then | ||
658 | AC_MSG_RESULT([yes]) | ||
659 | else | ||
660 | AC_MSG_RESULT([not found]) | ||
661 | fi | ||
662 | else | ||
663 | AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, 0) | ||
664 | fi | ||
665 | |||
666 | |||
667 | # check for gettext | 650 | # check for gettext |
668 | AM_GNU_GETTEXT([external]) | 651 | AM_GNU_GETTEXT([external]) |
669 | AM_GNU_GETTEXT_VERSION([0.16.1]) | 652 | AM_GNU_GETTEXT_VERSION([0.16.1]) |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 9199fb17f..9615b67cd 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -229,7 +229,7 @@ check_PROGRAMS = \ | |||
229 | $(FS_BENCHMARKS) | 229 | $(FS_BENCHMARKS) |
230 | 230 | ||
231 | 231 | ||
232 | if HAVE_PYTHON_PEXPECT | 232 | if HAVE_PYTHON |
233 | check_SCRIPTS = \ | 233 | check_SCRIPTS = \ |
234 | test_gnunet_fs_psd.py \ | 234 | test_gnunet_fs_psd.py \ |
235 | test_gnunet_fs_rec.py \ | 235 | test_gnunet_fs_rec.py \ |
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 917eb2e96..14649596d 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -21,7 +21,7 @@ noinst_SCRIPTS = \ | |||
21 | test_integration_connection_values_tcp_udp.py \ | 21 | test_integration_connection_values_tcp_udp.py \ |
22 | test_integration_connection_values_tcp_udp_http.py | 22 | test_integration_connection_values_tcp_udp_http.py |
23 | 23 | ||
24 | if HAVE_PYTHON_PEXPECT | 24 | if HAVE_PYTHON |
25 | check_SCRIPTS = \ | 25 | check_SCRIPTS = \ |
26 | test_integration_bootstrap_and_connect.py \ | 26 | test_integration_bootstrap_and_connect.py \ |
27 | test_integration_bootstrap_and_connect_and_disconnect.py \ | 27 | test_integration_bootstrap_and_connect_and_disconnect.py \ |
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 2182e8a7e..bd8dfbd4a 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -23,7 +23,7 @@ gnunet_peerinfo_LDADD = \ | |||
23 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 23 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
24 | $(top_builddir)/src/util/libgnunetutil.la | 24 | $(top_builddir)/src/util/libgnunetutil.la |
25 | 25 | ||
26 | if HAVE_PYTHON_PEXPECT | 26 | if HAVE_PYTHON |
27 | check_SCRIPTS = \ | 27 | check_SCRIPTS = \ |
28 | test_gnunet_peerinfo.py | 28 | test_gnunet_peerinfo.py |
29 | endif | 29 | endif |