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

   1 --- a/configure
   2 +++ b/configure
   3 @@ -10853,77 +10853,7 @@ $as_echo "no" >&6; }
   4
   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 "$PKG_CONFIG"; then
  12 -    if test -n "$libnfnetlink_CFLAGS"; then
  13 -        pkg_cv_libnfnetlink_CFLAGS="$libnfnetlink_CFLAGS"
  14 -    else
  15 -        if test -n "$PKG_CONFIG" && \
  16 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
  17 -  ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
  18 -  ac_status=$?
  19 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  20 -  test $ac_status = 0; }; then
  21 -  pkg_cv_libnfnetlink_CFLAGS=`$PKG_CONFIG --cflags "libnfnetlink >= 1.0" 2>/dev/null`
  22 -else
  23 -  pkg_failed=yes
  24 -fi
  25 -    fi
  26 -else
  27 -       pkg_failed=untried
  28 -fi
  29 -if test -n "$PKG_CONFIG"; then
  30 -    if test -n "$libnfnetlink_LIBS"; then
  31 -        pkg_cv_libnfnetlink_LIBS="$libnfnetlink_LIBS"
  32 -    else
  33 -        if test -n "$PKG_CONFIG" && \
  34 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnfnetlink >= 1.0\""; } >&5
  35 -  ($PKG_CONFIG --exists --print-errors "libnfnetlink >= 1.0") 2>&5
  36 -  ac_status=$?
  37 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  38 -  test $ac_status = 0; }; then
  39 -  pkg_cv_libnfnetlink_LIBS=`$PKG_CONFIG --libs "libnfnetlink >= 1.0" 2>/dev/null`
  40 -else
  41 -  pkg_failed=yes
  42 -fi
  43 -    fi
  44 -else
  45 -       pkg_failed=untried
  46 -fi
  47 -
  48 -
  49 -
  50 -if test $pkg_failed = yes; then
  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 --errors-to-stdout --print-errors "libnfnetlink >= 1.0"`
  59 -        else
  60 -               libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnfnetlink >= 1.0"`
  61 -        fi
  62 -       # Put the nasty error message in config.log where it belongs
  63 -       echo "$libnfnetlink_PKG_ERRORS" >&5
  64 -
  65 -       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  66 -$as_echo "no" >&6; }
  67 -                nfnetlink=0
  68 -elif test $pkg_failed = untried; then
  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 @@ -68,9 +68,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="${largefile_cflags} \
  94         -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \