2
0

030-no-libnfnetlink.patch 3.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. --- a/configure
  2. +++ b/configure
  3. @@ -12367,77 +12367,7 @@ fi
  4. fi
  5. -pkg_failed=no
  6. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
  7. -$as_echo_n "checking for libnfnetlink... " >&6; }
  8. -
  9. -if test -n "$libnfnetlink_CFLAGS"; then
  10. - pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
  11. - elif test -n "$PKG_CONFIG"; then
  12. - if test -n "$PKG_CONFIG" && \
  13. - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
  14. - ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
  15. - ac_status=$?
  16. - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  17. - test $ac_status = 0; }; then
  18. - pkg_cv_libnfnetlink_CFLAGS=`$PKG_CONFIG --cflags "libnfnetlink >= 1.0" 2>/dev/null`
  19. - test "x$?" != "x0" && pkg_failed=yes
  20. -else
  21. - pkg_failed=yes
  22. -fi
  23. - else
  24. - pkg_failed=untried
  25. -fi
  26. -if test -n "$libnfnetlink_LIBS"; then
  27. - pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
  28. - elif test -n "$PKG_CONFIG"; then
  29. - if test -n "$PKG_CONFIG" && \
  30. - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
  31. - ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
  32. - ac_status=$?
  33. - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  34. - test $ac_status = 0; }; then
  35. - pkg_cv_libnfnetlink_LIBS=`$PKG_CONFIG --libs "libnfnetlink >= 1.0" 2>/dev/null`
  36. - test "x$?" != "x0" && pkg_failed=yes
  37. -else
  38. - pkg_failed=yes
  39. -fi
  40. - else
  41. - pkg_failed=untried
  42. -fi
  43. -
  44. -
  45. -
  46. -if test $pkg_failed = yes; then
  47. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  48. -$as_echo "no" >&6; }
  49. -
  50. -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  51. - _pkg_short_errors_supported=yes
  52. -else
  53. - _pkg_short_errors_supported=no
  54. -fi
  55. - if test $_pkg_short_errors_supported = yes; then
  56. - libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
  57. - else
  58. - libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1`
  59. - fi
  60. - # Put the nasty error message in config.log where it belongs
  61. - echo "$libnfnetlink_PKG_ERRORS" >&5
  62. -
  63. - nfnetlink=0
  64. -elif test $pkg_failed = untried; then
  65. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  66. -$as_echo "no" >&6; }
  67. - nfnetlink=0
  68. -else
  69. - libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS
  70. - libnfnetlink_LIBS=$pkg_cv_libnfnetlink_LIBS
  71. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  72. -$as_echo "yes" >&6; }
  73. - nfnetlink=1
  74. -fi
  75. - if test "$nfnetlink" = 1; then
  76. +if false; then
  77. HAVE_LIBNFNETLINK_TRUE=
  78. HAVE_LIBNFNETLINK_FALSE='#'
  79. else
  80. --- a/configure.ac
  81. +++ b/configure.ac
  82. @@ -111,9 +111,7 @@ if test "x$enable_bpfc" = "xyes" || test
  83. AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool))
  84. fi
  85. -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
  86. - [nfnetlink=1], [nfnetlink=0])
  87. -AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
  88. +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [false])
  89. regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
  90. -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \