diff options
author | guy <guy> | 2008-03-13 18:40:01 +0000 |
---|---|---|
committer | guy <guy> | 2008-03-13 18:40:01 +0000 |
commit | 7b8809698b226490445bb099d2ef2680a8bec6e9 (patch) | |
tree | 7d440ef14293cb7eae737d7b27cdf73f1145f6d9 | |
parent | 7681c93a03375084aa555328fef67cc5ad6f7bb3 (diff) | |
download | tcpdump-7b8809698b226490445bb099d2ef2680a8bec6e9.tar.gz |
From Sagun Shakya: check whether we need libdlpi.
-rw-r--r-- | CREDITS | 1 | ||||
-rwxr-xr-x | configure | 72 | ||||
-rw-r--r-- | configure.in | 7 |
3 files changed, 77 insertions, 3 deletions
@@ -139,6 +139,7 @@ Additional people who have contributed patches: Rick Watson <watsonrick at users dot sourceforge dot net> Rob Braun <bbraun at synack dot net> Roderick Schertler <roderick at argon dot org> + Sagun Shakya <sagun dot shakya at sun dot com> Sami Farin <safari at iki dot fi> Scott Rose <syberpunk at users dot sourceforge dot net> Sebastian Krahmer <krahmer at cs dot uni-potsdam dot de> @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.196.2.3 . +# From configure.in Revision: 1.196.2.4 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -10724,6 +10724,76 @@ _ACEOF fi fi +# libdlpi is needed for Solaris 11 and later. +echo "$as_me:$LINENO: checking for dlpi_walk in -ldlpi" >&5 +echo $ECHO_N "checking for dlpi_walk in -ldlpi... $ECHO_C" >&6 +if test "${ac_cv_lib_dlpi_dlpi_walk+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldlpi -L/lib $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#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 dlpi_walk (); +int +main () +{ +dlpi_walk (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dlpi_dlpi_walk=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dlpi_dlpi_walk=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_dlpi_dlpi_walk" >&5 +echo "${ECHO_T}$ac_cv_lib_dlpi_dlpi_walk" >&6 +if test $ac_cv_lib_dlpi_dlpi_walk = yes; then + LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS" +fi + + echo "$as_me:$LINENO: checking if sockaddr struct has sa_len member" >&5 echo $ECHO_N "checking if sockaddr struct has sa_len member... $ECHO_C" >&6 diff --git a/configure.in b/configure.in index eb985d1a..1829ddcd 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.196.2.3 2008-02-26 20:48:10 guy Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.196.2.4 2008-03-13 18:40:01 guy Exp $ (LBL) dnl dnl Copyright (c) 1994, 1995, 1996, 1997 dnl The Regents of the University of California. All rights reserved. @@ -6,7 +6,7 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.196.2.3 $) +AC_REVISION($Revision: 1.196.2.4 $) AC_PREREQ(2.50) AC_INIT(tcpdump.c) @@ -696,6 +696,9 @@ don't.]) fi fi +# libdlpi is needed for Solaris 11 and later. +AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) + dnl portability macros for getaddrinfo/getnameinfo dnl dnl Check for sa_len |