$NetBSD: patch-ab,v 1.3 2013/10/27 20:17:40 markd Exp $

--- configure.orig	2000-11-05 18:07:38.000000000 +0000
+++ configure
@@ -1357,7 +1357,7 @@ echo "$ac_t""$PYTH_vers" 1>&6
 # _multiply_ the python version major version by one thousand, but minor
 # version is only multiplied by one hundred (not really, but for m.n.p
 # version numbers, it works)
-PYTH_versnum=`echo $PYTH_vers | sed 's/b[0-9]//' |
+PYTH_versnum=`echo $PYTH_vers | sed 's/b[0-9]//;s/p/\./' |
   sed 's/^[0-9]\./0&/;s/\.\([0-9]\)\./.0\1./g;s/\.\([0-9]\)$/\.0\1/;s/\.//g' |
   sed 's/^\(....\)$/\100/'`
 
@@ -1395,20 +1395,20 @@ echo "$ac_t""$EXP_vers" 1>&6
 
 echo $ac_n "checking Expect library location""... $ac_c" 1>&6
 echo "configure:1398: checking Expect library location" >&5
-if test -n "${EXP_LIB}"; then
-  if test x${enable_forcea:+X} = xX -a -f "${EXP_LIB}"; then
-    :
-  elif test x${enable_forcea:+X} = xX; then
-    { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
-  else
-    f="${EXP_LIBDIR}/lib${EXP_LIB}.*"
-    if test "`echo $f`" = "$f"; then
-      { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
-    fi
-  fi
-else
-  EXP_LIB="expect${EXP_VERS}"
-fi
+#if test -n "${EXP_LIB}"; then
+#  if test x${enable_forcea:+X} = xX -a -f "${EXP_LIB}"; then
+#    :
+#  elif test x${enable_forcea:+X} = xX; then
+#    { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
+#  else
+#    f="${EXP_LIBDIR}/lib${EXP_LIB}.*"
+#    if test "`echo $f`" = "$f"; then
+#      { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
+#    fi
+#  fi
+#else
+  EXP_LIB="expect`echo ${EXP_VERS} | sed -e 's,\.,,'`"
+#fi
 echo "$ac_t""$EXP_LIB" 1>&6
 
 
@@ -1542,7 +1542,7 @@ case ${EXP_VERS} in
 esac
 case ${EXP_VERS} in
   5.31*|5.32*)
-    if  ! -f $with_expect/expect_cf.h ; then
+    if [ ! -f $with_expect/include/expect.h ] ; then
       { echo "configure: error: Must build with Expect's source tree" 1>&2; exit 1; }
     fi
     ;;