Ugh, libnet maintainers replaced a tarball -in place- and made a bunch of changes, thereby breaking the libnet 1.1 build. fixed.

BKrev: 3fe881caJF-tIGgN5C3E7tTfd236gg

2 files changed, 9 insertions, 1045 deletions

diff --git a/libnet/libnet-1.1.0/configure.patch b/libnet/libnet-1.1.0/configure.patch
index a765057ee2..876c4292bd 100644
--- a/libnet/libnet-1.1.0/configure.patch
+++ b/libnet/libnet-1.1.0/configure.patch
@@ -3,9 +3,9 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- Libnet-latest/acinclude.m4~configure
-+++ Libnet-latest/acinclude.m4
-@@ -182,7 +182,7 @@
+--- libnet/acinclude.m4~configure
++++ libnet/acinclude.m4
+@@ -184,7 +184,7 @@
      AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
          [case "$target_cpu" in
  
@@ -14,7 +14,7 @@
                  ac_cv_lbl_unaligned_fail=yes
                  ;;
  
-@@ -257,7 +257,8 @@
+@@ -259,7 +259,8 @@
  dnl
  
  AC_DEFUN(AC_LIBNET_ENDIAN_CHECK,
@@ -24,7 +24,7 @@
  
      cat > conftest.c << EOF
  #       include <stdio.h>
-@@ -310,8 +311,7 @@
+@@ -312,8 +313,7 @@
              fi                                
          fi
          rm -f conftest* core core.conftest
@@ -34,7 +34,7 @@
  
          if test $ac_cv_libnet_endianess = big ; then
              AC_DEFINE(LIBNET_BIG_ENDIAN)
-@@ -322,7 +322,7 @@
+@@ -324,7 +324,7 @@
              ENDIANESS="LIBNET_LIL_ENDIAN"
              LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN"
          fi
@@ -43,1012 +43,8 @@
  
  dnl
  dnl Improved version of AC_CHECK_LIB
---- Libnet-latest/aclocal.m4~configure
-+++ Libnet-latest/aclocal.m4
--# aclocal.m4 generated automatically by aclocal 1.5
--
--# Copyright 1996, 1997, 1998, 1999, 2000, 2001
--# 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.
--
--dnl $Id$
--dnl
--dnl Libnet specific autoconf macros
--dnl Copyright (c) 1998 - 2002 Mike D. Schiffman <mike@infonexus.com>
--dnl All rights reserved.
--dnl
--
--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_PACKET_SOCKET (DEFINED)
--dnl
--
--AC_DEFUN(AC_LIBNET_CHECK_PF_PACKET,
--[
--    AC_MSG_CHECKING(for packet socet (PF_SOCKET))
--    AC_CACHE_VAL(ac_libnet_have_packet_socket,
--
--        [case "$target_os" in
--
--        linux)
--                ac_libnet_have_packet_socket = no
--                ;;
--        *)
--
--    cat > pf_packet-test.c << EOF
--#include <stdio.h>
--#include <errno.h>
--#include <stdlib.h>
--#include <netinet/in.h>
--#include <sys/socket.h>
--#include <features.h>    /* for the glibc version number */
--#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
--#include <netpacket/packet.h>
--#include <net/ethernet.h>     /* the L2 protocols */
--#else
--#include <asm/types.h>
--#include <linux/if_packet.h>
--#include <linux/if_ether.h>   /* The L2 protocols */
--#endif
-- 
--#ifndef SOL_PACKET
--#define SOL_PACKET 263
--#endif  /* SOL_PACKET */
-- 
--int
--main(int argc, char **argv)
--{
--    int fd;
-- 
--    fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
--    if (fd == -1)
--    {
--        if (errno == EPERM)
--        {
--            /* user's UID != 0 */
--            printf("probably");
--            exit (EXIT_FAILURE);
--        }
--        printf("no");
--        exit (EXIT_FAILURE);
--    }
--    printf("yes");
--    exit (EXIT_SUCCESS);
--}
--EOF
--    ${CC-cc} -o pf_packet-test $CFLAGS pf_packet-test.c >/dev/null 2>&1
--
--    # Oopz 4.3 BSD doesn't have this.  Sorry.
--    if test ! -x ./pf_packet-test ; then
--        ac_libnet_have_packet_socket=choked
--    else
--        ac_libnet_have_packet_socket=`./pf_packet-test`;
--    fi
--    if test $ac_libnet_have_packet_socket = choked; then
--        AC_MSG_RESULT(test program compile choked... assuming no)
--    elif test $ac_libnet_have_packet_socket = yes; then
--        AC_MSG_RESULT(yes)
--        AC_DEFINE(HAVE_PACKET_SOCKET)
--    elif test $ac_libnet_have_packet_socket = probably; then
--        AC_MSG_RESULT(test program got EPERM... assuming yes)
--        AC_DEFINE(HAVE_PACKET_SOCKET)
--    elif test $ac_libnet_have_packet_socket = no; then
--        AC_MSG_RESULT(no)
--    fi
--
--    rm -f pf_packet-test* core core.pf_packet-test
--    ;;
--    esac])
--])
--
--dnl
--dnl Looks for a previous libnet version and attempts to determine which verion
--dnl it is.  Version 0.8 was the first version that actually knew internally
--dnl what version it was.
--dnl
--dnl usage:
--dnl
--dnl     AC_LIBNET_CHECK_LIBNET_VERSION
--dnl
--dnl results:
--dnl
--dnl
--dnl
--
--AC_DEFUN(AC_LIBNET_CHECK_LIBNET_VER,
--[
--    AC_CHECK_LIB(net, libnet_build_ip, AC_MSG_CHECKING(version) \
--
--changequote(<<, >>)dnl
--    if [[ ! -f $LIB_PREFIX/libnet.a ]] ; then
--changequote([, ])dnl
--        AC_MSG_RESULT($LIB_PREFIX/libnet.a doesn't exist)
--        AC_MSG_RESULT(previous libnet install lives elsewhere, you should probably find it)
--    else
--        __LIBNET_VERSION=`strings $LIB_PREFIX/libnet.a | grep "libnet version"\
--                | cut -f3 -d" "`;\
--        if test -z "$__LIBNET_VERSION"; then
--            AC_MSG_RESULT(<0.8)
--        else
--            AC_MSG_RESULT($__LIBNET_VERSION)
--        fi
--    fi\
--    )
--])
--
--
--dnl
--dnl Checks to see if this linux kernel uses ip_sum or ip_csum
--dnl (Pulled from queso)
--dnl
--dnl usage:
--dnl
--dnl     AC_LIBNET_CHECK_IP_CSUM
--dnl
--dnl results:
--dnl
--dnl     HAVE_STRUCT_IP_CSUM (DEFINED)
--dnl
--
--AC_DEFUN(AC_LIBNET_CHECK_IP_CSUM,
--[
--    AC_MSG_CHECKING([struct ip contains ip_csum])
--    AC_TRY_COMPILE([
--        #define __BSD_SOURCE
--        #define _BSD_SOURCE
--        #include <sys/types.h>
--        #include <netinet/in.h>
--        #include <netinet/in_systm.h>
--        #include <netinet/ip.h>],
--        [
--            struct ip ip;
--            ip.ip_csum = 0;
--        ],
--        [AC_MSG_RESULT(yes);
--        AC_DEFINE(HAVE_STRUCT_IP_CSUM)],
--        [AC_MSG_RESULT(no);
--    ])
--])
--
--dnl
--dnl Checks to see if unaligned memory accesses fail
--dnl (Pulled from libpcap)
--dnl
--dnl usage:
--dnl
--dnl     AC_LBL_UNALIGNED_ACCESS
--dnl
--dnl results:
--dnl
--dnl     LBL_ALIGN (DEFINED)
--dnl
--
--AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
--    [AC_MSG_CHECKING(if unaligned accesses fail)
--    AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
--        [case "$target_cpu" in
--
--        alpha|hp*|mips|sparc)
--                ac_cv_lbl_unaligned_fail=yes
--                ;;
--
--        *)
--                cat >conftest.c <<EOF
--#                   include <sys/types.h>
--#                   include <sys/wait.h>
--#                   include <stdio.h>
--                    unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
--                    main()
--                    {
--                        unsigned int i;
--                        pid_t pid;
--                        int status;
--                        /* avoid "core dumped" message */
--                        pid = fork();
--                        if (pid <  0)
--                        {
--                            exit(2);
--                        }
--                        if (pid > 0)
--                        {
--                            /* parent */
--                            pid = waitpid(pid, &status, 0);
--                            if (pid < 0)
--                            {
--                                exit(3);
--                            }
--                            exit(!WIFEXITED(status));
--                        }
--                        /* child */
--                        i = *(unsigned int *)&a[[1]];
--                        printf("%d\n", i);
--                        exit(0);
--                    }
--EOF
--                ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
--                    conftest.c $LIBS > /dev/null 2>&1
--                # Oopz 4.3 BSD doesn't have this.  Sorry.
--                if test ! -x conftest ; then
--                        dnl failed to compile for some reason
--                        ac_cv_lbl_unaligned_fail=yes
--                else
--                        ./conftest > conftest.out
--                        if test ! -s conftest.out ; then
--                                ac_cv_lbl_unaligned_fail=yes
--                        else
--                                ac_cv_lbl_unaligned_fail=no
--                        fi
--                fi
--                rm -f conftest* core core.conftest
--                ;;
--        esac])
--    AC_MSG_RESULT($ac_cv_lbl_unaligned_fail)
--    if test $ac_cv_lbl_unaligned_fail = yes ; then
--            AC_DEFINE(LBL_ALIGN)
--    fi
--])
--
--
--dnl
--dnl Checks endianess
--dnl
--dnl usage:
--dnl
--dnl     AC_LIBNET_ENDIAN_CHECK
--dnl
--dnl results:
--dnl
--dnl     LIBNET_BIG_ENDIAN = 1   or
--dnl     LIBNET_LIL_ENDIAN = 1
--dnl
--
--AC_DEFUN(AC_LIBNET_ENDIAN_CHECK,
--    [AC_MSG_CHECKING(machine endianess)
--
--    cat > conftest.c << EOF
--#       include <stdio.h>
--#       include <stdlib.h>
--
--        int main()
--        {
--            union
--            {
--                short s;
--                char c[[sizeof(short)]];
--            } un;
--
--            un.s = 0x0102;
--            if (sizeof (short) == 2)
--            {
--                if (un.c [[0]] == 1 && un.c [[1]] == 2)
--                {
--                    printf("B\n");
--                }
--                else
--                {
--                    if (un.c [[0]] == 2 && un.c [[1]] == 1)
--                    {
--                        printf("L\n");
--                    }
--                }
--            }
--            else
--            {
--                printf("?\n");
--            }
--            return (EXIT_SUCCESS);
--        }
--EOF
--        ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS > /dev/null 2>&1
--        # Oopz 4.3 BSD doesn't have this.  Sorry.
--        if test ! -x conftest ; then
--dnl failed to compile for some reason
--            ac_cv_libnet_endianess=unknown
--        else
--            ./conftest > conftest.out
--            result=`cat conftest.out`
--            if test $result = "B"; then
--                ac_cv_libnet_endianess=big
--            elif test $result = "L"; then
--                ac_cv_libnet_endianess=lil
--            else
--                ac_cv_libnet_endianess=unknown
--            fi                                
--        fi
--        rm -f conftest* core core.conftest
--
--        AC_MSG_RESULT($ac_cv_libnet_endianess)
--
--        if test $ac_cv_libnet_endianess = big ; then
--            AC_DEFINE(LIBNET_BIG_ENDIAN)
--            ENDIANESS="LIBNET_BIG_ENDIAN"
--            LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN"
--        elif test $ac_cv_libnet_endianess = lil ; then
--            AC_DEFINE(LIBNET_LIL_ENDIAN)
--            ENDIANESS="LIBNET_LIL_ENDIAN"
--            LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN"
--        fi
--    ])
--
--dnl
--dnl Improved version of AC_CHECK_LIB
--dnl
--dnl Thanks to John Hawkinson (jhawk@mit.edu)
--dnl
--dnl usage:
--dnl
--dnl     AC_LBL_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [,
--dnl         ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
--dnl
--dnl results:
--dnl
--dnl     LIBS
--dnl
-- 
--define(AC_LBL_CHECK_LIB,
--[AC_MSG_CHECKING([for $2 in -l$1])
--dnl Use a cache variable name containing both the library and function name,
--dnl because the test really is for library $1 defining function $2, not
--dnl just for library $1.  Separate tests with the same $1 and different $2's
--dnl may have different results.
--ac_lib_var=`echo $1['_']$2['_']$5 | sed 'y%./+- %__p__%'`
--AC_CACHE_VAL(ac_cv_lbl_lib_$ac_lib_var,
--[ac_save_LIBS="$LIBS"
--LIBS="-l$1 $5 $LIBS"
--AC_TRY_LINK(dnl
--ifelse([$2], [main], , dnl Avoid conflicting decl of main.
--[/* Override any gcc2 internal prototype to avoid an error.  */
--]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
--extern "C"
--#endif
--])dnl
--[/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char $2();
--]),
--            [$2()],
--            eval "ac_cv_lbl_lib_$ac_lib_var=yes",
--            eval "ac_cv_lbl_lib_$ac_lib_var=no")
--LIBS="$ac_save_LIBS"
--])dnl
--if eval "test \"`echo '$ac_cv_lbl_lib_'$ac_lib_var`\" = yes"; then
--  AC_MSG_RESULT(yes)
--  ifelse([$3], ,
--[changequote(, )dnl
--  ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--changequote([, ])dnl
--  AC_DEFINE_UNQUOTED($ac_tr_lib)
--  LIBS="-l$1 $LIBS"
--], [$3])
--else
--  AC_MSG_RESULT(no)
--ifelse([$4], , , [$4
--])dnl
--fi
--])
--
--dnl
--dnl AC_LBL_LIBRARY_NET
--dnl
--dnl This test is for network applications that need socket() and
--dnl gethostbyname() -ish functions.  Under Solaris, those applications
--dnl need to link with "-lsocket -lnsl".  Under IRIX, they need to link
--dnl with "-lnsl" but should *not* link with "-lsocket" because
--dnl libsocket.a breaks a number of things (for instance:
--dnl gethostbyname() under IRIX 5.2, and snoop sockets under most
--dnl versions of IRIX).
--dnl
--dnl Unfortunately, many application developers are not aware of this,
--dnl and mistakenly write tests that cause -lsocket to be used under
--dnl IRIX.  It is also easy to write tests that cause -lnsl to be used
--dnl under operating systems where neither are necessary (or useful),
--dnl such as SunOS 4.1.4, which uses -lnsl for TLI.
--dnl
--dnl This test exists so that every application developer does not test
--dnl this in a different, and subtly broken fashion.
-- 
--dnl It has been argued that this test should be broken up into two
--dnl seperate tests, one for the resolver libraries, and one for the
--dnl libraries necessary for using Sockets API. Unfortunately, the two
--dnl are carefully intertwined and allowing the autoconf user to use
--dnl them independantly potentially results in unfortunate ordering
--dnl dependancies -- as such, such component macros would have to
--dnl carefully use indirection and be aware if the other components were
--dnl executed. Since other autoconf macros do not go to this trouble,
--dnl and almost no applications use sockets without the resolver, this
--dnl complexity has not been implemented.
--dnl
--dnl The check for libresolv is in case you are attempting to link
--dnl statically and happen to have a libresolv.a lying around (and no
--dnl libnsl.a).
--dnl
--AC_DEFUN(AC_LBL_LIBRARY_NET, [
--    # Most operating systems have gethostbyname() in the default searched
--    # libraries (i.e. libc):
--    AC_CHECK_FUNC(gethostbyname, ,
--        # Some OSes (eg. Solaris) place it in libnsl:
--        AC_LBL_CHECK_LIB(nsl, gethostbyname, ,
--            # Some strange OSes (SINIX) have it in libsocket:
--            AC_LBL_CHECK_LIB(socket, gethostbyname, ,
--                # Unfortunately libsocket sometimes depends on libnsl.
--                # AC_CHECK_LIB's API is essentially broken so the
--                # following ugliness is necessary:
--                AC_LBL_CHECK_LIB(socket, gethostbyname,
--                    LIBS="-lsocket -lnsl $LIBS",
--                    AC_CHECK_LIB(resolv, gethostbyname),
--                    -lnsl))))
--    AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, ,
--        AC_LBL_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", ,
--            -lnsl)))
--    # DLPI needs putmsg under HPUX so test for -lstr while we're at it
--    AC_CHECK_LIB(str, putmsg)
--    ])
--
--
--# Do all the work for Automake.  This macro actually does too much --
--# some checks are only needed if your package does certain things.
--# But this isn't really a big deal.
--
--# serial 5
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery.  Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
--
--
--# We require 2.13 because we rely on SHELL being computed by configure.
--AC_PREREQ([2.13])
--
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
--# The purpose of this macro is to provide the user with a means to
--# check macros which are provided without letting her know how the
--# information is coded.
--# If this macro is not defined by Autoconf, define it here.
--ifdef([AC_PROVIDE_IFELSE],
--      [],
--      [define([AC_PROVIDE_IFELSE],
--              [ifdef([AC_PROVIDE_$1],
--                     [$2], [$3])])])
--
--
--# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
--# ----------------------------------------------
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
--fi
--
--# Define the identity of the package.
--PACKAGE=$1
--AC_SUBST(PACKAGE)dnl
--VERSION=$2
--AC_SUBST(VERSION)dnl
--ifelse([$3],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
--
--# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
--# the ones we care about.
--ifdef([m4_pattern_allow],
--      [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
--
--# Autoconf 2.50 always computes EXEEXT.  However we need to be
--# compatible with 2.13, for now.  So we always define EXEEXT, but we
--# don't compute it.
--AC_SUBST(EXEEXT)
--# Similar for OBJEXT -- only we only use OBJEXT if the user actually
--# requests that it be used.  This is a bit dumb.
--: ${OBJEXT=o}
--AC_SUBST(OBJEXT)
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal)
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake)
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_MISSING_PROG(AMTAR, tar)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--# We need awk for the "check" target.  The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_DEP_TRACK])dnl
--AC_REQUIRE([AM_SET_DEPDIR])dnl
--AC_PROVIDE_IFELSE([AC_PROG_][CC],
--                  [_AM_DEPENDENCIES(CC)],
--                  [define([AC_PROG_][CC],
--                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_][CXX],
--                  [_AM_DEPENDENCIES(CXX)],
--                  [define([AC_PROG_][CXX],
--                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--# serial 3
--
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
--   if test "$[*]" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftest.file`
--   fi
--   rm -f conftest.file
--   if test "$[*]" != "X $srcdir/configure conftest.file" \
--      && test "$[*]" != "X conftest.file $srcdir/configure"; then
--
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
--
--   test "$[2]" = conftest.file
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
--
--
--# serial 2
--
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
--
--
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
--  am_missing_run="$MISSING --run "
--else
--  am_missing_run=
--  am_backtick='`'
--  AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
--fi
--])
--
--# AM_AUX_DIR_EXPAND
--
--# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
--# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
--#
--# Of course, Automake must honor this variable whenever it calls a
--# tool from the auxiliary directory.  The problem is that $srcdir (and
--# therefore $ac_aux_dir as well) can be either absolute or relative,
--# depending on how configure is run.  This is pretty annoying, since
--# it makes $ac_aux_dir quite unusable in subdirectories: in the top
--# source directory, any form will work fine, but in subdirectories a
--# relative path needs to be adjusted first.
--#
--# $ac_aux_dir/missing
--#    fails when called from a subdirectory if $ac_aux_dir is relative
--# $top_srcdir/$ac_aux_dir/missing
--#    fails if $ac_aux_dir is absolute,
--#    fails when called from a subdirectory in a VPATH build with
--#          a relative $ac_aux_dir
--#
--# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
--# are both prefixed by $srcdir.  In an in-source build this is usually
--# harmless because $srcdir is `.', but things will broke when you
--# start a VPATH build or use an absolute $srcdir.
--#
--# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
--# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
--#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
--# and then we would define $MISSING as
--#   MISSING="\${SHELL} $am_aux_dir/missing"
--# This will work as long as MISSING is not called from configure, because
--# unfortunately $(top_srcdir) has no meaning in configure.
--# However there are other variables, like CC, which are often used in
--# configure, and could therefore not use this "fixed" $ac_aux_dir.
--#
--# Another solution, used here, is to always expand $ac_aux_dir to an
--# absolute PATH.  The drawback is that using absolute paths prevent a
--# configured tree to be moved without reconfiguration.
--
--AC_DEFUN([AM_AUX_DIR_EXPAND], [
--# expand $ac_aux_dir to an absolute path
--am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
--])
--
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
--
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries.  This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
--
--# serial 4						-*- Autoconf -*-
--
--
--
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery.  Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
--
--
--
--# _AM_DEPENDENCIES(NAME)
--# ---------------------
--# See how the compiler implements dependency checking.
--# NAME is "CC", "CXX" or "OBJC".
--# We try a few techniques and use that to set a single cache variable.
--#
--# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
--# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
--# dependency, and given that the user is not expected to run this macro,
--# just rely on AC_PROG_CC.
--AC_DEFUN([_AM_DEPENDENCIES],
--[AC_REQUIRE([AM_SET_DEPDIR])dnl
--AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
--AC_REQUIRE([AM_MAKE_INCLUDE])dnl
--AC_REQUIRE([AM_DEP_TRACK])dnl
--
--ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
--       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
--       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
--       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
--                   [depcc="$$1"   am_compiler_list=])
--
--AC_CACHE_CHECK([dependency style of $depcc],
--               [am_cv_$1_dependencies_compiler_type],
--[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
--  # We make a subdir and do the tests there.  Otherwise we can end up
--  # making bogus files that we don't know about and never remove.  For
--  # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
--  mkdir conftest.dir
--  # Copy depcomp to subdir because otherwise we won't find it if we're
--  # using a relative directory.
--  cp "$am_depcomp" conftest.dir
--  cd conftest.dir
--
--  am_cv_$1_dependencies_compiler_type=none
--  if test "$am_compiler_list" = ""; then
--     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
--  fi
--  for depmode in $am_compiler_list; do
--    # We need to recreate these files for each test, as the compiler may
--    # overwrite some of them when testing with obscure command lines.
--    # This happens at least with the AIX C compiler.
--    echo '#include "conftest.h"' > conftest.c
--    echo 'int i;' > conftest.h
--    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
--
--    case $depmode in
--    nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
--      if test "x$enable_dependency_tracking" = xyes; then
--	continue
--      else
--	break
--      fi
--      ;;
--    none) break ;;
--    esac
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.
--    if depmode=$depmode \
--       source=conftest.c object=conftest.o \
--       depfile=conftest.Po tmpdepfile=conftest.TPo \
--       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
--       grep conftest.h conftest.Po > /dev/null 2>&1 &&
--       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      am_cv_$1_dependencies_compiler_type=$depmode
--      break
--    fi
--  done
--
--  cd ..
--  rm -rf conftest.dir
--else
--  am_cv_$1_dependencies_compiler_type=none
--fi
--])
--$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
--AC_SUBST([$1DEPMODE])
--])
--
--
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[rm -f .deps 2>/dev/null
--mkdir .deps 2>/dev/null
--if test -d .deps; then
--  DEPDIR=.deps
--else
--  # MS-DOS does not allow filenames that begin with a dot.
--  DEPDIR=_deps
--fi
--rmdir .deps 2>/dev/null
--AC_SUBST(DEPDIR)
--])
--
--
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[  --disable-dependency-tracking Speeds up one-time builds
--  --enable-dependency-tracking  Do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
--  am_depcomp="$ac_aux_dir/depcomp"
--  AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--pushdef([subst], defn([AC_SUBST]))
--subst(AMDEPBACKSLASH)
--popdef([subst])
--])
--
--# Generate code to set up dependency tracking.
--# This macro should only be invoked once -- use via AC_REQUIRE.
--# Usage:
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--
--#
--# This code is only required when automatic dependency tracking
--# is enabled.  FIXME.  This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
--AC_OUTPUT_COMMANDS([
--test x"$AMDEP_TRUE" != x"" ||
--for mf in $CONFIG_FILES; do
--  case "$mf" in
--  Makefile) dirpart=.;;
--  */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
--  *) continue;;
--  esac
--  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
--  # Extract the definition of DEP_FILES from the Makefile without
--  # running `make'.
--  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
--  test -z "$DEPDIR" && continue
--  # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n -e '/^U = / s///p' < "$mf"`
--  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
--  # We invoke sed twice because it is the simplest approach to
--  # changing $(DEPDIR) to its actual value in the expansion.
--  for file in `sed -n -e '
--    /^DEP_FILES = .*\\\\$/ {
--      s/^DEP_FILES = //
--      :loop
--	s/\\\\$//
--	p
--	n
--	/\\\\$/ b loop
--      p
--    }
--    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
--       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--    # Make sure the directory exists.
--    test -f "$dirpart/$file" && continue
--    fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
--    $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
--    # echo "creating $dirpart/$file"
--    echo '# dummy' > "$dirpart/$file"
--  done
--done
--], [AMDEP_TRUE="$AMDEP_TRUE"
--ac_aux_dir="$ac_aux_dir"])])
--
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--doit:
--	@echo done
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include='#'
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
--   am__include=include
--   am__quote=
--   _am_result=GNU
--fi
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
--   echo '.include "confinc"' > confmf
--   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
--      am__include=.include
--      am__quote='"'
--      _am_result=BSD
--   fi
--fi
--AC_SUBST(am__include)
--AC_SUBST(am__quote)
--AC_MSG_RESULT($_am_result)
--rm -f confinc confmf
--])
--
--# serial 3
--
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--#
--# FIXME: Once using 2.50, use this:
--# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_DEFUN([AM_CONDITIONAL],
--[ifelse([$1], [TRUE],
--        [errprint(__file__:__line__: [$0: invalid condition: $1
--])dnl
--m4exit(1)])dnl
--ifelse([$1], [FALSE],
--       [errprint(__file__:__line__: [$0: invalid condition: $1
--])dnl
--m4exit(1)])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--# serial 3
--
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated.  We must strip everything past the first ":",
--# and everything past the last "/".
--
--AC_PREREQ([2.12])
--
--AC_DEFUN([AM_CONFIG_HEADER],
--[ifdef([AC_FOREACH],dnl
--	 [dnl init our file count if it isn't already
--	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
--	 dnl prepare to store our destination file list for use in config.status
--	 AC_FOREACH([_AM_File], [$1],
--		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
--		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
--		    dnl and add it to the list of files AC keeps track of, along
--		    dnl with our hook
--		    AC_CONFIG_HEADERS(_AM_File,
--dnl COMMANDS, [, INIT-CMDS]
--[# update the timestamp
--echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
--][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
--		    m4_popdef([_AM_Dest])])],dnl
--[AC_CONFIG_HEADER([$1])
--  AC_OUTPUT_COMMANDS(
--   ifelse(patsubst([$1], [[^ ]], []),
--	  [],
--	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
--	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
--[am_indx=1
--for am_file in $1; do
--  case " \$CONFIG_HEADERS " in
--  *" \$am_file "*)
--    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
--    if test -n "\$am_dir"; then
--      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
--      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
--        am_tmpdir=\$am_tmpdir\$am_subdir/
--        if test ! -d \$am_tmpdir; then
--          mkdir \$am_tmpdir
--        fi
--      done
--    fi
--    echo timestamp > "\$am_dir"stamp-h\$am_indx
--    ;;
--  esac
--  am_indx=\`expr \$am_indx + 1\`
--done])
--])]) # AM_CONFIG_HEADER
--
--# _AM_DIRNAME(PATH)
--# -----------------
--# Like AS_DIRNAME, only do it during macro expansion
--AC_DEFUN([_AM_DIRNAME],
--       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
--	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
--		    m4_if(m4_regexp([$1], [^/.*]), -1,
--			  [.],
--			  m4_patsubst([$1], [^\(/\).*], [\1])),
--		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
--	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
--]) # _AM_DIRNAME
--
---- Libnet-latest/./configure.in~configure
-+++ Libnet-latest/./configure.in
+--- libnet/./configure.in~configure
++++ libnet/./configure.in
 @@ -7,10 +7,11 @@
  dnl Process this file with autoconf to produce a configure script.
  
@@ -1063,35 +59,3 @@
  
  AM_INIT_AUTOMAKE(libnet, $LIBNET_VERSION)
  AM_CONFIG_HEADER(include/config.h)
-@@ -218,9 +219,11 @@
- 
- esac
- 
--AC_OUTPUT(Makefile man/Makefile src/Makefile include/Makefile \
-+AC_CONFIG_FILES([Makefile man/Makefile src/Makefile include/Makefile \
-     include/libnet/Makefile sample/Makefile version.h include/libnet.h \
--    libnet-config, chmod +x libnet-config)
-+    libnet-config])
-+AC_CONFIG_COMMANDS([default],[[chmod +x libnet-config]],[[]])
-+AC_OUTPUT
- 
- AC_MSG_RESULT(Please note this is libnet 1.1.x.  Any code written for 1.0.x\
-  will NOT work without porting.  Read the MIGRATION document for more info.)
---- Libnet-latest/./support/bpf-lkm/OpenBSD/configure.in~configure
-+++ Libnet-latest/./support/bpf-lkm/OpenBSD/configure.in
-@@ -7,11 +7,13 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl
- 
--AC_INIT(ether_mod_load.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([ether_mod_load.c])
- AC_SUBST(KERNEL_VERSION)
- 
- KERNEL_VERSION=`uname -r`
- 
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
- dnl EOF
diff --git a/libnet/libnet_1.1.0.oe b/libnet/libnet_1.1.0.oe
index af6bea963e..862ceaa32c 100644
--- a/libnet/libnet_1.1.0.oe
+++ b/libnet/libnet_1.1.0.oe
@@ -3,7 +3,7 @@ RDEPENDS = libc6
 
 SRC_URI := http://www.packetfactory.net/libnet/dist/libnet.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/Libnet-latest
+S := ${WORKDIR}/libnet
 
 inherit autotools