Lose LBL_LIBS and various pfopen() entourage.

tcpdump does not call pfopen().

diff --git a/aclocal.m4 b/aclocal.m4
index 121ef40b31558e7baaba8d8a9c0a66d1458faff9..0cb03518c8d96cd97426b25b765ff3dbfd7b70ce 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -422,7 +422,6 @@ AC_DEFUN(AC_LBL_C_INLINE,
     AC_DEFINE_UNQUOTED(inline, $ac_cv_lbl_inline, [Define as token for inline if inlining supported])])
 
 dnl
-dnl Use pfopen.c if available and pfopen() not in standard libraries
 dnl Require libpcap
 dnl Look for libpcap in directories under ..; those are local versions.
 dnl Look for an installed libpcap if there is no local version or if
@@ -437,22 +436,9 @@ dnl
 dnl    $1 (pcapdep set)
 dnl    $2 (incls appended)
 dnl    LIBS
-dnl    LBL_LIBS
 dnl
 AC_DEFUN(AC_LBL_LIBPCAP,
     [AC_REQUIRE([AC_LBL_LIBRARY_NET])
-    dnl
-    dnl save a copy before locating libpcap.a
-    dnl
-    LBL_LIBS="$LIBS"
-    pfopen=/usr/examples/packetfilter/pfopen.c
-    if test -f $pfopen ; then
-        AC_CHECK_FUNCS(pfopen)
-        if test $ac_cv_func_pfopen = "no" ; then
-            AC_MSG_RESULT(Using $pfopen)
-            LIBS="$LIBS $pfopen"
-        fi
-    fi
     libpcap=FAIL
     AC_MSG_CHECKING([whether to look for a local libpcap])
     AC_ARG_ENABLE(local-libpcap,

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 370d39621aac2ee8cbfea215bd7e82f54ba8496a..9bd23d7ad9d17fc7605dc48a3ef78945969da13f 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -159,9 +159,6 @@
 /* Define to 1 if you have the `pcap_wsockinit' function. */
 #cmakedefine HAVE_PCAP_WSOCKINIT 1
 
-/* Define to 1 if you have the `pfopen' function. */
-#cmakedefine HAVE_PFOPEN 1
-
 /* Define to 1 if you have the <rpc/rpcent.h> header file. */
 #cmakedefine HAVE_RPC_RPCENT_H 1
 

diff --git a/config.h.in b/config.h.in
index 2c64093bb8a69edf29b5e7339ca6c37fbf7bf164..afe0dc2e8e1dbb3c2f8f81c653447609d66c4fe7 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -162,9 +162,6 @@
 /* define if libpcap has pcap_version */
 #undef HAVE_PCAP_VERSION
 
-/* Define to 1 if you have the `pfopen' function. */
-#undef HAVE_PFOPEN
-
 /* Define to 1 if you have the <rpc/rpcent.h> header file. */
 #undef HAVE_RPC_RPCENT_H
 

diff --git a/configure b/configure
index e6618a03a567a2ee1a3ba9dae86d191e767965a4..b9693dec69bb0602f587f25881ea81ab1615141c 100755 (executable)
--- a/configure
+++ b/configure
@@ -5366,26 +5366,6 @@ fi
 
 
 
-                LBL_LIBS="$LIBS"
-    pfopen=/usr/examples/packetfilter/pfopen.c
-    if test -f $pfopen ; then
-        for ac_func in pfopen
-do :
-  ac_fn_c_check_func "$LINENO" "pfopen" "ac_cv_func_pfopen"
-if test "x$ac_cv_func_pfopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PFOPEN 1
-_ACEOF
-
-fi
-done
-
-        if test $ac_cv_func_pfopen = "no" ; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $pfopen" >&5
-$as_echo "Using $pfopen" >&6; }
-            LIBS="$LIBS $pfopen"
-        fi
-    fi
     libpcap=FAIL
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to look for a local libpcap" >&5
 $as_echo_n "checking whether to look for a local libpcap... " >&6; }

diff --git a/lbl/os-ultrix4.h b/lbl/os-ultrix4.h
index 891def2b39f65d9159039c7d67cd0cb400fd3160..2f0c430ba6b0daac8cd709369463fb84241d2bd0 100644 (file)
--- a/lbl/os-ultrix4.h
+++ b/lbl/os-ultrix4.h
@@ -31,6 +31,5 @@ struct timezone;
 #endif
 int    gettimeofday(struct timeval *, struct timezone *);
 int    ioctl(int, int, caddr_t);
-int    pfopen(char *, int);
 int    setlinebuf(FILE *);
 int    socket(int, int, int);