add a lot of new devel subpackages and fix native builds of packages

1 files changed, 699 insertions, 1626 deletions

diff --git a/package/libnids/patches/autotool.patch b/package/libnids/patches/autotool.patch
index 90a281f0e..b61da48bc 100644
--- a/package/libnids/patches/autotool.patch
+++ b/package/libnids/patches/autotool.patch
@@ -1,957 +1,16 @@
-diff -Nur libnids-1.23.orig/aclocal.m4 libnids-1.23/aclocal.m4
---- libnids-1.23.orig/aclocal.m4	2006-05-01 19:14:51.000000000 +0200
-+++ libnids-1.23/aclocal.m4	2010-02-18 22:19:09.952858667 +0100
-@@ -1,833 +1,15 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
--dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--
--# lib-prefix.m4 serial 4 (gettext-0.14.2)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
--dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
--dnl require excessive bracketing.
--ifdef([AC_HELP_STRING],
--[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
--[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
--
--dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
--dnl to access previously installed libraries. The basic assumption is that
--dnl a user will want packages to use other packages he previously installed
--dnl with the same --prefix option.
--dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
--dnl libraries, but is otherwise very convenient.
--AC_DEFUN([AC_LIB_PREFIX],
--[
--  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
--  AC_REQUIRE([AC_PROG_CC])
--  AC_REQUIRE([AC_CANONICAL_HOST])
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib-prefix],
--[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--  --without-lib-prefix    don't search for libraries in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  if test $use_additional = yes; then
--    dnl Potentially add $additional_includedir to $CPPFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/include,
--    dnl   2. if it's already present in $CPPFLAGS,
--    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_includedir" != "X/usr/include"; then
--      haveit=
--      for x in $CPPFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-I$additional_includedir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_includedir" = "X/usr/local/include"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_includedir"; then
--            dnl Really add $additional_includedir to $CPPFLAGS.
--            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
--          fi
--        fi
--      fi
--    fi
--    dnl Potentially add $additional_libdir to $LDFLAGS.
--    dnl But don't add it
--    dnl   1. if it's the standard /usr/lib,
--    dnl   2. if it's already present in $LDFLAGS,
--    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
--    dnl   4. if it doesn't exist as a directory.
--    if test "X$additional_libdir" != "X/usr/lib"; then
--      haveit=
--      for x in $LDFLAGS; do
--        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--        if test "X$x" = "X-L$additional_libdir"; then
--          haveit=yes
--          break
--        fi
--      done
--      if test -z "$haveit"; then
--        if test "X$additional_libdir" = "X/usr/local/lib"; then
--          if test -n "$GCC"; then
--            case $host_os in
--              linux*) haveit=yes;;
--            esac
--          fi
--        fi
--        if test -z "$haveit"; then
--          if test -d "$additional_libdir"; then
--            dnl Really add $additional_libdir to $LDFLAGS.
--            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
--          fi
--        fi
--      fi
--    fi
--  fi
--])
--
--dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
--dnl acl_final_exec_prefix, containing the values to which $prefix and
--dnl $exec_prefix will expand at the end of the configure script.
--AC_DEFUN([AC_LIB_PREPARE_PREFIX],
--[
--  dnl Unfortunately, prefix and exec_prefix get only finally determined
--  dnl at the end of configure.
--  if test "X$prefix" = "XNONE"; then
--    acl_final_prefix="$ac_default_prefix"
--  else
--    acl_final_prefix="$prefix"
--  fi
--  if test "X$exec_prefix" = "XNONE"; then
--    acl_final_exec_prefix='${prefix}'
--  else
--    acl_final_exec_prefix="$exec_prefix"
--  fi
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
--  prefix="$acl_save_prefix"
--])
--
--dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
--dnl variables prefix and exec_prefix bound to the values they will have
--dnl at the end of the configure script.
--AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
--[
--  acl_save_prefix="$prefix"
--  prefix="$acl_final_prefix"
--  acl_save_exec_prefix="$exec_prefix"
--  exec_prefix="$acl_final_exec_prefix"
--  $1
--  exec_prefix="$acl_save_exec_prefix"
--  prefix="$acl_save_prefix"
--])
--
--# lib-link.m4 serial 6 (gettext-0.14.3)
--dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl From Bruno Haible.
--
--AC_PREREQ(2.50)
--
--dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
--dnl augments the CPPFLAGS variable.
--AC_DEFUN([AC_LIB_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
--    AC_LIB_LINKFLAGS_BODY([$1], [$2])
--    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
--    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
--    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
--  ])
--  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
--  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
--  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
--  dnl results of this search when this library appears as a dependency.
--  HAVE_LIB[]NAME=yes
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
--dnl searches for libname and the libraries corresponding to explicit and
--dnl implicit dependencies, together with the specified include files and
--dnl the ability to compile and link the specified testcode. If found, it
--dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
--dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
--dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
--dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
--AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
--[
--  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
--  AC_REQUIRE([AC_LIB_RPATH])
--  define([Name],[translit([$1],[./-], [___])])
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--
--  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
--  dnl accordingly.
--  AC_LIB_LINKFLAGS_BODY([$1], [$2])
--
--  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
--  dnl because if the user has installed lib[]Name and not disabled its use
--  dnl via --without-lib[]Name-prefix, he wants to use it.
--  ac_save_CPPFLAGS="$CPPFLAGS"
--  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
--
--  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
--    ac_save_LIBS="$LIBS"
--    LIBS="$LIBS $LIB[]NAME"
--    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
--    LIBS="$ac_save_LIBS"
--  ])
--  if test "$ac_cv_lib[]Name" = yes; then
--    HAVE_LIB[]NAME=yes
--    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
--    AC_MSG_CHECKING([how to link with lib[]$1])
--    AC_MSG_RESULT([$LIB[]NAME])
--  else
--    HAVE_LIB[]NAME=no
--    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
--    dnl $INC[]NAME either.
--    CPPFLAGS="$ac_save_CPPFLAGS"
--    LIB[]NAME=
--    LTLIB[]NAME=
--  fi
--  AC_SUBST([HAVE_LIB]NAME)
--  AC_SUBST([LIB]NAME)
--  AC_SUBST([LTLIB]NAME)
--  undefine([Name])
--  undefine([NAME])
--])
--
--dnl Determine the platform dependent parameters needed to use rpath:
--dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
--dnl hardcode_direct, hardcode_minus_L.
--AC_DEFUN([AC_LIB_RPATH],
--[
--  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
--  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
--  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
--  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
--  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
--  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
--  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
--    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
--    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
--    . ./conftest.sh
--    rm -f ./conftest.sh
--    acl_cv_rpath=done
--  ])
--  wl="$acl_cv_wl"
--  libext="$acl_cv_libext"
--  shlibext="$acl_cv_shlibext"
--  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
--  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
--  hardcode_direct="$acl_cv_hardcode_direct"
--  hardcode_minus_L="$acl_cv_hardcode_minus_L"
--  dnl Determine whether the user wants rpath handling at all.
--  AC_ARG_ENABLE(rpath,
--    [  --disable-rpath         do not hardcode runtime library paths],
--    :, enable_rpath=yes)
--])
--
--dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
--dnl the libraries corresponding to explicit and implicit dependencies.
--dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
--AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
--[
--  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
--                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
--  dnl By default, look in $includedir and $libdir.
--  use_additional=yes
--  AC_LIB_WITH_FINAL_PREFIX([
--    eval additional_includedir=\"$includedir\"
--    eval additional_libdir=\"$libdir\"
--  ])
--  AC_LIB_ARG_WITH([lib$1-prefix],
--[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
--  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
--[
--    if test "X$withval" = "Xno"; then
--      use_additional=no
--    else
--      if test "X$withval" = "X"; then
--        AC_LIB_WITH_FINAL_PREFIX([
--          eval additional_includedir=\"$includedir\"
--          eval additional_libdir=\"$libdir\"
--        ])
--      else
--        additional_includedir="$withval/include"
--        additional_libdir="$withval/lib"
--      fi
--    fi
--])
--  dnl Search the library and its dependencies in $additional_libdir and
--  dnl $LDFLAGS. Using breadth-first-seach.
--  LIB[]NAME=
--  LTLIB[]NAME=
--  INC[]NAME=
--  rpathdirs=
--  ltrpathdirs=
--  names_already_handled=
--  names_next_round='$1 $2'
--  while test -n "$names_next_round"; do
--    names_this_round="$names_next_round"
--    names_next_round=
--    for name in $names_this_round; do
--      already_handled=
--      for n in $names_already_handled; do
--        if test "$n" = "$name"; then
--          already_handled=yes
--          break
--        fi
--      done
--      if test -z "$already_handled"; then
--        names_already_handled="$names_already_handled $name"
--        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
--        dnl or AC_LIB_HAVE_LINKFLAGS call.
--        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
--        eval value=\"\$HAVE_LIB$uppername\"
--        if test -n "$value"; then
--          if test "$value" = yes; then
--            eval value=\"\$LIB$uppername\"
--            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
--            eval value=\"\$LTLIB$uppername\"
--            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
--          else
--            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
--            dnl that this library doesn't exist. So just drop it.
--            :
--          fi
--        else
--          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
--          dnl and the already constructed $LIBNAME/$LTLIBNAME.
--          found_dir=
--          found_la=
--          found_so=
--          found_a=
--          if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
--              found_dir="$additional_libdir"
--              found_so="$additional_libdir/lib$name.$shlibext"
--              if test -f "$additional_libdir/lib$name.la"; then
--                found_la="$additional_libdir/lib$name.la"
--              fi
--            else
--              if test -f "$additional_libdir/lib$name.$libext"; then
--                found_dir="$additional_libdir"
--                found_a="$additional_libdir/lib$name.$libext"
--                if test -f "$additional_libdir/lib$name.la"; then
--                  found_la="$additional_libdir/lib$name.la"
--                fi
--              fi
--            fi
--          fi
--          if test "X$found_dir" = "X"; then
--            for x in $LDFLAGS $LTLIB[]NAME; do
--              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--              case "$x" in
--                -L*)
--                  dir=`echo "X$x" | sed -e 's/^X-L//'`
--                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
--                    found_dir="$dir"
--                    found_so="$dir/lib$name.$shlibext"
--                    if test -f "$dir/lib$name.la"; then
--                      found_la="$dir/lib$name.la"
--                    fi
--                  else
--                    if test -f "$dir/lib$name.$libext"; then
--                      found_dir="$dir"
--                      found_a="$dir/lib$name.$libext"
--                      if test -f "$dir/lib$name.la"; then
--                        found_la="$dir/lib$name.la"
--                      fi
--                    fi
--                  fi
--                  ;;
--              esac
--              if test "X$found_dir" != "X"; then
--                break
--              fi
--            done
--          fi
--          if test "X$found_dir" != "X"; then
--            dnl Found the library.
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
--            if test "X$found_so" != "X"; then
--              dnl Linking with a shared library. We attempt to hardcode its
--              dnl directory into the executable's runpath, unless it's the
--              dnl standard /usr/lib.
--              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
--                dnl No hardcoding is needed.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--              else
--                dnl Use an explicit option to hardcode DIR into the resulting
--                dnl binary.
--                dnl Potentially add DIR to ltrpathdirs.
--                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                haveit=
--                for x in $ltrpathdirs; do
--                  if test "X$x" = "X$found_dir"; then
--                    haveit=yes
--                    break
--                  fi
--                done
--                if test -z "$haveit"; then
--                  ltrpathdirs="$ltrpathdirs $found_dir"
--                fi
--                dnl The hardcoding into $LIBNAME is system dependent.
--                if test "$hardcode_direct" = yes; then
--                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
--                  dnl resulting binary.
--                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                else
--                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
--                    dnl Use an explicit option to hardcode DIR into the resulting
--                    dnl binary.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    dnl Potentially add DIR to rpathdirs.
--                    dnl The rpathdirs will be appended to $LIBNAME at the end.
--                    haveit=
--                    for x in $rpathdirs; do
--                      if test "X$x" = "X$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      rpathdirs="$rpathdirs $found_dir"
--                    fi
--                  else
--                    dnl Rely on "-L$found_dir".
--                    dnl But don't add it if it's already contained in the LDFLAGS
--                    dnl or the already constructed $LIBNAME
--                    haveit=
--                    for x in $LDFLAGS $LIB[]NAME; do
--                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                      if test "X$x" = "X-L$found_dir"; then
--                        haveit=yes
--                        break
--                      fi
--                    done
--                    if test -z "$haveit"; then
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
--                    fi
--                    if test "$hardcode_minus_L" != no; then
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
--                    else
--                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
--                      dnl here, because this doesn't fit in flags passed to the
--                      dnl compiler. So give up. No hardcoding. This affects only
--                      dnl very old systems.
--                      dnl FIXME: Not sure whether we should use
--                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
--                      dnl here.
--                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--                    fi
--                  fi
--                fi
--              fi
--            else
--              if test "X$found_a" != "X"; then
--                dnl Linking with a static library.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
--              else
--                dnl We shouldn't come here, but anyway it's good to have a
--                dnl fallback.
--                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
--              fi
--            fi
--            dnl Assume the include files are nearby.
--            additional_includedir=
--            case "$found_dir" in
--              */lib | */lib/)
--                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
--                additional_includedir="$basedir/include"
--                ;;
--            esac
--            if test "X$additional_includedir" != "X"; then
--              dnl Potentially add $additional_includedir to $INCNAME.
--              dnl But don't add it
--              dnl   1. if it's the standard /usr/include,
--              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
--              dnl   3. if it's already present in $CPPFLAGS or the already
--              dnl      constructed $INCNAME,
--              dnl   4. if it doesn't exist as a directory.
--              if test "X$additional_includedir" != "X/usr/include"; then
--                haveit=
--                if test "X$additional_includedir" = "X/usr/local/include"; then
--                  if test -n "$GCC"; then
--                    case $host_os in
--                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                    esac
--                  fi
--                fi
--                if test -z "$haveit"; then
--                  for x in $CPPFLAGS $INC[]NAME; do
--                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                    if test "X$x" = "X-I$additional_includedir"; then
--                      haveit=yes
--                      break
--                    fi
--                  done
--                  if test -z "$haveit"; then
--                    if test -d "$additional_includedir"; then
--                      dnl Really add $additional_includedir to $INCNAME.
--                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
--                    fi
--                  fi
--                fi
--              fi
--            fi
--            dnl Look for dependencies.
--            if test -n "$found_la"; then
--              dnl Read the .la file. It defines the variables
--              dnl dlname, library_names, old_library, dependency_libs, current,
--              dnl age, revision, installed, dlopen, dlpreopen, libdir.
--              save_libdir="$libdir"
--              case "$found_la" in
--                */* | *\\*) . "$found_la" ;;
--                *) . "./$found_la" ;;
--              esac
--              libdir="$save_libdir"
--              dnl We use only dependency_libs.
--              for dep in $dependency_libs; do
--                case "$dep" in
--                  -L*)
--                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
--                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
--                    dnl But don't add it
--                    dnl   1. if it's the standard /usr/lib,
--                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
--                    dnl   3. if it's already present in $LDFLAGS or the already
--                    dnl      constructed $LIBNAME,
--                    dnl   4. if it doesn't exist as a directory.
--                    if test "X$additional_libdir" != "X/usr/lib"; then
--                      haveit=
--                      if test "X$additional_libdir" = "X/usr/local/lib"; then
--                        if test -n "$GCC"; then
--                          case $host_os in
--                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
--                          esac
--                        fi
--                      fi
--                      if test -z "$haveit"; then
--                        haveit=
--                        for x in $LDFLAGS $LIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LIBNAME.
--                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                        haveit=
--                        for x in $LDFLAGS $LTLIB[]NAME; do
--                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--                          if test "X$x" = "X-L$additional_libdir"; then
--                            haveit=yes
--                            break
--                          fi
--                        done
--                        if test -z "$haveit"; then
--                          if test -d "$additional_libdir"; then
--                            dnl Really add $additional_libdir to $LTLIBNAME.
--                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
--                          fi
--                        fi
--                      fi
--                    fi
--                    ;;
--                  -R*)
--                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
--                    if test "$enable_rpath" != no; then
--                      dnl Potentially add DIR to rpathdirs.
--                      dnl The rpathdirs will be appended to $LIBNAME at the end.
--                      haveit=
--                      for x in $rpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        rpathdirs="$rpathdirs $dir"
--                      fi
--                      dnl Potentially add DIR to ltrpathdirs.
--                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
--                      haveit=
--                      for x in $ltrpathdirs; do
--                        if test "X$x" = "X$dir"; then
--                          haveit=yes
--                          break
--                        fi
--                      done
--                      if test -z "$haveit"; then
--                        ltrpathdirs="$ltrpathdirs $dir"
--                      fi
--                    fi
--                    ;;
--                  -l*)
--                    dnl Handle this in the next round.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
--                    ;;
--                  *.la)
--                    dnl Handle this in the next round. Throw away the .la's
--                    dnl directory; it is already contained in a preceding -L
--                    dnl option.
--                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
--                    ;;
--                  *)
--                    dnl Most likely an immediate library name.
--                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
--                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
--                    ;;
--                esac
--              done
--            fi
--          else
--            dnl Didn't find the library; assume it is in the system directories
--            dnl known to the linker and runtime loader. (All the system
--            dnl directories known to the linker should also be known to the
--            dnl runtime loader, otherwise the system is severely misconfigured.)
--            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
--            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
--          fi
--        fi
--      fi
--    done
--  done
--  if test "X$rpathdirs" != "X"; then
--    if test -n "$hardcode_libdir_separator"; then
--      dnl Weird platform: only the last -rpath option counts, the user must
--      dnl pass all path elements in one option. We can arrange that for a
--      dnl single library, but not when more than one $LIBNAMEs are used.
--      alldirs=
--      for found_dir in $rpathdirs; do
--        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
--      done
--      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
--      acl_save_libdir="$libdir"
--      libdir="$alldirs"
--      eval flag=\"$hardcode_libdir_flag_spec\"
--      libdir="$acl_save_libdir"
--      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--    else
--      dnl The -rpath options are cumulative.
--      for found_dir in $rpathdirs; do
--        acl_save_libdir="$libdir"
--        libdir="$found_dir"
--        eval flag=\"$hardcode_libdir_flag_spec\"
--        libdir="$acl_save_libdir"
--        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
--      done
--    fi
--  fi
--  if test "X$ltrpathdirs" != "X"; then
--    dnl When using libtool, the option that works for both libraries and
--    dnl executables is -R. The -R options are cumulative.
--    for found_dir in $ltrpathdirs; do
--      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
--    done
--  fi
--])
--
--dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
--dnl unless already present in VAR.
--dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
--dnl contains two or three consecutive elements that belong together.
--AC_DEFUN([AC_LIB_APPENDTOVAR],
--[
--  for element in [$2]; do
--    haveit=
--    for x in $[$1]; do
--      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
--      if test "X$x" = "X$element"; then
--        haveit=yes
--        break
--      fi
--    done
--    if test -z "$haveit"; then
--      [$1]="${[$1]}${[$1]:+ }$element"
--    fi
--  done
--])
--
--# lib-ld.m4 serial 3 (gettext-0.13)
--dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl Subroutines of libtool.m4,
--dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
--dnl with libtool.m4.
--
--dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
--AC_DEFUN([AC_LIB_PROG_LD_GNU],
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
--  acl_cv_prog_gnu_ld=yes ;;
--*)
--  acl_cv_prog_gnu_ld=no ;;
--esac])
--with_gnu_ld=$acl_cv_prog_gnu_ld
--])
--
--dnl From libtool-1.4. Sets the variable LD.
--AC_DEFUN([AC_LIB_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
--[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--# Prepare PATH_SEPARATOR.
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by GCC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]* | [A-Za-z]:[\\/]*)]
--      [re_direlt='/[^/][^/]*/\.\./']
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(acl_cv_path_LD,
--[if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      acl_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
--      *GNU* | *'with BFD'*)
--	test "$with_gnu_ld" != no && break ;;
--      *)
--	test "$with_gnu_ld" != yes && break ;;
--      esac
--    fi
--  done
--  IFS="$ac_save_ifs"
--else
--  acl_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$acl_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_LIB_PROG_LD_GNU
--])
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
- 
- # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
- # 
-@@ -862,7 +44,7 @@
- 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- fi
- if test -n "$PKG_CONFIG"; then
--	_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
-+	_pkg_min_version=m4_default([$1], [0.9.0])
- 	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- 		AC_MSG_RESULT([yes])
-@@ -898,14 +80,30 @@
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
- [if test -n "$PKG_CONFIG"; then
-+    if test -n "$$1"; then
-+        pkg_cv_[]$1="$$1"
-+    else
-         PKG_CHECK_EXISTS([$3],
-                          [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- 			 [pkg_failed=yes])
-+    fi
- else
- 	pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
- 
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
- # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
- # [ACTION-IF-NOT-FOUND])
- #
-@@ -927,31 +125,41 @@
- _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
- _PKG_CONFIG([$1][_LIBS], [libs], [$2])
- 
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
- if test $pkg_failed = yes; then
--	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+        _PKG_SHORT_ERRORS_SUPPORTED
-+        if test $_pkg_short_errors_supported = yes; then
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+        else 
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+        fi
- 	# Put the nasty error message in config.log where it belongs
--	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
-+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- 
- 	ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met.
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
--to avoid the need to call pkg-config.  See the pkg-config man page for
--more details.])],
--		[$4])
-+_PKG_TEXT
-+])],
-+		[AC_MSG_RESULT([no])
-+                $4])
- elif test $pkg_failed = untried; then
- 	ifelse([$4], , [AC_MSG_FAILURE(dnl
- [The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
--Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
--to avoid the need to call pkg-config.  See the pkg-config man page for
--more details.
-+_PKG_TEXT
- 
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- 		[$4])
- else
- 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 --- libnids-1.23.orig/configure	2006-05-01 19:14:51.000000000 +0200
-+++ libnids-1.23/configure	2010-02-18 22:19:11.708852458 +0100
-@@ -1,81 +1,415 @@
++++ libnids-1.23/configure	2011-03-11 21:07:25.000000000 +0100
+@@ -1,81 +1,423 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.65.
++# Generated by GNU Autoconf 2.68.
 +#
 +#
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
 +#
  #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1050,6 +109,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +IFS=" ""	$as_nl"
 +
 +# Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
 +case $0 in #((
 +  *[\\/]* ) as_myself=$0 ;;
 +  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1183,11 +243,18 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  # We cannot yet assume a decent shell, so we have to provide a
 +	# neutralization value for shells without unset; and this also
 +	# works around shells that cannot unset nonexistent variables.
++	# Preserve -v and -x to the replacement shell.
 +	BASH_ENV=/dev/null
 +	ENV=/dev/null
 +	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 +	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	case $- in # ((((
++	  *v*x* | *x*v* ) as_opts=-vx ;;
++	  *v* ) as_opts=-v ;;
++	  *x* ) as_opts=-x ;;
++	  * ) as_opts= ;;
++	esac
++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 +fi
 +
 +    if test x$as_have_required = xno; then :
@@ -1287,7 +354,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +      test -d "$as_dir" && break
 +    done
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 +
 +
 +} # as_fn_mkdir_p
@@ -1325,23 +392,23 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    as_val=`expr "$@" || test $? -eq 1`
 +  }
 +fi # as_fn_arith
++
  
 -# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
 +as_fn_error ()
 +{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 +  fi
-+  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
 +  as_fn_exit $as_status
 +} # as_fn_error
 +
@@ -1377,7 +444,6 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
--
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X/"$0" |
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
@@ -1394,11 +460,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +	  }
 +	  s/.*/./; q'`
  
+-
 -# PATH needs CR, and LINENO needs CR and PATH.
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -83,146 +417,107 @@
+@@ -83,146 +425,107 @@
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -1415,7 +482,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  rm -f conf$$.sh
 -fi
 -
- 
+-
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
@@ -1471,7 +538,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -done
 -;;
 -  esac
--
+ 
 -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
 -  # uniformly replaced by the line number.  The first 'sed' inserts a
 -  # line-number line before each line; the second 'sed' does the real
@@ -1618,7 +685,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,38 +526,25 @@
+@@ -231,38 +534,25 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -1635,7 +702,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +exec 6>&1
  
  # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
  # so uname gets run too.
  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  
@@ -1661,7 +729,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  # Identity of this package.
  PACKAGE_NAME=
