[GNUnet-SVN] r22252 - in gnunet: . src/fs src/integration-tests src/peerinfo-tool

[gnunet]

Author: grothoff
Date: 2012-06-24 11:23:37 +0200 (Sun, 24 Jun 2012)
New Revision: 22252

Modified:
   gnunet/configure.ac
   gnunet/src/fs/Makefile.am
   gnunet/src/integration-tests/Makefile.am
   gnunet/src/peerinfo-tool/Makefile.am
Log:
-LRN: no more pexpect

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-06-24 09:20:57 UTC (rev 22251)
+++ gnunet/configure.ac 2012-06-24 09:23:37 UTC (rev 22252)
@@ -647,23 +647,6 @@
 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])

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2012-06-24 09:20:57 UTC (rev 22251)
+++ gnunet/src/fs/Makefile.am   2012-06-24 09:23:37 UTC (rev 22252)
@@ -229,7 +229,7 @@
  $(FS_BENCHMARKS)
 
 
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
  test_gnunet_fs_psd.py \
  test_gnunet_fs_rec.py \

Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2012-06-24 09:20:57 UTC (rev 
22251)
+++ gnunet/src/integration-tests/Makefile.am    2012-06-24 09:23:37 UTC (rev 
22252)
@@ -21,7 +21,7 @@
  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 \

Modified: gnunet/src/peerinfo-tool/Makefile.am
===================================================================
--- gnunet/src/peerinfo-tool/Makefile.am        2012-06-24 09:20:57 UTC (rev 
22251)
+++ gnunet/src/peerinfo-tool/Makefile.am        2012-06-24 09:23:37 UTC (rev 
22252)
@@ -23,7 +23,7 @@
   $(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