030-no-libnfnetlink.patch 3.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  1. --- a/configure
  2. +++ b/configure
  3. @@ -10917,75 +10917,7 @@ $as_echo "no" >&6; }
  4. fi
  5. fi
  6. -pkg_failed=no
  7. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
  8. -$as_echo_n "checking for libnfnetlink... " >&6; }
  9. -
  10. -if test -n "$libnfnetlink_CFLAGS"; then
  11. - pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
  12. - elif test -n "$PKG_CONFIG"; then
  13. - if test -n "$PKG_CONFIG" && \
  14. - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
  15. - ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
  16. - ac_status=$?
  17. - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  18. - test $ac_status = 0; }; then
  19. - pkg_cv_libnfnetlink_CFLAGS=`$PKG_CONFIG --cflags "libnfnetlink >= 1.0" 2>/dev/null`
  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. -else
  37. - pkg_failed=yes
  38. -fi
  39. - else
  40. - pkg_failed=untried
  41. -fi
  42. -
  43. -
  44. -
  45. -if test $pkg_failed = yes; then
  46. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  47. -$as_echo "no" >&6; }
  48. -
  49. -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
  50. - _pkg_short_errors_supported=yes
  51. -else
  52. - _pkg_short_errors_supported=no
  53. -fi
  54. - if test $_pkg_short_errors_supported = yes; then
  55. - libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnfnetlink >= 1.0" 2>&1`
  56. - else
  57. - libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnfnetlink >= 1.0" 2>&1`
  58. - fi
  59. - # Put the nasty error message in config.log where it belongs
  60. - echo "$libnfnetlink_PKG_ERRORS" >&5
  61. -
  62. - nfnetlink=0
  63. -elif test $pkg_failed = untried; then
  64. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  65. -$as_echo "no" >&6; }
  66. - nfnetlink=0
  67. -else
  68. - libnfnetlink_CFLAGS=$pkg_cv_libnfnetlink_CFLAGS
  69. - libnfnetlink_LIBS=$pkg_cv_libnfnetlink_LIBS
  70. - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  71. -$as_echo "yes" >&6; }
  72. - nfnetlink=1
  73. -fi
  74. - if test "$nfnetlink" = 1; then
  75. +if false; then
  76. HAVE_LIBNFNETLINK_TRUE=
  77. HAVE_LIBNFNETLINK_FALSE='#'
  78. else
  79. --- a/configure.ac
  80. +++ b/configure.ac
  81. @@ -79,9 +79,7 @@ AM_CONDITIONAL([ENABLE_LARGEFILE], [test
  82. AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"])
  83. AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"])
  84. -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
  85. - [nfnetlink=1], [nfnetlink=0])
  86. -AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
  87. +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [false])
  88. regular_CFLAGS="${largefile_cflags} \
  89. -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \