make allmodconfig work for alix1c eglibc

many upstream package updates,
squid, php, asterisk, gnutls, nmap, sqlite, dhcp, git

20 files changed, 31277 insertions, 15311 deletions

diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index df76ac082..91e1efd11 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -23,7 +23,7 @@ endif
 
 $(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autotool gnu
 CONFIGURE_ENV+=		ac_libnet_have_pf_packet=yes \
 			ac_cv_libnet_endianess=${ENDIAN} \
 			ac_cv_lbl_unaligned_fail=no
diff --git a/package/libnet/patches/patch-Makefile b/package/libnet/patches/patch-Makefile
index 0d15f3a65..b61c0a255 100644
--- a/package/libnet/patches/patch-Makefile
+++ b/package/libnet/patches/patch-Makefile
@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/Makefile	1970-01-01 00:00:00.000000000 +0100
-+++ Libnet-1.0.2a/Makefile	2009-06-12 21:52:51.000000000 +0200
-@@ -0,0 +1,620 @@
++++ Libnet-1.0.2a/Makefile	2009-08-23 00:40:10.898406314 +0200
+@@ -0,0 +1,638 @@
 +# Makefile.in generated by automake 1.8.5 from Makefile.am.
 +# Makefile.  Generated from Makefile.in by configure.
 +
@@ -17,9 +17,9 @@
 +
 +
 +
-+srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+top_srcdir = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
-+VPATH = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a
++srcdir = .
++top_srcdir = .
++
 +pkgdatadir = $(datadir)/libnet
 +pkglibdir = $(libdir)/libnet
 +pkgincludedir = $(includedir)/libnet
@@ -37,7 +37,7 @@
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
-+build_triplet = x86_64-undermydesk-freebsd
++build_triplet = i686-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
 +target_triplet = i586-pc-linux-gnu
 +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -88,31 +88,35 @@
 +AMDEP_FALSE = 
 +AMDEP_TRUE = #
 +AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
++AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ar
 +AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoconf
 +AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run autoheader
 +AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run automake-1.8
 +AWK = gawk
 +BIN_PREFIX = /usr/bin/
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
++CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc
 +CCDEPMODE = depmode=none
 +CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -Wall
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
++CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-gcc -E
 +CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
-+ECHO = echo
++DSYMUTIL = 
++DUMPBIN = 
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
-+EGREP = grep -E
++EGREP = /bin/grep -E
 +EXEEXT = 
++FGREP = /bin/grep -F
++GREP = /bin/grep
 +INC_PREFIX = /usr/include/
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LD = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ld
 +LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
 +LIBNET_CONFIG_CFLAGS = 
 +LIBNET_CONFIG_DEFINES = -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H -DLIBNET_LIL_ENDIAN
@@ -121,14 +125,20 @@
 +LIBS = 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LIB_PREFIX = /usr/lib/
-+LL_INT_TYPE = 
-+LL_INT_TYPE_UC = 
++LIPO = 
++LL_INT_TYPE = sockpacket
++LL_INT_TYPE_UC = SOCKPACKET
 +LN = ln
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/missing --run makeinfo
 +MAN_PREFIX = /usr/share/man/man3/
++NM = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-nm
++NMEDIT = 
++OBJDUMP = i586-linux-objdump
 +OBJEXT = o
++OTOOL = 
++OTOOL64 = 
 +PACKAGE = libnet
 +PACKAGE_BUGREPORT = 
 +PACKAGE_NAME = 
@@ -136,43 +146,51 @@
 +PACKAGE_TARNAME = 
 +PACKAGE_VERSION = 
 +PATH_SEPARATOR = :
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
++RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-gnu-ranlib
++SED = /home/wbx/openadk/scripts/sed
 +SET_MAKE = 
-+SHELL = /usr/local/bin/bash
++SHELL = /bin/bash
 +STRIP = i586-linux-strip
 +VERSION = 1.0.2a
 +ac_ct_CC = 
-+ac_ct_RANLIB = 
-+ac_ct_STRIP = 
++ac_ct_DUMPBIN = 
 +am__fastdepCC_FALSE = 
 +am__fastdepCC_TRUE = #
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +bindir = ${exec_prefix}/bin
-+build = x86_64-undermydesk-freebsd
-+build_alias = amd64-undermydesk-freebsd
-+build_cpu = x86_64
-+build_os = freebsd
-+build_vendor = undermydesk
++build = i686-pc-linux-gnu
++build_alias = i686-pc-linux-gnu
++build_cpu = i686
++build_os = linux-gnu
++build_vendor = pc
 +datadir = /usr/share
++datarootdir = ${prefix}/share
++docdir = ${datarootdir}/doc/${PACKAGE}
++dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +host = i586-pc-linux-gnu
 +host_alias = i586-linux
 +host_cpu = i586
 +host_os = linux-gnu
 +host_vendor = pc
++htmldir = ${docdir}
 +includedir = ${prefix}/include
-+infodir = ${prefix}/info
++infodir = ${datarootdir}/info
 +install_sh = /home/wbx/openadk/build_i586/w-libnet-1.0.2a-7/Libnet-1.0.2a/install-sh
 +libdir = ${exec_prefix}/lib
 +libexecdir = /usr/sbin
++localedir = ${datarootdir}/locale
 +localstatedir = /var
++lt_ECHO = echo
 +mandir = /usr/share/man
-+mkdir_p = $(mkinstalldirs)
++mkdir_p = mkdir -p -- .
 +oldincludedir = /usr/include
++pdfdir = ${docdir}
 +prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
++program_transform_name = s&$$&&;s&^&&
++psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +sysconfdir = /etc
diff --git a/package/libnet/patches/patch-Makefile_in b/package/libnet/patches/patch-Makefile_in
index 85e31249d..8fd6b5bae 100644
--- a/package/libnet/patches/patch-Makefile_in
+++ b/package/libnet/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/Makefile.in	2001-02-05 18:51:41.000000000 +0100
-+++ Libnet-1.0.2a/Makefile.in	2009-06-12 21:48:27.000000000 +0200
-@@ -1,147 +1,620 @@
++++ Libnet-1.0.2a/Makefile.in	2009-08-23 00:39:58.705644309 +0200
+@@ -1,147 +1,638 @@
 -#
 -#   $Id: Makefile.in,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
 -#
@@ -172,17 +172,21 @@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
++DSYMUTIL = @DSYMUTIL@
++DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
++FGREP = @FGREP@
++GREP = @GREP@
 +INC_PREFIX = @INC_PREFIX@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@
 +LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@
@@ -191,6 +195,7 @@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIB_PREFIX = @LIB_PREFIX@
++LIPO = @LIPO@
 +LL_INT_TYPE = @LL_INT_TYPE@
 +LL_INT_TYPE_UC = @LL_INT_TYPE_UC@
 +LN = @LN@
@@ -198,7 +203,12 @@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAKEINFO = @MAKEINFO@
 +MAN_PREFIX = @MAN_PREFIX@
++NM = @NM@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
@@ -207,13 +217,13 @@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +RANLIB = @RANLIB@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
 +STRIP = @STRIP@
 +VERSION = @VERSION@
 +ac_ct_CC = @ac_ct_CC@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 +am__include = @am__include@
@@ -226,23 +236,31 @@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
++htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
++localedir = @localedir@
 +localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
++psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +sysconfdir = @sysconfdir@
diff --git a/package/libnet/patches/patch-aclocal_m4 b/package/libnet/patches/patch-aclocal_m4
index c221ea8dd..c1dda8d27 100644
--- a/package/libnet/patches/patch-aclocal_m4
+++ b/package/libnet/patches/patch-aclocal_m4
@@ -1,6 +1,6 @@
 --- Libnet-1.0.2a.orig/aclocal.m4	2001-01-07 21:49:29.000000000 +0100
-+++ Libnet-1.0.2a/aclocal.m4	2009-06-12 21:48:27.000000000 +0200
-@@ -1,358 +1,4525 @@
++++ Libnet-1.0.2a/aclocal.m4	2009-08-23 00:39:51.921223744 +0200
+@@ -1,358 +1,8868 @@
 -dnl aclocal.m4 generated automatically by aclocal 1.4
 +# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
  
@@ -29,429 +29,1095 @@
 -dnl Copyright (c) 1998, 1999, 2000 Mike D. Schiffman <mike@infonexus.com>
 -dnl All rights reserved.
 -dnl
-+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++#
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++# 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.
  
--dnl
--dnl Checks to see if this linux kernel has a working PF_PACKET
--dnl
--dnl usage:
--dnl
--dnl     AC_LIBNET_CHECK_PF_PACKET
--dnl
--dnl results:
--dnl
--dnl     HAVE_PF_PACKET (DEFINED)
-+# serial 46 AC_PROG_LIBTOOL
-+# Debian $Rev: 102 $
++m4_define([_LT_COPYING], [dnl
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008 Free Software Foundation, Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++#   This file is part of GNU Libtool.
++#
++# GNU Libtool is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
++#
++# GNU Libtool is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with GNU Libtool; see the file COPYING.  If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++])
++
++# serial 56 LT_INIT
++
 +
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++# LT_PREREQ(VERSION)
++# ------------------
++# Complain and exit if this libtool version is less that VERSION.
++m4_defun([LT_PREREQ],
++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
++       [m4_default([$3],
++		   [m4_fatal([Libtool version $1 or higher is required],
++		             63)])],
++       [$2])])
++
++
++# _LT_CHECK_BUILDDIR
++# ------------------
++# Complain if the absolute build directory name contains unusual characters
++m4_defun([_LT_CHECK_BUILDDIR],
++[case `pwd` in
++  *\ * | *\	*)
++    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
++esac
++])
++
++
++# LT_INIT([OPTIONS])
++# ------------------
++AC_DEFUN([LT_INIT],
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++AC_BEFORE([$0], [LT_LANG])dnl
++AC_BEFORE([$0], [LT_OUTPUT])dnl
++AC_BEFORE([$0], [LTDL_INIT])dnl
++m4_require([_LT_CHECK_BUILDDIR])dnl
++
++dnl Autoconf doesn't catch unexpanded LT_ macros by default:
++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
++dnl unless we require an AC_DEFUNed macro:
++AC_REQUIRE([LTOPTIONS_VERSION])dnl
++AC_REQUIRE([LTSUGAR_VERSION])dnl
++AC_REQUIRE([LTVERSION_VERSION])dnl
++AC_REQUIRE([LTOBSOLETE_VERSION])dnl
++m4_require([_LT_PROG_LTMAIN])dnl
++
++dnl Parse OPTIONS
++_LT_SET_OPTIONS([$0], [$1])
 +
 +# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ltmain"
 +
 +# Always use our own libtool.
 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +AC_SUBST(LIBTOOL)dnl
 +
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
++_LT_SETUP
++
++# Only expand once:
++m4_define([LT_INIT])
++])# LT_INIT
++
++# Old names:
++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
++dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
++
++
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++m4_defun([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +])
 +
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.13)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++# _LT_FILEUTILS_DEFAULTS
++# ----------------------
++# It is okay to use these file commands and assume they have been set
++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
++m4_defun([_LT_FILEUTILS_DEFAULTS],
++[: ${CP="cp -f"}
++: ${MV="mv -f"}
++: ${RM="rm -f"}
++])# _LT_FILEUTILS_DEFAULTS
++
++
++# _LT_SETUP
++# ---------
++m4_defun([_LT_SETUP],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++_LT_DECL([], [host_alias], [0], [The host system])dnl
++_LT_DECL([], [host], [0])dnl
++_LT_DECL([], [host_os], [0])dnl
+ dnl
+-dnl Checks to see if this linux kernel has a working PF_PACKET
+-dnl
+-dnl usage:
++_LT_DECL([], [build_alias], [0], [The build system])dnl
++_LT_DECL([], [build], [0])dnl
++_LT_DECL([], [build_os], [0])dnl
+ dnl
+-dnl     AC_LIBNET_CHECK_PF_PACKET
 +AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+
++AC_REQUIRE([LT_PATH_LD])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
+ dnl
+-dnl results:
 +AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
++test -z "$LN_S" && LN_S="ln -s"
++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
  dnl
+-dnl     HAVE_PF_PACKET (DEFINED)
++AC_REQUIRE([LT_CMD_MAX_LEN])dnl
++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+ dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_CMD_RELOAD])dnl
++m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CMD_OLD_ARCHIVE])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
  
 -AC_DEFUN(AC_LIBNET_CHECK_PF_PACKET,
--[
--    AC_MSG_CHECKING(for PF_PACKET)
--    AC_CACHE_VAL(ac_libnet_have_pf_packet,
-+_LT_AC_PROG_ECHO_BACKSLASH
++_LT_CONFIG_LIBTOOL_INIT([
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes INIT.
++if test -n "\${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
++])
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
++
++_LT_CHECK_OBJDIR
++
++m4_require([_LT_TAG_COMPILER])dnl
++_LT_PROG_ECHO_BACKSLASH
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Global variables:
++ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$LD" && LD=ld
++test -z "$ac_objext" && ac_objext=o
++
++_LT_CC_BASENAME([$compiler])
++
 +# Only perform the check for file, if the check method requires it
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
 +case $deplibs_check_method in
 +file_magic*)
 +  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    AC_PATH_MAGIC
++    _LT_PATH_MAGIC
 +  fi
 +  ;;
 +esac
++
++# Use C for the default configuration in the libtool script
++LT_SUPPORTED_TAG([CC])
++_LT_LANG_C_CONFIG
++_LT_LANG_DEFAULT_CONFIG
++_LT_CONFIG_COMMANDS
++])# _LT_SETUP
++
++
++# _LT_PROG_LTMAIN
++# ---------------
++# Note that this code is called both from `configure', and `config.status'
++# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
++# `config.status' has no value for ac_aux_dir unless we are using Automake,
++# so we pass a copy along to make sure it has a sensible value anyway.
++m4_defun([_LT_PROG_LTMAIN],
++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
++ltmain="$ac_aux_dir/ltmain.sh"
++])# _LT_PROG_LTMAIN
++
++
++
++# So that we can recreate a full libtool script including additional
++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
++# in macros and then make a single call at the end using the `libtool'
++# label.
++
++
++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
++# ----------------------------------------
++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL_INIT],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_INIT])
++
++
++# _LT_CONFIG_LIBTOOL([COMMANDS])
++# ------------------------------
++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
++
++
++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
++# -----------------------------------------------------
++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
++[_LT_CONFIG_LIBTOOL([$1])
++_LT_CONFIG_LIBTOOL_INIT([$2])
++])
++
++
++# _LT_FORMAT_COMMENT([COMMENT])
++# -----------------------------
++# Add leading comment marks to the start of each line, and a trailing
++# full-stop to the whole comment if one is not present already.
++m4_define([_LT_FORMAT_COMMENT],
++[m4_ifval([$1], [
++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
++              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
++)])
++
++
++
++
++
++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
++# -------------------------------------------------------------------
++# CONFIGNAME is the name given to the value in the libtool script.
++# VARNAME is the (base) name used in the configure script.
++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
++# VARNAME.  Any other value will be used directly.
++m4_define([_LT_DECL],
++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
++    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
++	[m4_ifval([$1], [$1], [$2])])
++    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
++    m4_ifval([$4],
++	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
++    lt_dict_add_subkey([lt_decl_dict], [$2],
++	[tagged?], [m4_ifval([$5], [yes], [no])])])
++])
++
++
++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
++# --------------------------------------------------------
++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
++
++
++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_tag_varnames],
++[_lt_decl_filter([tagged?], [yes], $@)])
++
++
++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
++# ---------------------------------------------------------
++m4_define([_lt_decl_filter],
++[m4_case([$#],
++  [0], [m4_fatal([$0: too few arguments: $#])],
++  [1], [m4_fatal([$0: too few arguments: $#: $1])],
++  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
++  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
++  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
++])
++
++
++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
++# --------------------------------------------------
++m4_define([lt_decl_quote_varnames],
++[_lt_decl_filter([value], [1], $@)])
++
++
++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_dquote_varnames],
++[_lt_decl_filter([value], [2], $@)])
++
++
++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_varnames_tagged],
++[m4_assert([$# <= 2])dnl
++_$0(m4_quote(m4_default([$1], [[, ]])),
++    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
++    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
++m4_define([_lt_decl_varnames_tagged],
++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
++
++
++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_all_varnames],
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++     m4_if([$2], [],
++	   m4_quote(lt_decl_varnames),
++	m4_quote(m4_shift($@))))[]dnl
++])
++m4_define([_lt_decl_all_varnames],
++[lt_join($@, lt_decl_varnames_tagged([$1],
++			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
++])
++
++
++# _LT_CONFIG_STATUS_DECLARE([VARNAME])
++# ------------------------------------
++# Quote a variable value, and forward it to `config.status' so that its
++# declaration there will have the same value as in `configure'.  VARNAME
++# must have a single quote delimited value for this to work.
++m4_define([_LT_CONFIG_STATUS_DECLARE],
++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
++
++
++# _LT_CONFIG_STATUS_DECLARATIONS
++# ------------------------------
++# We delimit libtool config variables with single quotes, so when
++# we write them to config.status, we have to be sure to quote all
++# embedded single quotes properly.  In configure, this macro expands
++# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
++#
++#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
++    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
++
++
++# _LT_LIBTOOL_TAGS
++# ----------------
++# Output comment and list of tags supported by the script
++m4_defun([_LT_LIBTOOL_TAGS],
++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
++available_tags="_LT_TAGS"dnl
++])
++
++
++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
++# -----------------------------------
++# Extract the dictionary values for VARNAME (optionally with TAG) and
++# expand to a commented shell variable setting:
++#
++#    # Some comment about what VAR is for.
++#    visible_name=$lt_internal_name
++m4_define([_LT_LIBTOOL_DECLARE],
++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
++					   [description])))[]dnl
++m4_pushdef([_libtool_name],
++    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
++    [0], [_libtool_name=[$]$1],
++    [1], [_libtool_name=$lt_[]$1],
++    [2], [_libtool_name=$lt_[]$1],
++    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
++])
++
++
++# _LT_LIBTOOL_CONFIG_VARS
++# -----------------------
++# Produce commented declarations of non-tagged libtool config variables
++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
++# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
++# section) are produced by _LT_LIBTOOL_TAG_VARS.
++m4_defun([_LT_LIBTOOL_CONFIG_VARS],
++[m4_foreach([_lt_var],
++    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
++
++
++# _LT_LIBTOOL_TAG_VARS(TAG)
++# -------------------------
++m4_define([_LT_LIBTOOL_TAG_VARS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
++
++
++# _LT_TAGVAR(VARNAME, [TAGNAME])
++# ------------------------------
++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
++
++
++# _LT_CONFIG_COMMANDS
++# -------------------
++# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
++# variables for single and double quote escaping we saved from calls
++# to _LT_DECL, we can put quote escaped variables declarations
++# into `config.status', and then the shell code to quote escape them in
++# for loops in `config.status'.  Finally, any additional code accumulated
++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
++m4_defun([_LT_CONFIG_COMMANDS],
++[AC_PROVIDE_IFELSE([LT_OUTPUT],
++	dnl If the libtool generation code has been placed in $CONFIG_LT,
++	dnl instead of duplicating it all over again into config.status,
++	dnl then we will have config.status run $CONFIG_LT later, so it
++	dnl needs to know what name is stored there:
++        [AC_CONFIG_COMMANDS([libtool],
++            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
++    dnl If the libtool generation code is destined for config.status,
++    dnl expand the accumulated commands and init code now:
++    [AC_CONFIG_COMMANDS([libtool],
++        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
++])#_LT_CONFIG_COMMANDS
++
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+ [
+-    AC_MSG_CHECKING(for PF_PACKET)
+-    AC_CACHE_VAL(ac_libnet_have_pf_packet,
  
 -        [case "$target_os" in
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
 -        linux)
 -                ac_libnet_have_pf_packet = no
 -                ;;
 -        *)
-+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
++sed_quote_subst='$sed_quote_subst'
++double_quote_subst='$double_quote_subst'
++delay_variable_subst='$delay_variable_subst'
++_LT_CONFIG_STATUS_DECLARATIONS
++LTCC='$LTCC'
++LTCFLAGS='$LTCFLAGS'
++compiler='$compiler_DEFAULT'
  
 -    cat > pf_packet-test.c << EOF
 -#include <net/if.h>
 -#if (__GLIBC__)
 -#include <netinet/if_ether.h>
 -#include <net/if_arp.h>
-+AC_ARG_ENABLE(libtool-lock,
-+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
++# Quote evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_quote_varnames); do
++    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
++    *[[\\\\\\\`\\"\\\$]]*)