Makefile.in: Added libpcap to LIBS

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@632 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/Makefile.in b/libs/openzap/Makefile.in
index 9094c1b8ce7e5e9e7505bea8b6a027eb1bf97c9e..3055c231212320df4c3b08c4e180a7c58398b3e8 100644 (file)
--- a/libs/openzap/Makefile.in
+++ b/libs/openzap/Makefile.in
@@ -36,10 +36,15 @@ DEFS = @DEFS@
 CFLAGS=@CFLAGS@ @COMP_VENDOR_CFLAGS@ @DEFS@
 
 ###For libpcap
-CFLAGS+=-D_GNU_SOURCE
+CFLAGS+= -D_GNU_SOURCE
 ####
 
 LIBS = @LIBS@
+
+###For libpcap
+LIBS+= -lpcap
+####
+
 DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
 SOLINK = @SOLINK@
 OZ_SRCDIR=@oz_srcdir@

diff --git a/libs/openzap/build/config.guess b/libs/openzap/build/config.guess
index 2b738463985f91277c2569c8ef73eac057a9c1de..278f9e9e07c1d1a3bda668e6529bcce3006cfbdf 100755 (executable)
--- a/libs/openzap/build/config.guess
+++ b/libs/openzap/build/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2003-07-02'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -767,7 +767,6 @@ EOF
        exit ;;
     *:BSD/OS:*:*)
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-<<<<<<< .mine
        exit ;;
     *:FreeBSD:*:*)
        case ${UNAME_MACHINE} in
@@ -779,26 +778,6 @@ EOF
                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
        esac
        exit ;;
-=======
-       exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-       # Determine whether the default compiler uses glibc.
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <features.h>
-       #if __GLIBC__ >= 2
-       LIBC=gnu
-       #else
-       LIBC=
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-       # GNU/FreeBSD systems have a "k" prefix to indicate we are using
-       # FreeBSD's kernel, but not the complete OS.
-       case ${LIBC} in gnu) kernel_only='k' ;; esac
-       echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-       exit 0 ;;
->>>>>>> .r627
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit ;;
@@ -869,16 +848,11 @@ EOF
        echo frv-unknown-linux-gnu
        exit ;;
     ia64:Linux:*:*)
-<<<<<<< .mine
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
     m32r*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
-=======
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit 0 ;;
->>>>>>> .r627
     m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
@@ -932,21 +906,11 @@ EOF
        echo or32-unknown-linux-gnu
        exit ;;
     ppc:Linux:*:*)
-<<<<<<< .mine
        echo powerpc-unknown-linux-gnu
        exit ;;
-=======
-       echo powerpc-unknown-linux-gnu
-       exit 0 ;;
->>>>>>> .r627
     ppc64:Linux:*:*)
-<<<<<<< .mine
        echo powerpc64-unknown-linux-gnu
        exit ;;
-=======
-       echo powerpc64-unknown-linux-gnu
-       exit 0 ;;
->>>>>>> .r627
     alpha:Linux:*:*)
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
          EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -973,13 +937,8 @@ EOF
        echo hppa64-unknown-linux-gnu
        exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-<<<<<<< .mine
        echo ${UNAME_MACHINE}-ibm-linux
        exit ;;
-=======
-       echo ${UNAME_MACHINE}-ibm-linux
-       exit 0 ;;
->>>>>>> .r627
     sh64*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
@@ -993,16 +952,11 @@ EOF
        echo ${UNAME_MACHINE}-dec-linux-gnu
        exit ;;
     x86_64:Linux:*:*)
-<<<<<<< .mine
        echo x86_64-unknown-linux-gnu
        exit ;;
     xtensa:Linux:*:*)
        echo xtensa-unknown-linux-gnu
        exit ;;
-=======
-       echo x86_64-unknown-linux-gnu
-       exit 0 ;;
->>>>>>> .r627
     i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
@@ -1055,7 +1009,6 @@ EOF
        LIBC=dietlibc
        #endif
 EOF
-<<<<<<< .mine
        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
            /^LIBC/{
                s: ::g
@@ -1066,11 +1019,6 @@ EOF
                exit
        }
        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-=======
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-       test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
->>>>>>> .r627
        ;;
     i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.

diff --git a/libs/openzap/build/config.sub b/libs/openzap/build/config.sub
index 91ca9d054cbffb07f9a2ff7528ec15215a42d9c1..1761d8bdf6307c02067b3581e183ba2fdef7e1fa 100755 (executable)
--- a/libs/openzap/build/config.sub
+++ b/libs/openzap/build/config.sub
@@ -120,7 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -274,21 +276,12 @@ case $basic_machine in
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-<<<<<<< .mine
        | score \
        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-=======
-       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
->>>>>>> .r627
        | sh64 | sh64le \
-<<<<<<< .mine
        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
        | spu | strongarm \
-=======
-       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-       | strongarm \
->>>>>>> .r627
        | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
@@ -323,7 +316,7 @@ case $basic_machine in
        | a29k-* \
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
        | avr-* | avr32-* \
        | bfin-* | bs2000-* \
@@ -365,20 +358,11 @@ case $basic_machine in
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
-<<<<<<< .mine
        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-=======
-       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
->>>>>>> .r627
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-<<<<<<< .mine
        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
        | sparclite-* \
        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-=======
-       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
->>>>>>> .r627
        | tahoe-* | thumb-* \
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
        | tron-* \
@@ -1153,14 +1137,7 @@ case $basic_machine in
        sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
-<<<<<<< .mine
        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-=======
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparc | sparcv9 | sparcv9b)
->>>>>>> .r627
                basic_machine=sparc-sun
                ;;
        cydra)
@@ -1233,15 +1210,10 @@ case $os in
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-<<<<<<< .mine
              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
              | -openbsd* | -solidbsd* \
              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-=======
-             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
->>>>>>> .r627
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* \
@@ -1421,15 +1393,9 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
-<<<<<<< .mine
         c4x-* | tic4x-*)
                os=-coff
                ;;
-=======
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
->>>>>>> .r627
        # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20

diff --git a/libs/openzap/build/ltmain.sh b/libs/openzap/build/ltmain.sh
index aa4e3934075e52163661fc3d80b3a4d840bbfd75..e420facf55f8bf28e0d73c486fbecb4a7deadf5e 100644 (file)
--- a/libs/openzap/build/ltmain.sh
+++ b/libs/openzap/build/ltmain.sh
@@ -2,7 +2,7 @@
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007  Free Software Foundation, Inc.
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -118,6 +118,7 @@ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
          save_$lt_var=\$$lt_var
+         lt_env=\"$lt_var=\$$lt_var \$lt_env\"
          $lt_var=C
          export $lt_var
        fi"
@@ -249,20 +250,6 @@ func_win32_libid ()
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
-    # FreeBSD-specific: where we install compilers with non-standard names
-    tag_compilers_CC="*cc cc* *gcc gcc*"
-    tag_compilers_CXX="*c++ c++* *g++ g++*"
-    base_compiler=`set -- "$@"; echo $1`
-
-    # If $tagname isn't set, then try to infer if the default "CC" tag applies
-    if test -z "$tagname"; then
-      for zp in $tag_compilers_CC; do
-        case $base_compiler in
-        $zp) tagname="CC"; break;;
-       esac
-      done
-    fi
-
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
@@ -303,22 +290,7 @@ func_infer_tag ()
              break
              ;;
            esac
-
-           # FreeBSD-specific: try compilers based on inferred tag
-           if test -z "$tagname"; then
-             eval "tag_compilers=\$tag_compilers_${z}"
-             if test -n "$tag_compilers"; then
-               for zp in $tag_compilers; do
-                 case $base_compiler in   
-                   $zp) tagname=$z; break;;
-                 esac
-               done
-               if test -n "$tagname"; then
-                 break
-               fi
-             fi
-            fi
-          fi
+         fi
        done
        # If $tagname still isn't set, then no tagged configuration
        # was found and let the user know that the "--tag" command
@@ -519,7 +491,7 @@ do
     echo "\
 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
 
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2008  Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
@@ -1679,7 +1651,6 @@ EOF
        compiler_flags="$compiler_flags $arg"
        compile_command="$compile_command $arg"
        finalize_command="$finalize_command $arg"
-       deplibs="$deplibs $arg"
        continue
        ;;
 
@@ -2186,29 +2157,6 @@ EOF
          else
            compiler_flags="$compiler_flags $deplib"
          fi
-
-         case $linkmode in
-         lib)
-           deplibs="$deplib $deplibs"
-           test "$pass" = conv && continue
-           newdependency_libs="$deplib $newdependency_libs"
-           ;;
-         prog)
-           if test "$pass" = conv; then
-             deplibs="$deplib $deplibs"
-             continue
-           fi
-           if test "$pass" = scan; then
-             deplibs="$deplib $deplibs"
-           else
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           fi
-           ;;
-         *)
-           ;;
-         esac # linkmode
-
          continue
          ;;
        -l*)
@@ -4840,9 +4788,6 @@ static const void *lt_preloaded_setup() {
             ;;
           esac
          ;;
-       *-*-freebsd*)
-         # FreeBSD doesn't need this...
-         ;;
        *)
          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
          exit $EXIT_FAILURE