patch-configure 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. --- ipsec-tools-0.8.2.orig/configure 2014-02-27 09:50:41.000000000 +0100
  2. +++ ipsec-tools-0.8.2/configure 2015-03-19 17:44:43.000000000 +0100
  3. @@ -11885,7 +11885,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
  4. -CFLAGS_ADD="$CFLAGS_ADD -Wall -Werror -Wno-unused"
  5. +CFLAGS_ADD="$CFLAGS_ADD -Wall -Wno-unused"
  6. case $host in
  7. *netbsd*)
  8. @@ -11977,8 +11977,8 @@ else
  9. fi
  10. - as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/linux/pfkeyv2.h" | $as_tr_sh`
  11. -ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default"
  12. + as_ac_Header=`$as_echo "ac_cv_header_$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" | $as_tr_sh`
  13. +ac_fn_c_check_header_mongrel "$LINENO" "$KERNEL_INCLUDE/uapi/linux/pfkeyv2.h" "$as_ac_Header" "$ac_includes_default"
  14. if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
  15. else
  16. @@ -12637,7 +12637,7 @@ $as_echo "$as_me: WARNING: Using a gener
  17. { $as_echo "$as_me:${as_lineno-$LINENO}: checking if printf accepts %z" >&5
  18. $as_echo_n "checking if printf accepts %z... " >&6; }
  19. saved_CFLAGS=$CFLAGS
  20. -CFLAGS="$CFLAGS -Wall -Werror"
  21. +CFLAGS="$CFLAGS -Wall"
  22. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  23. /* end confdefs.h. */
  24. @@ -14090,7 +14090,7 @@ $as_echo "#define HAVE_LIBLDAP /**/" >>c
  25. LIBS="$LIBS -L$libldap_dir/lib -R$libldap_dir/lib -lldap"
  26. saved_CFLAGS=$CFLAGS
  27. - CFLAGS="$CFLAGS -Wall -Werror"
  28. + CFLAGS="$CFLAGS -Wall"
  29. saved_CPPFLAGS=$CPPFLAGS
  30. CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
  31. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  32. @@ -14203,7 +14203,7 @@ $as_echo "#define HAVE_GSSAPI /**/" >>co
  33. # Check if iconv 2nd argument needs const
  34. saved_CFLAGS=$CFLAGS
  35. - CFLAGS="$CFLAGS -Wall -Werror"
  36. + CFLAGS="$CFLAGS -Wall"
  37. saved_CPPFLAGS=$CPPFLAGS
  38. CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
  39. ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
  40. @@ -14604,7 +14604,7 @@ linux*)
  41. # Linux kernel NAT-T check
  42. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  43. /* end confdefs.h. */
  44. -#include <linux/pfkeyv2.h>
  45. +#include <uapi/linux/pfkeyv2.h>
  46. #ifdef SADB_X_EXT_NAT_T_TYPE
  47. yes
  48. #endif
  49. @@ -14791,7 +14791,7 @@ linux*)
  50. # Linux kernel Security Context check
  51. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  52. /* end confdefs.h. */
  53. -#include <linux/pfkeyv2.h>
  54. +#include <uapi/linux/pfkeyv2.h>
  55. #ifdef SADB_X_EXT_SEC_CTX
  56. yes
  57. #endif