-@@ -270,51 +552,155 @@
+@@ -270,51 +560,155 @@
  PACKAGE_VERSION=
  PACKAGE_STRING=
  PACKAGE_BUGREPORT=
@@ -1831,7 +899,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
-@@ -337,34 +723,48 @@
+@@ -337,34 +731,49 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -1874,8 +942,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
 -  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 +  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
 +  esac
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1887,7 +956,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -386,33 +786,59 @@
+@@ -386,33 +795,59 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -1916,7 +985,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
 -    eval "enable_$ac_feature=no" ;;
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
@@ -1950,7 +1019,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
 -      *) ac_optarg=yes ;;
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
@@ -1965,7 +1034,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +865,12 @@
+@@ -439,6 +874,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -1978,7 +1047,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -463,13 +895,16 @@
+@@ -463,13 +904,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -1999,7 +1068,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +969,16 @@
+@@ -534,6 +978,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -2016,7 +1085,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -584,26 +1029,36 @@
+@@ -584,26 +1038,36 @@
      ac_init_version=: ;;
  
    -with-* | --with-*)
@@ -2031,7 +1100,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
 -      *) ac_optarg=yes ;;
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
@@ -2054,7 +1123,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -    ac_package=`echo $ac_package | sed 's/-/_/g'`
 -    eval "with_$ac_package=no" ;;
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
@@ -2068,15 +1137,15 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
    --x)
      # Obsolete; use --with-x.
-@@ -623,26 +1078,25 @@
+@@ -623,27 +1087,26 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
 -  -*) { echo "$as_me: error: unrecognized option: $ac_option
 -Try \`$0 --help' for more information." >&2
 -   { (exit 1); exit 1; }; }
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
      ;;
  
    *=*)
@@ -2089,7 +1158,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -    eval "$ac_envvar='$ac_optarg'"
 +    case $ac_envvar in #(
 +      '' | [0-9]* | *[!_$as_cr_alnum]* )
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
 +    esac
 +    eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
@@ -2100,17 +1169,19 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 -      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
 +      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
      ;;
  
-@@ -651,31 +1105,36 @@
+   esac
+@@ -651,31 +1114,36 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
 -  { echo "$as_me: error: missing argument to $ac_option" >&2
 -   { (exit 1); exit 1; }; }
-+  as_fn_error "missing argument to $ac_option"
++  as_fn_error $? "missing argument to $ac_option"
  fi
  
 -# Be sure to have absolute paths.
@@ -2124,7 +1195,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +if test -n "$ac_unrecognized_opts"; then
 +  case $enable_option_checking in
 +    no) ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
 +    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
 -done
@@ -2155,29 +1226,31 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    [\\/$]* | ?:[\\/]* )  continue;;
 +    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -689,7 +1148,7 @@
+@@ -689,8 +1157,8 @@
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
 -    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-     If a cross compiler is detected then cross compile mode will be used." >&2
+-    If a cross compiler is detected then cross compile mode will be used." >&2
++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used" >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
-@@ -702,94 +1161,72 @@
+   fi
+@@ -702,94 +1170,72 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
 +ac_ls_di=`ls -di .` &&
 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  as_fn_error "working directory cannot be determined"
++  as_fn_error $? "working directory cannot be determined"
 +test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  as_fn_error "pwd does not report name of working directory"
++  as_fn_error $? "pwd does not report name of working directory"
 +
 +
  # Find the source files, if location was not specified.
@@ -2295,11 +1368,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -ac_cv_env_GTHREAD_LIBS_value=$GTHREAD_LIBS
 +if test ! -r "$srcdir/$ac_unique_file"; then
 +  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 +fi
 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 +ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 +	pwd)`
 +# When building in place, set srcdir=.
 +if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2320,7 +1393,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  #
  # Report the --help message.
-@@ -818,14 +1255,11 @@
+@@ -812,20 +1258,17 @@
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
++  -q, --quiet, --silent   do not print \`checking ...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -2337,7 +1417,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -835,18 +1269,25 @@
+@@ -835,18 +1278,25 @@
  For better control, use the options below.
  
  Fine tuning of the installation directories:
@@ -2375,7 +1455,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  _ACEOF
  
    cat <<\_ACEOF
-@@ -863,6 +1304,7 @@
+@@ -863,6 +1313,7 @@
    cat <<\_ACEOF
  
  Optional Features:
@@ -2383,7 +1463,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --disable-libglib	use glib2 for multiprocessing support
-@@ -880,8 +1322,9 @@
+@@ -880,8 +1331,9 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -2395,7 +1475,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    CPP         C preprocessor
    PKG_CONFIG  path to pkg-config utility
    GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
-@@ -894,158 +1337,481 @@
+@@ -894,155 +1346,478 @@
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
  
@@ -2538,10 +1618,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.68
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@ -2555,9 +1635,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -
 -It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
--
--  $ $0 $@
  
+-  $ $0 $@
+-
 -_ACEOF
 +## ------------------------ ##
 +## Autoconf initialization. ##
@@ -2572,15 +1652,6 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -## --------- ##
 -## Platform. ##
 -## --------- ##
--
--hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
--uname -m = `(uname -m) 2>/dev/null || echo unknown`
--uname -r = `(uname -r) 2>/dev/null || echo unknown`
--uname -s = `(uname -s) 2>/dev/null || echo unknown`
--uname -v = `(uname -v) 2>/dev/null || echo unknown`
--
--/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
--/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  rm -f conftest.$ac_objext
 +  if { { ac_try="$ac_compile"
@@ -2607,6 +1678,20 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
++	ac_retval=1
++fi
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++  as_fn_set_status $ac_retval
+ 
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++} # ac_fn_c_try_compile
+ 
 -/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 -/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -2614,21 +1699,6 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 -/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 -/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-+	ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
- 
--_ASUNAME
-+} # ac_fn_c_try_compile
- 
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  echo "PATH: $as_dir"
--done
 +# ac_fn_c_try_cpp LINENO
 +# ----------------------
 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -2650,7 +1720,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then :
@@ -2659,15 +1729,22 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
--} >&5
+-_ASUNAME
 +    ac_retval=1
 +fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
  
--cat >&5 <<_ACEOF
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  echo "PATH: $as_dir"
+-done
 +} # ac_fn_c_try_cpp
  
+-} >&5
 +# ac_fn_c_try_run LINENO
 +# ----------------------
 +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -2702,11 +1779,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +       $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
--## ----------- ##
+-cat >&5 <<_ACEOF
 +       ac_retval=$ac_status
 +fi
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_run
@@ -2719,10 +1796,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +ac_fn_c_check_header_mongrel ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  if eval \${$3+:} false; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +fi
 +eval ac_res=\$$3
@@ -2758,7 +1835,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +else
 +  ac_header_preproc=no
 +fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
 +
@@ -2785,7 +1862,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +esac
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=\$ac_header_compiler"
@@ -2794,7 +1871,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_header_mongrel
 +
@@ -2807,7 +1884,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2825,7 +1902,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_header_compile
 +
@@ -2870,7 +1947,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  # interfere with the next link command; also delete a directory that is
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_link
@@ -2883,7 +1960,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2938,7 +2015,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_func
 +cat >config.log <<_ACEOF
@@ -2946,7 +2023,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +running configure, to aid debugging if configure makes a mistake.
 +
 +It was created by $as_me, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
 +
 +  $ $0 $@
 +
@@ -2989,13 +2066,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +} >&5
 +
 +cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
- ## Core tests. ##
- ## ----------- ##
  
-@@ -1060,7 +1826,6 @@
+ 
+ ## ----------- ##
+@@ -1060,7 +1835,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -3003,7 +2077,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1071,13 +1836,13 @@
+@@ -1071,13 +1845,13 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -3021,7 +2095,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1093,21 +1858,19 @@
+@@ -1093,104 +1867,115 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -3048,8 +2122,15 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1120,20 +1883,35 @@
- _ASBOX
+     echo
+ 
+-    cat <<\_ASBOX
+-## ---------------- ##
++    $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
      echo
      # The following way of writing the cache mishandles newlines in values,
 -{
@@ -3093,8 +2174,13 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +)
      echo
  
-     cat <<\_ASBOX
-@@ -1144,22 +1922,28 @@
+-    cat <<\_ASBOX
+-## ----------------- ##
++    $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
      echo
      for ac_var in $ac_subst_vars
      do
@@ -3109,14 +2195,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
      echo
  
      if test -n "$ac_subst_files"; then
-       cat <<\_ASBOX
+-      cat <<\_ASBOX
 -## ------------- ##
 -## Output files. ##
 -## ------------- ##
-+## ------------------- ##
+-_ASBOX
++      $as_echo "## ------------------- ##
 +## File substitutions. ##
-+## ------------------- ##
- _ASBOX
++## ------------------- ##"
        echo
        for ac_var in $ac_subst_files
        do
@@ -3130,9 +2216,15 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
        done | sort
        echo
      fi
-@@ -1171,26 +1955,26 @@
- ## ----------- ##
- _ASBOX
+ 
+     if test -s confdefs.h; then
+-      cat <<\_ASBOX
+-## ----------- ##
++      $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
        echo
 -      sed "/^$/d" confdefs.h | sort
 +      cat confdefs.h
@@ -3167,7 +2259,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  # Predefined preprocessor variables.
  
-@@ -1198,112 +1982,128 @@
+@@ -1198,112 +1983,137 @@
  #define PACKAGE_NAME "$PACKAGE_NAME"
  _ACEOF
  
@@ -3208,7 +2300,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +ac_site_file1=NONE
 +ac_site_file2=NONE
 +if test -n "$CONFIG_SITE"; then
-+  ac_site_file1=$CONFIG_SITE
++  # We do not want a PATH search for config.site.
++  case $CONFIG_SITE in #((
++    -*)  ac_site_file1=./$CONFIG_SITE;;
++    */*) ac_site_file1=$CONFIG_SITE;;
++    *)   ac_site_file1=./$CONFIG_SITE;;
++  esac
 +elif test "x$prefix" != xNONE; then
 +  ac_site_file1=$prefix/share/config.site
 +  ac_site_file2=$prefix/etc/config.site
@@ -3227,7 +2324,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
+-    . "$ac_site_file"
++    . "$ac_site_file" \
++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5; }
    fi
  done
  
@@ -3336,7 +2438,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 +fi
 +## -------------------- ##
 +## Main body of script. ##
@@ -3344,7 +2446,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -1313,122 +2113,131 @@
+@@ -1313,122 +2123,137 @@
  
  
  
@@ -3368,26 +2470,22 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  ac_aux_dir=
 -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
 -  if test -f $ac_dir/install-sh; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install-sh -c"
--    break
++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
++  if test -f "$ac_dir/install-sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
 -  elif test -f $ac_dir/install.sh; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install.sh -c"
--    break
++  elif test -f "$ac_dir/install.sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
 -  elif test -f $ac_dir/shtool; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/shtool install -c"
--    break
--  fi
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
++  elif test -f "$ac_dir/shtool"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
  done
  if test -z "$ac_aux_dir"; then
 -  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
@@ -3397,7 +2495,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 -ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 +fi
 +
 +# These three variables are undocumented and unsupported,
@@ -3432,30 +2530,30 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
 -   { (exit 1); exit 1; }; }
 +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 -echo "${ECHO_T}$ac_cv_build" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 +$as_echo_n "checking build system type... " >&6; }
-+if test "${ac_cv_build+set}" = set; then :
++if ${ac_cv_build+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_build_alias=$build_alias
 +test "x$ac_build_alias" = x &&
 +  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 +test "x$ac_build_alias" = x &&
-+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 +$as_echo "$ac_cv_build" >&6; }
 +case $ac_cv_build in
 +*-*-*) ;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 +esac
  build=$ac_cv_build
 -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -3490,14 +2588,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 +$as_echo_n "checking host system type... " >&6; }
-+if test "${ac_cv_host+set}" = set; then :
++if ${ac_cv_host+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test "x$host_alias" = x; then
 +  ac_cv_host=$ac_cv_build
 +else
 +  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 +fi
  
  fi
@@ -3507,7 +2605,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +$as_echo "$ac_cv_host" >&6; }
 +case $ac_cv_host in
 +*-*-*) ;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 +esac
  host=$ac_cv_host
 -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -3542,14 +2640,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 +$as_echo_n "checking target system type... " >&6; }
-+if test "${ac_cv_target+set}" = set; then :
++if ${ac_cv_target+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test "x$target_alias" = x; then
 +  ac_cv_target=$ac_cv_host
 +else
 +  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 +fi
  
  fi
@@ -3559,7 +2657,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +$as_echo "$ac_cv_target" >&6; }
 +case $ac_cv_target in
 +*-*-*) ;;
-+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 +esac
  target=$ac_cv_target
 -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -3579,7 +2677,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1438,7 +2247,8 @@
+@@ -1438,7 +2263,8 @@
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  
@@ -3589,7 +2687,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  
  if test "$prefix" = "NONE" ; then
-@@ -1457,10 +2267,10 @@
+@@ -1457,10 +2283,10 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -3599,12 +2697,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1470,35 +2280,37 @@
+@@ -1470,35 +2296,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3649,12 +2747,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1508,39 +2320,50 @@
+@@ -1508,39 +2336,50 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3715,12 +2813,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1550,77 +2373,37 @@
+@@ -1550,77 +2389,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3807,12 +2905,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1631,18 +2414,19 @@
+@@ -1631,18 +2430,19 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3836,7 +2934,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1660,24 +2444,25 @@
+@@ -1660,24 +2460,25 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -3866,12 +2964,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -1687,39 +2472,41 @@
+@@ -1687,39 +2488,41 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3921,12 +3019,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -1729,66 +2516,78 @@
+@@ -1729,66 +2532,78 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3987,8 +3085,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -   { (exit 1); exit 1; }; }
 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
  
  # Provide some information about the compiler.
 -echo "$as_me:$LINENO:" \
@@ -4041,7 +3139,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  
  int
-@@ -1800,112 +2599,109 @@
+@@ -1800,112 +2615,108 @@
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
@@ -4134,30 +3232,29 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  	break;;
    esac
  done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
+-else
 -  echo "$as_me: failed program was:" >&5
-+  ac_file=''
-+fi
-+if test -z "$ac_file"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++test "$ac_cv_exeext" = no && ac_cv_exeext=
  
 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: C compiler cannot create executables
 -See \`config.log' for more details." >&2;}
 -   { (exit 77); exit 77; }; }
--fi
--
++else
++  ac_file=''
+ fi
++if test -z "$ac_file"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
@@ -4169,7 +3266,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_file" >&5
 -echo "${ECHO_T}$ac_file" >&6
--
+ 
 -# Check the compiler produces executables we can run.  If not, either
 -# the compiler is broken, or we cross compile.
 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -4200,7 +3297,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -fi
 -echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
- 
+-
 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
@@ -4233,7 +3330,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -1913,38 +2709,90 @@
+@@ -1913,38 +2724,90 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -4258,8 +3355,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -echo "${ECHO_T}$ac_cv_exeext" >&6
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +rm -f conftest conftest$ac_cv_exeext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4325,9 +3422,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    else
 +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
 +If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
 +    fi
 +  fi
 +fi
@@ -4338,14 +3435,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +ac_clean_files=$ac_clean_files_save
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 +$as_echo_n "checking for suffix of object files... " >&6; }
-+if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -1956,45 +2804,46 @@
+@@ -1956,45 +2819,46 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -4387,8 +3484,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -   { (exit 1); exit 1; }; }
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5; }
  fi
 -
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -4405,7 +3502,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -4417,7 +3514,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  
  int
-@@ -2008,54 +2857,34 @@
+@@ -2008,54 +2872,34 @@
    return 0;
  }
  _ACEOF
@@ -4481,7 +3578,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4492,7 +3589,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  
  int
-@@ -2066,38 +2895,49 @@
+@@ -2066,38 +2910,49 @@
    return 0;
  }
  _ACEOF
@@ -4525,8 +3622,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  CFLAGS=""
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
--ac_cv_prog_cc_g=no
++
 +int
 +main ()
 +{
@@ -4546,7 +3642,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +int
 +main ()
 +{
-+
+ 
+-ac_cv_prog_cc_g=no
 +  ;
 +  return 0;
 +}
@@ -4555,21 +3652,21 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  ac_cv_prog_cc_g=yes
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 +$as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2113,18 +2953,14 @@
+@@ -2113,18 +2968,14 @@
      CFLAGS=
    fi
  fi
@@ -4579,7 +3676,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  ac_cv_prog_cc_stdc=no
@@ -4594,7 +3691,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -2152,12 +2988,17 @@
+@@ -2152,12 +3003,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -4614,7 +3711,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2172,201 +3013,37 @@
+@@ -2172,201 +3028,37 @@
    return 0;
  }
  _ACEOF
@@ -4835,7 +3932,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2376,10 +3053,10 @@
+@@ -2376,10 +3068,10 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -4845,12 +3942,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -2389,35 +3066,37 @@
+@@ -2389,35 +3081,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4895,12 +3992,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -2427,28 +3106,38 @@
+@@ -2427,28 +3121,38 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4949,7 +4046,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -2466,22 +3155,23 @@
+@@ -2466,22 +3170,23 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -4961,7 +4058,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  if test -z "$INSTALL"; then
 -if test "${ac_cv_path_install+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4981,7 +4078,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2489,7 +3179,7 @@
+@@ -2489,7 +3194,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4990,7 +4087,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2499,30 +3189,43 @@
+@@ -2499,30 +3204,43 @@
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
@@ -5042,7 +4139,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2539,15 +3242,15 @@
+@@ -2539,15 +3257,15 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5057,12 +4154,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  if test -z "$CPP"; then
 -  if test "${ac_cv_prog_CPP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -2561,11 +3264,7 @@
+@@ -2561,11 +3279,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -5075,7 +4172,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -2574,68 +3273,24 @@
+@@ -2574,78 +3288,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5107,7 +4204,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    # Broken: fails on valid input.
  continue
  fi
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
  
 -  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
@@ -5149,16 +4247,20 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    # Passes both tests.
  ac_preproc_ok=:
  break
-@@ -2645,7 +3300,7 @@
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
 -if $ac_preproc_ok; then
++rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
    break
  fi
  
-@@ -2657,8 +3312,8 @@
+@@ -2657,8 +3327,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -5169,7 +4271,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -2668,11 +3323,7 @@
+@@ -2668,11 +3338,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -5182,7 +4284,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -2681,68 +3332,24 @@
+@@ -2681,85 +3347,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5214,7 +4316,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    # Broken: fails on valid input.
  continue
  fi
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
  
 -  # OK, works on sane cases.  Now check whether non-existent headers
 +  # OK, works on sane cases.  Now check whether nonexistent headers
@@ -5256,12 +4359,16 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    # Passes both tests.
  ac_preproc_ok=:
  break
-@@ -2752,14 +3359,13 @@
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
 -if $ac_preproc_ok; then
 -  :
++rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +
  else
@@ -5272,12 +4379,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -   { (exit 1); exit 1; }; }
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
  fi
  
  ac_ext=c
-@@ -2769,31 +3375,142 @@
+@@ -2769,31 +3390,142 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -5291,7 +4398,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -    else ac_cv_prog_egrep='egrep'
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$GREP"; then
@@ -5340,16 +4447,16 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_GREP"; then
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
 +  fi
 +else
 +  ac_cv_path_GREP=$GREP
-+fi
-+
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6
 - EGREP=$ac_cv_prog_egrep
++
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 +$as_echo "$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
@@ -5361,7 +4468,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 +$as_echo_n "checking for egrep... " >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -5418,7 +4525,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_EGREP"; then
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
 +  fi
 +else
 +  ac_cv_path_EGREP=$EGREP
@@ -5433,14 +4540,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 +$as_echo_n "checking for ANSI C header files... " >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -2808,50 +3525,23 @@
+@@ -2808,50 +3540,23 @@
    return 0;
  }
  _ACEOF
@@ -5497,7 +4604,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  else
    ac_cv_header_stdc=no
  fi
-@@ -2861,18 +3551,14 @@
+@@ -2861,18 +3566,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -5519,7 +4626,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  else
    ac_cv_header_stdc=no
  fi
-@@ -2882,16 +3568,13 @@
+@@ -2882,16 +3583,13 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -5539,7 +4646,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -2911,108 +3594,40 @@
+@@ -2911,108 +3609,39 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -5658,15 +4765,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 +"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
-@@ -3020,151 +3635,14 @@
+@@ -3020,151 +3649,13 @@
  done
  
  
@@ -5816,15 +4922,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
  fi
-@@ -3172,16 +3650,12 @@
+@@ -3172,16 +3663,12 @@
  done
  
  
@@ -5834,7 +4939,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-+if test "${ac_cv_c_const+set}" = set; then :
++if ${ac_cv_c_const+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -5846,7 +4951,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  
  int
-@@ -3191,10 +3665,10 @@
+@@ -3191,10 +3678,10 @@
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -5860,7 +4965,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -3203,16 +3677,17 @@
+@@ -3203,16 +3690,17 @@
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -5882,7 +4987,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -3231,65 +3706,38 @@
+@@ -3231,65 +3719,38 @@
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -5947,7 +5052,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 +$as_echo_n "checking for inline... " >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then :
++if ${ac_cv_c_inline+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    ac_cv_c_inline=no
@@ -5961,7 +5066,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #ifndef __cplusplus
  typedef int foo_t;
-@@ -3298,40 +3746,16 @@
+@@ -3298,40 +3759,16 @@
  #endif
  
  _ACEOF
@@ -6008,7 +5113,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  case $ac_cv_c_inline in
    inline | yes) ;;
-@@ -3348,16 +3772,12 @@
+@@ -3348,16 +3785,12 @@
      ;;
  esac
  
@@ -6018,7 +5123,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-+if test "${ac_cv_header_time+set}" = set; then :
++if ${ac_cv_header_time+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -6030,7 +5135,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -3372,441 +3792,295 @@
+@@ -3372,519 +3805,300 @@
    return 0;
  }
  _ACEOF
@@ -6086,7 +5191,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-+if test "${ac_cv_c_bigendian+set}" = set; then :
++if ${ac_cv_c_bigendian+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  # See if sys/param.h defines the BYTE_ORDER macro.
@@ -6235,38 +5340,23 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    fi
-+    if test $ac_cv_c_bigendian = unknown; then
-+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <limits.h>
- 
+-
 -# It does not; compile a test program.
 -if test "$cross_compiling" = yes; then
 -  # try to guess the endianness by grepping values into an object file
 -  ac_cv_c_bigendian=unknown
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+int
-+main ()
-+{
-+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-+	      bogus endian macros
-+	     #endif
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  # It does; now see whether it defined to _BIG_ENDIAN or not.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
@@ -6280,9 +5370,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  main ()
  {
 - _ascii (); _ebcdic ();
-+#ifndef _BIG_ENDIAN
-+		 not big endian
-+		#endif
++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
++	      bogus endian macros
++	     #endif
 +
    ;
    return 0;
@@ -6310,8 +5400,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_c_bigendian=yes
+-  ac_cv_c_bigendian=yes
 -fi
 -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
 -  if test "$ac_cv_c_bigendian" = unknown; then
@@ -6321,12 +5410,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -    ac_cv_c_bigendian=unknown
 -  fi
 -fi
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+  ac_cv_c_bigendian=no
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -6334,31 +5422,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    fi
-+    if test $ac_cv_c_bigendian = unknown; then
-+      # Compile a test program.
-+      if test "$cross_compiling" = yes; then :
-+  # Try to guess by grepping values from an object file.
++if ac_fn_c_try_compile "$LINENO"; then :
++  # It does; now see whether it defined to _BIG_ENDIAN or not.
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-+short int ascii_mm[] =
-+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+		short int ascii_ii[] =
-+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+		int use_ascii (int i) {
-+		  return ascii_mm[i] + ascii_ii[i];
-+		}
-+		short int ebcdic_ii[] =
-+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+		short int ebcdic_mm[] =
-+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+		int use_ebcdic (int i) {
-+		  return ebcdic_mm[i] + ebcdic_ii[i];
-+		}
-+		extern int foo;
++#include <limits.h>
 +
  int
  main ()
@@ -6371,7 +5439,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  } u;
 -  u.l = 1;
 -  exit (u.c[sizeof (long) - 1] == 1);
-+return use_ascii (foo) == use_ebcdic (foo);
++#ifndef _BIG_ENDIAN
++		 not big endian
++		#endif
++
 +  ;
 +  return 0;
  }
@@ -6388,7 +5459,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_c_bigendian=no
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_bigendian=yes
+ else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -6397,22 +5470,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -ac_cv_c_bigendian=yes
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-+	      ac_cv_c_bigendian=yes
-+	    fi
-+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+	      if test "$ac_cv_c_bigendian" = unknown; then
-+		ac_cv_c_bigendian=no
-+	      else
-+		# finding both strings is unlikely to happen, but who knows?
-+		ac_cv_c_bigendian=unknown
-+	      fi
-+	    fi
- fi
 -fi
++  ac_cv_c_bigendian=no
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 -case $ac_cv_c_bigendian in
@@ -6442,14 +5505,19 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_var+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # Compile a test program.
++      if test "$cross_compiling" = yes; then :
++  # Try to guess by grepping values from an object file.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
@@ -6487,22 +5555,27 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -#ifdef __cplusplus
 -}
 -#endif
--
-+$ac_includes_default
++short int ascii_mm[] =
++		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++		short int ascii_ii[] =
++		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++		int use_ascii (int i) {
++		  return ascii_mm[i] + ascii_ii[i];
++		}
++		short int ebcdic_ii[] =
++		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++		short int ebcdic_mm[] =
++		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++		int use_ebcdic (int i) {
++		  return ebcdic_mm[i] + ebcdic_ii[i];
++		}
++		extern int foo;
+ 
  int
  main ()
  {
 -return f != $ac_func;
-+
-+	     /* Are we little or big endian?  From Harbison&Steele.  */
-+	     union
-+	     {
-+	       long int l;
-+	       char c[sizeof (long int)];
-+	     } u;
-+	     u.l = 1;
-+	     return u.c[sizeof (long int) - 1] == 1;
-+
++return use_ascii (foo) == use_ebcdic (foo);
    ;
    return 0;
  }
@@ -6529,93 +5602,76 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_c_bigendian=no
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -eval "$as_ac_var=no"
-+  ac_cv_c_bigendian=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
-+
-+    fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 -if test `eval echo '${'$as_ac_var'}'` = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-+$as_echo "$ac_cv_c_bigendian" >&6; }
-+ case $ac_cv_c_bigendian in #(
-+   yes)
-+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-+;; #(
-+   no)
-+      ;; #(
-+   universal)
-+
-+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-+
-+     ;; #(
-+   *)
-+     as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-+ esac
-+
-+
-+CFLAGS="$CFLAGS -D_BSD_SOURCE"
-+for ac_func in gettimeofday
-+do :
-+  ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-+if test "x$ac_cv_func_gettimeofday" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETTIMEOFDAY 1
- _ACEOF
- 
+-_ACEOF
+-
++if ac_fn_c_try_compile "$LINENO"; then :
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
++	      ac_cv_c_bigendian=yes
++	    fi
++	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++	      if test "$ac_cv_c_bigendian" = unknown; then
++		ac_cv_c_bigendian=no
++	      else
++		# finding both strings is unlikely to happen, but who knows?
++		ac_cv_c_bigendian=unknown
++	      fi
++	    fi
  fi
- done
- 
+-done
+-
 -
 -echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 -if test "${ac_cv_lib_socket_socket+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-+$as_echo_n "checking for socket in -lsocket... " >&6; }
-+if test "${ac_cv_lib_socket_socket+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
- char socket ();
+-char socket ();
++$ac_includes_default
  int
  main ()
  {
 -socket ();
-+return socket ();
++
++	     /* Are we little or big endian?  From Harbison&Steele.  */
++	     union
++	     {
++	       long int l;
++	       char c[sizeof (long int)];
++	     } u;
++	     u.l = 1;
++	     return u.c[sizeof (long int) - 1] == 1;
++
    ;
    return 0;
  }
@@ -6641,51 +5697,80 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_socket_socket=yes
+-  ac_cv_lib_socket_socket=yes
++if ac_fn_c_try_run "$LINENO"; then :
++  ac_cv_c_bigendian=no
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -ac_cv_lib_socket_socket=no
-+  ac_cv_lib_socket_socket=no
++  ac_cv_c_bigendian=yes
  fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
+-LIBS=$ac_check_lib_save_LIBS
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++    fi
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 -if test $ac_cv_lib_socket_socket = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-+$as_echo "$ac_cv_lib_socket_socket" >&6; }
-+if test "x$ac_cv_lib_socket_socket" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
++$as_echo "$ac_cv_c_bigendian" >&6; }
++ case $ac_cv_c_bigendian in #(
++   yes)
++     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
++;; #(
++   no)
++      ;; #(
++   universal)
++
++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
++
++     ;; #(
++   *)
++     as_fn_error $? "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ esac
++
++
++CFLAGS="$CFLAGS -D_BSD_SOURCE"
++for ac_func in gettimeofday
++do :
++  ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
++if test "x$ac_cv_func_gettimeofday" = xyes; then :
    cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSOCKET 1
+-#define HAVE_LIBSOCKET 1
++#define HAVE_GETTIMEOFDAY 1
  _ACEOF
-@@ -3815,71 +4089,43 @@
  
+-  LIBS="-lsocket $LIBS"
+-
  fi
++done
  
 -
 -echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
++$as_echo_n "checking for socket in -lsocket... " >&6; }
++if ${ac_cv_lib_socket_socket+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
+-LIBS="-lnsl  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lsocket  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -6698,12 +5783,13 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  #endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
+-char gethostbyname ();
++char socket ();
  int
  main ()
  {
 -gethostbyname ();
-+return gethostbyname ();
++return socket ();
    ;
    return 0;
  }
@@ -6729,14 +5815,15 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
+-  ac_cv_lib_nsl_gethostbyname=yes
 +if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_nsl_gethostbyname=yes
++  ac_cv_lib_socket_socket=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -ac_cv_lib_nsl_gethostbyname=no
-+  ac_cv_lib_nsl_gethostbyname=no
++  ac_cv_lib_socket_socket=no
  fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -6747,13 +5834,20 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 -if test $ac_cv_lib_nsl_gethostbyname = yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
++$as_echo "$ac_cv_lib_socket_socket" >&6; }
++if test "x$ac_cv_lib_socket_socket" = xyes; then :
    cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNSL 1
+-#define HAVE_LIBNSL 1
++#define HAVE_LIBSOCKET 1
  _ACEOF
-@@ -3899,35 +4145,30 @@
+ 
+-  LIBS="-lnsl $LIBS"
++  LIBS="-lsocket $LIBS"
+ 
+ fi
+ 
+@@ -3899,35 +4113,30 @@
  esac
  if test $ac_cv_lbl_unaligned_fail = yes ; then
  
@@ -6788,20 +5882,22 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
 +     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
 +$as_echo "$withval" >&6; }
-+     if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.a; then
++     if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.so; then
          owd=`pwd`
          if cd $withval; then withval=`pwd`; cd $owd; fi
- 	PCAP_CFLAGS="-I$withval -I$withval/bpf"
- 	PCAPLIB="-L$withval -lpcap"
+-	PCAP_CFLAGS="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
++	PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf"
++	PCAPLIB="-L$withval/lib -lpcap"
       else
 -        { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5
 -echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;}
 -   { (exit 1); exit 1; }; }
-+        as_fn_error "pcap.h or libpcap.a not found in $withval" "$LINENO" 5
++        as_fn_error $? "pcap.h or libpcap.so not found in $withval" "$LINENO" 5
       fi
       ;;
    esac
-@@ -3941,11 +4182,7 @@
+@@ -3941,11 +4150,7 @@
    else
  	TMP=$LIBS
  	LIBS="-lpcap $LIBS"
@@ -6814,7 +5910,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <pcap.h>
  int
-@@ -3956,58 +4193,33 @@
+@@ -3956,58 +4161,33 @@
    return 0;
  }
  _ACEOF
@@ -6859,7 +5955,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -		{ { echo "$as_me:$LINENO: error: libpcap not found" >&5
 -echo "$as_me: error: libpcap not found" >&2;}
 -   { (exit 1); exit 1; }; }
-+		as_fn_error "libpcap not found" "$LINENO" 5
++		as_fn_error $? "libpcap not found" "$LINENO" 5
  	fi
    fi
 -  echo "$as_me:$LINENO: result: yes" >&5
@@ -6886,7 +5982,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  else
  
-@@ -4017,10 +4229,10 @@
+@@ -4017,10 +4197,10 @@
  	if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -6896,12 +5992,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-@@ -4032,37 +4244,38 @@
+@@ -4032,37 +4212,38 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6948,12 +6044,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
    [\\/]* | ?:[\\/]*)
-@@ -4074,278 +4287,274 @@
+@@ -4074,29 +4255,39 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6989,7 +6085,6 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  fi
  
 -  PKG_CONFIG=$ac_pt_PKG_CONFIG
--else
 +  if test "x$ac_pt_PKG_CONFIG" = x; then
 +    PKG_CONFIG=""
 +  else
@@ -7001,10 +6096,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +esac
 +    PKG_CONFIG=$ac_pt_PKG_CONFIG
 +  fi
-+else
+ else
    PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
  fi
- 
+@@ -4104,30 +4295,30 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -7034,9 +6129,6 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +$as_echo_n "checking for GLIB... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-+    if test -n "$GLIB_CFLAGS"; then
-+        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-+    else
          if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.2.0\"") >&5
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.2.0\""; } >&5
@@ -7049,15 +6141,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.2.0" 2>/dev/null`
  else
    pkg_failed=yes
- fi
-+    fi
- else
- 	pkg_failed=untried
+@@ -4137,11 +4328,11 @@
  fi
  if test -n "$PKG_CONFIG"; then
-+    if test -n "$GLIB_LIBS"; then
-+        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-+    else
          if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.2.0\"") >&5
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.2.0\""; } >&5
@@ -7070,74 +6156,44 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.2.0" 2>/dev/null`
  else
    pkg_failed=yes
- fi
-+    fi
- else
- 	pkg_failed=untried
- fi
- 
-+
-+
- if test $pkg_failed = yes; then
--	GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.2.0"`
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.2.0"`
-+        else
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.2.0"`
-+        fi
+@@ -4155,23 +4346,17 @@
  	# Put the nasty error message in config.log where it belongs
--	echo "$GLIB_PKG_ERRORS" 1>&5
-+	echo "$GLIB_PKG_ERRORS" >&5
+ 	echo "$GLIB_PKG_ERRORS" 1>&5
  
 -	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.2.0) were not met.
 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
 -installed software in a non-standard prefix.
-+	as_fn_error "Package requirements (glib-2.0 >= 2.2.0) were not met:
-+
-+$GLIB_PKG_ERRORS
- 
+-
 -Alternatively you may set the GLIB_CFLAGS and GLIB_LIBS environment variables
 -to avoid the need to call pkg-config.  See the pkg-config man page for
 -more details." >&5
 -echo "$as_me: error: Package requirements (glib-2.0 >= 2.2.0) were not met.
++	as_fn_error $? "Package requirements (glib-2.0 >= 2.2.0) were not met.
  Consider adjusting the PKG_CONFIG_PATH environment variable if you
  installed software in a non-standard prefix.
  
--Alternatively you may set the GLIB_CFLAGS and GLIB_LIBS environment variables
--to avoid the need to call pkg-config.  See the pkg-config man page for
+ Alternatively you may set the GLIB_CFLAGS and GLIB_LIBS environment variables
+ to avoid the need to call pkg-config.  See the pkg-config man page for
 -more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+Alternatively, you may set the environment variables GLIB_CFLAGS
-+and GLIB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" "$LINENO" 5
++more details." "$LINENO" 5
  elif test $pkg_failed = untried; then
 -	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
 +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
--Alternatively you may set the GLIB_CFLAGS and GLIB_LIBS environment variables
--to avoid the need to call pkg-config.  See the pkg-config man page for
--more details.
--
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+@@ -4180,36 +4365,25 @@
+ more details.
+ 
+ To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 -is in your PATH or set the PKG_CONFIG environment variable to the full
 -path to pkg-config.
-+Alternatively, you may set the environment variables GLIB_CFLAGS
-+and GLIB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
- 
+-
 -Alternatively you may set the GLIB_CFLAGS and GLIB_LIBS environment variables
 -to avoid the need to call pkg-config.  See the pkg-config man page for
 -more details.
@@ -7145,8 +6201,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
  else
  	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
  	GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -7163,9 +6218,6 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +$as_echo_n "checking for GTHREAD... " >&6; }
  
  if test -n "$PKG_CONFIG"; then
-+    if test -n "$GTHREAD_CFLAGS"; then
-+        pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
-+    else
          if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.2.0\"") >&5
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.2.0\""; } >&5
@@ -7178,15 +6230,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.2.0" 2>/dev/null`
  else
    pkg_failed=yes
- fi
-+    fi
- else
- 	pkg_failed=untried
+@@ -4219,11 +4393,11 @@
  fi
  if test -n "$PKG_CONFIG"; then
-+    if test -n "$GTHREAD_LIBS"; then
-+        pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
-+    else
          if test -n "$PKG_CONFIG" && \
 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.2.0\"") >&5
 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.2.0\""; } >&5
@@ -7199,74 +6245,44 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.2.0" 2>/dev/null`
  else
    pkg_failed=yes
- fi
-+    fi
- else
- 	pkg_failed=untried
- fi
- 
-+
-+
- if test $pkg_failed = yes; then
--	GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 >= 2.2.0"`
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 >= 2.2.0"`
-+        else
-+	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 >= 2.2.0"`
-+        fi
+@@ -4237,23 +4411,17 @@
  	# Put the nasty error message in config.log where it belongs
--	echo "$GTHREAD_PKG_ERRORS" 1>&5
-+	echo "$GTHREAD_PKG_ERRORS" >&5
+ 	echo "$GTHREAD_PKG_ERRORS" 1>&5
  
 -	{ { echo "$as_me:$LINENO: error: Package requirements (gthread-2.0 >= 2.2.0) were not met.
 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
 -installed software in a non-standard prefix.
-+	as_fn_error "Package requirements (gthread-2.0 >= 2.2.0) were not met:
-+
-+$GTHREAD_PKG_ERRORS
- 
+-
 -Alternatively you may set the GTHREAD_CFLAGS and GTHREAD_LIBS environment variables
 -to avoid the need to call pkg-config.  See the pkg-config man page for
 -more details." >&5
 -echo "$as_me: error: Package requirements (gthread-2.0 >= 2.2.0) were not met.
++	as_fn_error $? "Package requirements (gthread-2.0 >= 2.2.0) were not met.
  Consider adjusting the PKG_CONFIG_PATH environment variable if you
  installed software in a non-standard prefix.
  
--Alternatively you may set the GTHREAD_CFLAGS and GTHREAD_LIBS environment variables
--to avoid the need to call pkg-config.  See the pkg-config man page for
+ Alternatively you may set the GTHREAD_CFLAGS and GTHREAD_LIBS environment variables
+ to avoid the need to call pkg-config.  See the pkg-config man page for
 -more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+Alternatively, you may set the environment variables GTHREAD_CFLAGS
-+and GTHREAD_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" "$LINENO" 5
++more details." "$LINENO" 5
  elif test $pkg_failed = untried; then
 -	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
 +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
--Alternatively you may set the GTHREAD_CFLAGS and GTHREAD_LIBS environment variables
--to avoid the need to call pkg-config.  See the pkg-config man page for
--more details.
--
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+@@ -4262,90 +4430,51 @@
+ more details.
+ 
+ To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 -is in your PATH or set the PKG_CONFIG environment variable to the full
 -path to pkg-config.
-+Alternatively, you may set the environment variables GTHREAD_CFLAGS
-+and GTHREAD_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
- 
+-
 -Alternatively you may set the GTHREAD_CFLAGS and GTHREAD_LIBS environment variables
 -to avoid the need to call pkg-config.  See the pkg-config man page for
 -more details.
@@ -7274,8 +6290,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
  else
  	GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
  	GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
@@ -7292,7 +6307,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for g_thread_init in -lgthread-2.0" >&5
 +$as_echo_n "checking for g_thread_init in -lgthread-2.0... " >&6; }
-+if test "${ac_cv_lib_gthread_2_0_g_thread_init+set}" = set; then :
++if ${ac_cv_lib_gthread_2_0_g_thread_init+:} false; then :
 +  $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -7365,11 +6380,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -if test $ac_cv_lib_gthread_2_0_g_thread_init = yes; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gthread_2_0_g_thread_init" >&5
 +$as_echo "$ac_cv_lib_gthread_2_0_g_thread_init" >&6; }
-+if test "x$ac_cv_lib_gthread_2_0_g_thread_init" = x""yes; then :
++if test "x$ac_cv_lib_gthread_2_0_g_thread_init" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGTHREAD_2_0 1
  _ACEOF
-@@ -4358,47 +4567,45 @@
+@@ -4358,47 +4487,45 @@
  fi
  
  
@@ -7405,19 +6420,19 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -        { { echo "$as_me:$LINENO: error: no arguments expected for --disable-libnet" >&5
 -echo "$as_me: error: no arguments expected for --disable-libnet" >&2;}
 -   { (exit 1); exit 1; }; }
-+        as_fn_error "no arguments expected for --disable-libnet" "$LINENO" 5
++        as_fn_error $? "no arguments expected for --disable-libnet" "$LINENO" 5
       ;;
    esac
  
 -fi;
 +fi
++
  
  
 -# Check whether --with-libnet or --without-libnet was given.
 -if test "${with_libnet+set}" = set; then
 -  withval="$with_libnet"
 -   case "$withval" in
-+
 +# Check whether --with-libnet was given.
 +if test "${with_libnet+set}" = set; then :
 +  withval=$with_libnet;  case "$withval" in
@@ -7438,14 +6453,14 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
       if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
          owd=`pwd`
          if cd $withval; then withval=`pwd`; cd $owd; fi
-@@ -4411,16 +4618,14 @@
+@@ -4411,16 +4538,14 @@
  	LNETLIB="-L$withval/src -lnet"
       else
  	echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall"
 -        { { echo "$as_me:$LINENO: error: libnet" >&5
 -echo "$as_me: error: libnet" >&2;}
 -   { (exit 1); exit 1; }; }
-+        as_fn_error "libnet" "$LINENO" 5
++        as_fn_error $? "libnet" "$LINENO" 5
       fi
       ;;
    esac
@@ -7458,7 +6473,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    else
  	if test -f ${prefix}/include/libnet.h -a ${exec_prefix}/lib/libnet.a ; then
  	     LNET_CFLAGS="-I${prefix}/include `${exec_prefix}/bin/libnet-config --defines 2>/dev/null`"
-@@ -4431,18 +4636,15 @@
+@@ -4431,18 +4556,15 @@
  	fi
    fi
  
@@ -7480,7 +6495,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <libnet.h>
  int
-@@ -4453,47 +4655,22 @@
+@@ -4453,47 +4575,22 @@
    return 0;
  }
  _ACEOF
@@ -7531,11 +6546,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -		{ { echo "$as_me:$LINENO: error: libnet" >&5
 -echo "$as_me: error: libnet" >&2;}
 -   { (exit 1); exit 1; }; }
-+		as_fn_error "libnet" "$LINENO" 5
++		as_fn_error $? "libnet" "$LINENO" 5
  	fi
  fi
  
-@@ -4501,41 +4678,35 @@
+@@ -4501,41 +4598,35 @@
  
  
  BUILD_SHARED=
@@ -7567,7 +6582,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -        { { echo "$as_me:$LINENO: error: no arguments expected for --enable-shared" >&5
 -echo "$as_me: error: no arguments expected for --enable-shared" >&2;}
 -   { (exit 1); exit 1; }; }
-+        as_fn_error "no arguments expected for --enable-shared" "$LINENO" 5
++        as_fn_error $? "no arguments expected for --enable-shared" "$LINENO" 5
       ;;
    esac
  else
@@ -7594,7 +6609,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <netinet/in.h>
-@@ -4549,48 +4720,21 @@
+@@ -4549,48 +4640,21 @@
    return 0;
  }
  _ACEOF
@@ -7653,7 +6668,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <netinet/in.h>
-@@ -4603,49 +4747,22 @@
+@@ -4603,49 +4667,22 @@
    return 0;
  }
  _ACEOF
@@ -7712,7 +6727,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <netinet/in.h>
-@@ -4658,51 +4775,24 @@
+@@ -4658,51 +4695,24 @@
    return 0;
  }
  _ACEOF
@@ -7773,7 +6788,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  /* end confdefs.h.  */
  #include <libnet.h>
  int
-@@ -4713,44 +4803,22 @@
+@@ -4713,44 +4723,22 @@
    return 0;
  }
  _ACEOF
@@ -7826,7 +6841,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -4769,39 +4837,59 @@
+@@ -4769,39 +4757,70 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -7889,14 +6904,26 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -if diff $cache_file confcache >/dev/null 2>&1; then :; else
 -  if test -w $cache_file; then
 -    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
 +     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 +     :end' >>confcache
 +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 +  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 +$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
    else
 -    echo "not updating unwritable cache $cache_file"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -7904,7 +6931,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
    fi
  fi
  rm -f confcache
-@@ -4810,32 +4898,18 @@
+@@ -4810,32 +4829,19 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -7927,6 +6954,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  ac_libobjs=
  ac_ltlibobjs=
++U=
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
 -  ac_i=`echo "$ac_i" |
@@ -7943,12 +6971,13 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -4843,12 +4917,15 @@
+@@ -4843,12 +4849,15 @@
  
  
  
+-: ${CONFIG_STATUS=./config.status}
 +
- : ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
 +ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -7962,7 +6991,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -4858,81 +4935,252 @@
+@@ -4858,81 +4867,253 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -8047,8 +7076,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  fi
 +  export as_echo_body
 +  as_echo='sh -c $as_echo_body as_echo'
- fi
- 
++fi
++
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  PATH_SEPARATOR=:
@@ -8056,11 +7085,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 +      PATH_SEPARATOR=';'
 +  }
-+fi
+ fi
+ 
  
 -# Work around bugs in pre-3.0 UWIN ksh.
 -$as_unset ENV MAIL MAILPATH
-+
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
@@ -8069,6 +7098,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +IFS=" ""	$as_nl"
 +
 +# Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
 +case $0 in #((
 +  *[\\/]* ) as_myself=$0 ;;
 +  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8127,19 +7157,19 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
 +as_fn_error ()
 +{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 +  fi
-+  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
 +  as_fn_exit $as_status
 +} # as_fn_error
 +
@@ -8259,7 +7289,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -4940,148 +5188,123 @@
+@@ -4940,148 +5121,123 @@
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -8427,7 +7457,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
 +
-+
+ 
 +# as_fn_mkdir_p
 +# -------------
 +# Create "$as_dir" as a directory, including parents if necessary.
@@ -8471,9 +7501,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +      test -d "$as_dir" && break
 +    done
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++
 +
- 
 +} # as_fn_mkdir_p
  if mkdir -p . 2>/dev/null; then
 -  as_mkdir_p=:
@@ -8509,7 +7539,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -5090,31 +5313,20 @@
+@@ -5090,31 +5246,20 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -8547,11 +7577,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +ac_log="
  This file was extended by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -5122,45 +5334,46 @@
+@@ -5122,45 +5267,46 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -8624,7 +7654,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  Configuration files:
  $config_files
-@@ -5168,84 +5381,84 @@
+@@ -5168,84 +5314,90 @@
  Configuration headers:
  $config_headers
  
@@ -8640,11 +7670,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  config.status
 -configured by $0, generated by GNU Autoconf 2.59,
 -  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.68,
 +  with options \\"\$ac_cs_config\\"
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
 -srcdir=$srcdir
@@ -8665,14 +7695,20 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  while test $# != 0
  do
    case $1 in
-   --*=*)
+-  --*=*)
 -    ac_option=`expr "x$1" : 'x\([^=]*\)='`
 -    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++  --*=?*)
 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
 +    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
      ac_shift=:
      ;;
 -  -*)
++  --*=)
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=
++    ac_shift=:
++    ;;
 +  *)
      ac_option=$1
      ac_optarg=$2
@@ -8713,6 +7749,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
 +    case $ac_optarg in
 +    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    '') as_fn_error $? "missing file argument" ;;
 +    esac
 +    as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
@@ -8726,7 +7763,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
      ac_need_defaults=false;;
 +  --he | --h)
 +    # Conflict between --help and --header
-+    as_fn_error "ambiguous option: \`$1'
++    as_fn_error $? "ambiguous option: \`$1'
 +Try \`$0 --help' for more information.";;
 +  --help | --hel | -h )
 +    $as_echo "$ac_cs_usage"; exit ;;
@@ -8740,7 +7777,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -echo "$as_me: error: unrecognized option: $1
 -Try \`$0 --help' for more information." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+  -*) as_fn_error "unrecognized option: \`$1'
++  -*) as_fn_error $? "unrecognized option: \`$1'
 +Try \`$0 --help' for more information." ;;
  
 -  *) ac_config_targets="$ac_config_targets $1" ;;
@@ -8749,7 +7786,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
    esac
    shift
-@@ -5259,33 +5472,47 @@
+@@ -5259,33 +5411,47 @@
  fi
  
  _ACEOF
@@ -8804,7 +7841,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 +    "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
 +
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    esac
  done
  
@@ -8812,7 +7849,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -5296,587 +5523,539 @@
+@@ -5296,587 +5462,550 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -8827,9 +7864,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  {
 -  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
 -  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+  tmp=
++  tmp= ac_tmp=
 +  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++  : "${ac_tmp:=$tmp}"
++  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 +' 0
 +  trap 'as_fn_exit 1' 1 2 13 15
  }
@@ -8838,8 +7876,9 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
  {
 -  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
 +  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
++  test -d "$tmp"
  }  ||
  {
 -  tmp=./confstat$$-$RANDOM
@@ -8847,7 +7886,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -} ||
 +  tmp=./conf$$-$RANDOM
 +  (umask 077 && mkdir "$tmp")
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
 +
 +# Set up the scripts for CONFIG_FILES section.
 +# No need to generate them if there are no CONFIG_FILES.
@@ -8864,34 +7904,32 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +fi
 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\r'
++  ac_cs_awk_cr='\\r'
 +else
 +  ac_cs_awk_cr=$ac_cr
 +fi
 +
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 +_ACEOF
 +
 +
- {
--   echo "$me: cannot create a temporary directory in ." >&2
--   { (exit 1); exit 1; }
++{
 +  echo "cat >conf$$subs.awk <<_ACEOF" &&
 +  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
 +  echo "_ACEOF"
 +} >conf$$subs.sh ||
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  . ./conf$$subs.sh ||
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 +
 +  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
 +  if test $ac_delim_n = $ac_delim_num; then
 +    break
 +  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 +  else
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 +  fi
@@ -8899,7 +7937,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +rm -f conf$$subs.sh
 +
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 +_ACEOF
 +sed -n '
 +h
@@ -8942,17 +7980,19 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +/^[^""]/{
 +  N
 +  s/\n//
- }
++}
 +' >>$CONFIG_STATUS || ac_write_fail=1
 +rm -f conf$$subs.awk
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 +  for (key in S) S_is_set[key] = 1
 +  FS = ""
- 
++
 +}
-+{
+ {
+-   echo "$me: cannot create a temporary directory in ." >&2
+-   { (exit 1); exit 1; }
 +  line = $ 0
 +  nfields = split(line, field, "@")
 +  substed = 0
@@ -8970,8 +8010,8 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  }
 +
 +  print line
-+}
-+
+ }
+ 
 +_ACAWK
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -8979,22 +8019,30 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 +else
 +  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  _ACEOF
  
 -cat >>$CONFIG_STATUS <<_ACEOF
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 +# trailing colons and then remove the whole line if VPATH becomes empty
 +# (actually we leave an empty line to preserve line numbers).
 +if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
++h
++s///
++s/^/:/
++s/[	 ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
 +s/:*$//
++x
++s/\(=[	 ]*\).*/\1/
++G
++s/\n//
 +s/^[^=]*=[	 ]*$//
 +}'
 +fi
@@ -9128,7 +8176,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +# No need to generate them if there are no CONFIG_HEADERS.
 +# This happens for instance with `./config.status Makefile'.
 +if test -n "$CONFIG_HEADERS"; then
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 +BEGIN {
 +_ACEOF
 +
@@ -9140,11 +8188,11 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +# handling of long lines.
 +ac_delim='%!_!# '
 +for ac_last_try in false false :; do
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
++  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_tt"; then
 +    break
 +  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
 +  else
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
@@ -9241,7 +8289,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 -  * )   ac_file_in=$ac_file.in ;;
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
++  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 +fi # test -n "$CONFIG_HEADERS"
 +
 +
