package/network/utils/iptables/patches/030-no-libnfnetlink.patch

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