tcpdump mailing list archives
patch for libpcap configure.in to handle future DAG API releases
From: Jesper Peterson <jesper () endace com>
Date: Wed, 10 Dec 2003 11:46:24 +1300
Slight change in the way the DAG API availability is detected, add extra object if found and always report detected API version.
-- Jesper Peterson, Senior Software Developer http://www.endace.com, +64 7 839 0540
Index: configure.in =================================================================== RCS file: /tcpdump/master/libpcap/configure.in,v retrieving revision 1.102 diff -u -r1.102 configure.in --- configure.in 30 Nov 2003 22:42:25 -0000 1.102 +++ configure.in 9 Dec 2003 22:42:26 -0000 @@ -257,7 +257,7 @@ # Use DAG API if present, otherwise don't # want_dag=ifpresent - dag_root= + dag_root=/root/dag ]) ac_cv_lbl_dag_api=no case "$V_PCAP" in @@ -297,17 +297,27 @@ dag_include_dir="$dag_root" fi - if test -r "$dag_include_dir/dagapi.h" -a -r "$dag_tools_dir/dagapi.o"; then - V_INCLS="$V_INCLS -I $dag_include_dir" + ac_cv_lbl_dag_api=no + if test -r "$dag_include_dir/dagapi.h" -a -r "$dag_tools_dir/dagapi.o" -a -r "$dag_tools_dir/dagopts.o"; then + V_INCLS="$V_INCLS -I $dag_include_dir" V_LIBS="$V_LIBS $dag_tools_dir/dagapi.o $dag_tools_dir/dagopts.o" if test "$V_PCAP" != dag ; then - SSRC="pcap-dag.c" + SSRC="pcap-dag.c" fi ac_cv_lbl_dag_api=yes - else - ac_cv_lbl_dag_api=no fi - AC_MSG_RESULT($ac_cv_lbl_dag_api) + if test -r "$dag_root/lib/dagreg.c"; then # DAG 2.5.x + if test -r "$dag_tools_dir/dagreg.o"; then + V_LIBS="$V_LIBS $dag_tools_dir/dagreg.o" + else + ac_cv_lbl_dag_api=no + fi + fi + dag_version= + if test $ac_cv_lbl_dag_api = yes -a -r "$dag_root/VERSION"; then + dag_version=" (`cat $dag_root/VERSION`)" + fi + AC_MSG_RESULT($ac_cv_lbl_dag_api$dag_version) if test $ac_cv_lbl_dag_api = no; then if test "$want_dag" = yes; then AC_MSG_ERROR(DAG API not found under directory $dag_root; use --without-dag)
Current thread:
- patch for libpcap configure.in to handle future DAG API releases Jesper Peterson (Dec 09)
- Re: patch for libpcap configure.in to handle future DAG API releases Guy Harris (Dec 10)