@@ -9254,7 +8302,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
 +  :[FH]-) ac_tag=-:-;;
 +  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
@@ -9265,9 +8313,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +  shift
 +  ac_file=$1
 +  shift
- 
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++
 +  case $ac_mode in
 +  :L) ac_source=$1;;
 +  :[FH])
@@ -9275,7 +8321,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +    for ac_f
 +    do
 +      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
++      -) ac_f="$ac_tmp/stdin";;
 +      *) # Look for the file first in the build tree, then in the source tree
 +	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 +	 # because $ac_f cannot contain `:'.
@@ -9284,7 +8330,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +	   [\\/$]*) false;;
 +	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 +	   esac ||
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
 +      esac
 +      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 +      as_fn_append ac_file_inputs " '$ac_f'"
@@ -9308,10 +8354,12 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +       sed 's/[\\\\&|]/\\\\&/g'`;; #(
 +    *) ac_sed_conf_input=$configure_input;;
 +    esac
-+
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 +    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++    *:-:* | *:-) cat >"$ac_tmp/stdin" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
 +    esac
 +    ;;
 +  esac
@@ -9596,16 +8644,17 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 +s&@INSTALL@&$ac_INSTALL&;t t
 +$ac_datarootdir_hack
 +"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 +
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
++      "$ac_tmp/out"`; test -z "$ac_out"; } &&
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
++which seems to be undefined.  Please make sure it is defined" >&5
 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
++which seems to be undefined.  Please make sure it is defined" >&2;}
  
 -done
 -_ACEOF
@@ -9631,7 +8680,7 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -
 -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
 -  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  rm -f "$tmp/stdin"
++  rm -f "$ac_tmp/stdin"
    case $ac_file in
 -  - | *:- | *:-:* ) # input from stdin
 -	cat >$tmp/stdin
@@ -9782,10 +8831,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -  fi
 -  cat $tmp/in >>$tmp/config.h
 -  rm -f $tmp/in
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
 +  esac \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 + ;;
 +  :H)
 +  #
@@ -9797,10 +8846,10 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -echo "$as_me: $ac_file is unchanged" >&6;}
 +    {
 +      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++    } >"$ac_tmp/config.h" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 +$as_echo "$as_me: $ac_file is unchanged" >&6;}
      else
@@ -9844,15 +8893,15 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
 -      rm -f $ac_file
 -      mv $tmp/config.h $ac_file
 +      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
++      mv "$ac_tmp/config.h" "$ac_file" \
++	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
      fi
    else
 -    cat $tmp/config.h
 -    rm -f $tmp/config.h
 +    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+      || as_fn_error "could not create -" "$LINENO" 5
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++      || as_fn_error $? "could not create -" "$LINENO" 5
    fi
 -done
 -_ACEOF
@@ -9872,17 +8921,17 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  ac_clean_files=$ac_clean_files_save
  
 +test $ac_write_fail = 0 ||
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 +
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -5896,6 +6075,10 @@
+@@ -5896,6 +6025,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
 -  $ac_cs_success || { (exit 1); exit 1; }
-+  $ac_cs_success || as_fn_exit $?
++  $ac_cs_success || as_fn_exit 1
 +fi
 +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
@@ -9891,19 +8940,36 @@ diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
  
 diff -Nur libnids-1.23.orig/configure.in libnids-1.23/configure.in
 --- libnids-1.23.orig/configure.in	2006-05-01 19:14:51.000000000 +0200
-+++ libnids-1.23/configure.in	2010-02-18 22:19:04.660854657 +0100
-@@ -65,7 +65,7 @@
++++ libnids-1.23/configure.in	2011-03-11 21:07:15.000000000 +0100
+@@ -41,7 +41,6 @@
+ AC_CHECK_FUNCS(gettimeofday)
+ dnl XXX - Solaris sux.
+ AC_CHECK_LIB(socket, socket)
+-AC_CHECK_LIB(nsl, gethostbyname)
+ 
+ case "$target_cpu" in
+ 	alpha*|arm*|hp*|mips*|sparc*)
+@@ -65,13 +64,13 @@
       ;;
    *)
       AC_MSG_RESULT($withval)
 -     if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
-+     if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.a; then
++     if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.so; then
          owd=`pwd`
          if cd $withval; then withval=`pwd`; cd $owd; fi
- 	PCAP_CFLAGS="-I$withval -I$withval/bpf"
+-	PCAP_CFLAGS="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
++	PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf"
++	PCAPLIB="-L$withval/lib -lpcap"
+      else
+-        AC_ERROR(pcap.h or libpcap.a not found in $withval)
++        AC_ERROR(pcap.h or libpcap.so not found in $withval)
+      fi
+      ;;
+   esac ],
 diff -Nur libnids-1.23.orig/src/config.h.in libnids-1.23/src/config.h.in
 --- libnids-1.23.orig/src/config.h.in	2006-05-01 19:14:51.000000000 +0200
-+++ libnids-1.23/src/config.h.in	2010-02-18 22:19:12.812857022 +0100
++++ libnids-1.23/src/config.h.in	2011-03-11 21:07:25.000000000 +0100
 @@ -1,5 +1,8 @@
  /* src/config.h.in.  Generated from configure.in by autoheader.  */
  
@@ -9913,7 +8979,17 @@ diff -Nur libnids-1.23.orig/src/config.h.in libnids-1.23/src/config.h.in
  /* Define to 1 if you have the `gettimeofday' function. */
  #undef HAVE_GETTIMEOFDAY
  
-@@ -60,6 +63,9 @@
+@@ -9,9 +12,6 @@
+ /* Define to 1 if you have the `gthread-2.0' library (-lgthread-2.0). */
+ #undef HAVE_LIBGTHREAD_2_0
+ 
+-/* Define to 1 if you have the `nsl' library (-lnsl). */
+-#undef HAVE_LIBNSL
+-
+ /* Define to 1 if you have the `socket' library (-lsocket). */
+ #undef HAVE_LIBSOCKET
+ 
+@@ -60,6 +60,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
  
@@ -9923,7 +8999,7 @@ diff -Nur libnids-1.23.orig/src/config.h.in libnids-1.23/src/config.h.in
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-@@ -69,9 +75,17 @@
+@@ -69,9 +72,17 @@
  /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
  #undef TIME_WITH_SYS_TIME
  
@@ -9946,8 +9022,8 @@ diff -Nur libnids-1.23.orig/src/config.h.in libnids-1.23/src/config.h.in
  #undef const
 diff -Nur libnids-1.23.orig/src/config.h.in~ libnids-1.23/src/config.h.in~
 --- libnids-1.23.orig/src/config.h.in~	1970-01-01 01:00:00.000000000 +0100
-+++ libnids-1.23/src/config.h.in~	2010-02-18 22:18:55.584855934 +0100
-@@ -0,0 +1,97 @@
++++ libnids-1.23/src/config.h.in~	2011-03-11 21:03:58.000000000 +0100
+@@ -0,0 +1,94 @@
 +/* src/config.h.in.  Generated from configure.in by autoheader.  */
 +
 +/* Define if building universal (internal helper macro) */
@@ -9962,9 +9038,6 @@ diff -Nur libnids-1.23.orig/src/config.h.in~ libnids-1.23/src/config.h.in~
 +/* Define to 1 if you have the `gthread-2.0' library (-lgthread-2.0). */
 +#undef HAVE_LIBGTHREAD_2_0
 +
-+/* Define to 1 if you have the `nsl' library (-lnsl). */
-+#undef HAVE_LIBNSL
-+
 +/* Define to 1 if you have the `socket' library (-lsocket). */
 +#undef HAVE_LIBSOCKET
 +