org.handhelds.familiar/packages/ipsec-tools/files/cross.patch

   1 Index: ipsec-tools-0.5-rc1/acracoon.m4
   2 ===================================================================
   3 --- ipsec-tools-0.5-rc1.orig/acracoon.m4        2004-09-21 10:35:23.000000000 -0400
   4 +++ ipsec-tools-0.5-rc1/acracoon.m4     2005-02-03 13:56:02.144689256 -0500
   5 @@ -92,6 +92,8 @@
   6
   7  AC_DEFUN([RACOON_CHECK_BUGGY_GETADDRINFO], [
   8         AC_MSG_CHECKING(getaddrinfo bug)
   9 +       AC_CACHE_CHECK([for a buggy getaddrinfo],
  10 +               racoon_cv_bug_getaddrinfo,[
  11         saved_CFLAGS=$CFLAGS
  12         CFLAGS="-Wall -O2"
  13         AC_TRY_RUN([
  14 @@ -182,12 +184,10 @@
  15           exit(1);
  16         }
  17         ],
  18 -       AC_MSG_RESULT(good)
  19 -       buggygetaddrinfo=no,
  20 -       AC_MSG_RESULT(buggy)
  21 -       buggygetaddrinfo=yes,
  22 -       AC_MSG_RESULT(buggy)
  23 -       buggygetaddrinfo=yes)
  24 +       racoon_cv_bug_getaddrinfo=no,
  25 +       racoon_cv_bug_getaddrinfo=yes,
  26 +       racoon_cv_bug_getaddrinfo=yes)
  27         CFLAGS=$saved_CFLAGS
  28         unset saved_CFLAGS
  29 +       ])
  30  ])
  31 Index: ipsec-tools-0.5-rc1/configure.ac
  32 ===================================================================
  33 --- ipsec-tools-0.5-rc1.orig/configure.ac       2005-01-04 09:20:57.000000000 -0500
  34 +++ ipsec-tools-0.5-rc1/configure.ac    2005-02-03 14:02:34.935975904 -0500
  35 @@ -16,6 +16,9 @@
  36  AC_PROG_LIBTOOL
  37  AC_PROG_YACC
  38  AM_PROG_LEX
  39 +ac_save_LIBS="$LIBS"
  40 +AC_CHECK_LIB(fl, yywrap, LEXLIB="-lfl")
  41 +LIBS="$ac_save_LIBS"
  42  AC_SUBST(LEXLIB)
  43  AC_PROG_EGREP
  44
  45 @@ -57,10 +60,12 @@
  46               AC_SUBST(CONFIGURE_AMFLAGS) ],
  47             [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
  48
  49 +    if test "$cross_compiling" = no; then
  50      AC_CHECK_FILE($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
  51         [ AC_CHECK_FILE(/usr/src/linux/include/linux/pfkeyv2.h,
  52           KERNEL_INCLUDE=/usr/src/linux/include ,
  53           [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
  54 +    fi
  55      AC_SUBST(KERNEL_INCLUDE)
  56      # We need the configure script to run with correct kernel headers.
  57      # However we don't want to point to kernel source tree in compile time,
  58 @@ -176,7 +181,7 @@
  59  AC_MSG_CHECKING(sha2 support)
  60  AC_DEFINE([WITH_SHA2], [], [SHA2 support])
  61  AC_CHECK_HEADER(openssl/sha2.h, [], [
  62 -       CPPFLAGS_ADD="$CPPFLAGS_ADD -I./\${top_srcdir}/src/racoon/missing"
  63 +       CPPFLAGS_ADD="$CPPFLAGS_ADD -I\${top_srcdir}/src/racoon/missing"
  64         AC_LIBOBJ([sha2])
  65         CRYPTOBJS="$CRYPTOBJS sha2.o"])
  66  AC_SUBST(CRYPTOBJS)
  67 @@ -339,7 +344,7 @@
  68  fi
  69
  70  RACOON_CHECK_BUGGY_GETADDRINFO
  71 -if test "$buggygetaddrinfo" = "yes"; then
  72 +if test "$racoon_cv_bug_getaddrinfo" = "yes"; then
  73         AC_MSG_ERROR([Broken getaddrinfo() is no longer supported. Aborting.])
  74  fi
  75