Index: ipsec-tools-0.5-rc1/acracoon.m4
===================================================================
--- ipsec-tools-0.5-rc1.orig/acracoon.m4	2004-09-21 10:35:23.000000000 -0400
+++ ipsec-tools-0.5-rc1/acracoon.m4	2005-02-03 13:56:02.144689256 -0500
@@ -92,6 +92,8 @@
 
 AC_DEFUN([RACOON_CHECK_BUGGY_GETADDRINFO], [
 	AC_MSG_CHECKING(getaddrinfo bug)
+	AC_CACHE_CHECK([for a buggy getaddrinfo],
+		racoon_cv_bug_getaddrinfo,[
 	saved_CFLAGS=$CFLAGS
 	CFLAGS="-Wall -O2"
 	AC_TRY_RUN([
@@ -182,12 +184,10 @@
 	  exit(1);
 	}
 	],
-	AC_MSG_RESULT(good)
-	buggygetaddrinfo=no,
-	AC_MSG_RESULT(buggy)
-	buggygetaddrinfo=yes,
-	AC_MSG_RESULT(buggy)
-	buggygetaddrinfo=yes)
+	racoon_cv_bug_getaddrinfo=no,
+	racoon_cv_bug_getaddrinfo=yes,
+	racoon_cv_bug_getaddrinfo=yes)
 	CFLAGS=$saved_CFLAGS
 	unset saved_CFLAGS
+	])
 ])
Index: ipsec-tools-0.5-rc1/configure.ac
===================================================================
--- ipsec-tools-0.5-rc1.orig/configure.ac	2005-01-04 09:20:57.000000000 -0500
+++ ipsec-tools-0.5-rc1/configure.ac	2005-02-03 14:02:34.935975904 -0500
@@ -16,6 +16,9 @@
 AC_PROG_LIBTOOL
 AC_PROG_YACC
 AM_PROG_LEX
+ac_save_LIBS="$LIBS"
+AC_CHECK_LIB(fl, yywrap, LEXLIB="-lfl")
+LIBS="$ac_save_LIBS"
 AC_SUBST(LEXLIB)
 AC_PROG_EGREP
 
@@ -57,10 +60,12 @@
 	      AC_SUBST(CONFIGURE_AMFLAGS) ],
 	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
 
+    if test "$cross_compiling" = no; then
     AC_CHECK_FILE($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
 	[ AC_CHECK_FILE(/usr/src/linux/include/linux/pfkeyv2.h,
 	  KERNEL_INCLUDE=/usr/src/linux/include ,
 	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
+    fi
     AC_SUBST(KERNEL_INCLUDE)
     # We need the configure script to run with correct kernel headers.
     # However we don't want to point to kernel source tree in compile time,
@@ -176,7 +181,7 @@
 AC_MSG_CHECKING(sha2 support)
 AC_DEFINE([WITH_SHA2], [], [SHA2 support])
 AC_CHECK_HEADER(openssl/sha2.h, [], [
-	CPPFLAGS_ADD="$CPPFLAGS_ADD -I./\${top_srcdir}/src/racoon/missing"
+	CPPFLAGS_ADD="$CPPFLAGS_ADD -I\${top_srcdir}/src/racoon/missing"
 	AC_LIBOBJ([sha2])
 	CRYPTOBJS="$CRYPTOBJS sha2.o"])
 AC_SUBST(CRYPTOBJS)
@@ -339,7 +344,7 @@
 fi
 
 RACOON_CHECK_BUGGY_GETADDRINFO
-if test "$buggygetaddrinfo" = "yes"; then
+if test "$racoon_cv_bug_getaddrinfo" = "yes"; then
 	AC_MSG_ERROR([Broken getaddrinfo() is no longer supported. Aborting.])
 fi