--- acinclude.m4~	2008-07-16 20:41:56.892069130 +0200
+++ acinclude.m4	2008-07-16 20:42:33.158731990 +0200
@@ -725,19 +725,7 @@
 # Check for a fully functional sed program that truncates
 # as few characters as possible.  Prefer GNU sed if found.
 AC_DEFUN([AST_PROG_SED],
-[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
-    [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
-     dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed.
-     ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
-     _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed],
-	[_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED],
-		["$ac_path_SED" -f conftest.sed])])])
- SED="$ac_cv_path_SED"
+ [ SED="sed"
  AC_SUBST([SED])dnl
  rm -f conftest.sed
 ])# AST_PROG_SED
--- acinclude.m4~	2008-07-16 21:00:37.112374194 +0200
+++ acinclude.m4	2008-07-16 21:02:12.078198664 +0200
@@ -423,7 +423,7 @@
 AC_DEFUN(
 [AST_CHECK_PWLIB_VERSION], [
 	if test "${HAS_$2:-unset}" != "unset"; then
-		$2_VERSION=`grep "$2_VERSION" ${$2_INCDIR}/$3 | cut -f2 -d ' ' | sed -e 's/"//g'`
+		$2_VERSION=`grep "$2_VERSION" ${$2_INCDIR}/$3 | cut -f3 -d ' ' | sed -e 's/"//g'`
 		$2_MAJOR_VERSION=`echo ${$2_VERSION} | cut -f1 -d.`
 		$2_MINOR_VERSION=`echo ${$2_VERSION} | cut -f2 -d.`
 		$2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`