From b738ee3d6782daa19f289d6e372c700f6347a05b Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 24 Jun 2012 09:23:37 +0000
Subject: -LRN: no more pexpect

---
 configure.ac                      | 17 -----------------
 src/fs/Makefile.am                |  2 +-
 src/integration-tests/Makefile.am |  2 +-
 src/peerinfo-tool/Makefile.am     |  2 +-
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index ececc8e711..02271fdad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -647,23 +647,6 @@ LIBS=$SAVE_LIBS
 AM_PATH_PYTHON([2.6],, [:])
 AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
-if test "$PYTHON" != :
-then
-  AC_MSG_CHECKING([for pexpect])
-  $PYTHON -c "import pexpect" > /dev/null 2> /dev/null
-  PYEX=$?
-  AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
-  if test $PYEX -eq 0
-  then
-    AC_MSG_RESULT([yes])
-  else
-    AC_MSG_RESULT([not found])
-  fi
-else
-  AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, 0)
-fi
-
-
 # check for gettext
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.16.1])
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 9199fb17fd..9615b67cd1 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -229,7 +229,7 @@ check_PROGRAMS = \
  $(FS_BENCHMARKS)
 
 
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
  test_gnunet_fs_psd.py \
  test_gnunet_fs_rec.py \
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 917eb2e964..14649596d0 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -21,7 +21,7 @@ noinst_SCRIPTS = \
  test_integration_connection_values_tcp_udp.py \
  test_integration_connection_values_tcp_udp_http.py
 
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
  test_integration_bootstrap_and_connect.py \
  test_integration_bootstrap_and_connect_and_disconnect.py \
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 2182e8a7ef..bd8dfbd4a2 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -23,7 +23,7 @@ gnunet_peerinfo_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
  test_gnunet_peerinfo.py 
 endif
-- 
cgit v1.2.3-18-g5258