Propagate from the git tree:
Author: Peter Volkov <pva@gentoo.org> Date: Thu Nov 6 01:28:58 2008 -0500 Currently SITA will be defined and sita code will be tried to build even if --without-sita is passed to ./configure. Patch in attachment fixes this issue.
This commit is contained in:
parent
c15ece2f8c
commit
3b0ceef967
|
@ -1,5 +1,5 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Revision: 1.160 .
|
# From configure.in Revision: 1.161 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.61.
|
# Generated by GNU Autoconf 2.61.
|
||||||
#
|
#
|
||||||
|
@ -6235,15 +6235,17 @@ echo "${ECHO_T}${enable_protochain}" >&6; }
|
||||||
# Check whether --with-sita was given.
|
# Check whether --with-sita was given.
|
||||||
if test "${with_sita+set}" = set; then
|
if test "${with_sita+set}" = set; then
|
||||||
withval=$with_sita;
|
withval=$with_sita;
|
||||||
|
if test ! "x$withval" = "xno" ; then
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define SITA 1
|
#define SITA 1
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: Enabling SITA ACN support" >&5
|
{ echo "$as_me:$LINENO: Enabling SITA ACN support" >&5
|
||||||
echo "$as_me: Enabling SITA ACN support" >&6;}
|
echo "$as_me: Enabling SITA ACN support" >&6;}
|
||||||
V_PCAP=sita
|
V_PCAP=sita
|
||||||
V_FINDALLDEVS=sita
|
V_FINDALLDEVS=sita
|
||||||
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
|
|
14
configure.in
14
configure.in
|
@ -1,4 +1,4 @@
|
||||||
dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.160 2008-10-24 07:29:34 guy Exp $ (LBL)
|
dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.161 2008-11-18 06:59:04 guy Exp $ (LBL)
|
||||||
dnl
|
dnl
|
||||||
dnl Copyright (c) 1994, 1995, 1996, 1997
|
dnl Copyright (c) 1994, 1995, 1996, 1997
|
||||||
dnl The Regents of the University of California. All rights reserved.
|
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 Process this file with autoconf to produce a configure script.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_REVISION($Revision: 1.160 $)
|
AC_REVISION($Revision: 1.161 $)
|
||||||
AC_PREREQ(2.50)
|
AC_PREREQ(2.50)
|
||||||
AC_INIT(pcap.c)
|
AC_INIT(pcap.c)
|
||||||
|
|
||||||
|
@ -203,10 +203,12 @@ AC_MSG_RESULT(${enable_protochain})
|
||||||
#
|
#
|
||||||
AC_ARG_WITH(sita, [ --with-sita include SITA support],
|
AC_ARG_WITH(sita, [ --with-sita include SITA support],
|
||||||
[
|
[
|
||||||
AC_DEFINE(SITA,1,[include ACN support])
|
if test ! "x$withval" = "xno" ; then
|
||||||
AC_MSG_NOTICE(Enabling SITA ACN support)
|
AC_DEFINE(SITA,1,[include ACN support])
|
||||||
V_PCAP=sita
|
AC_MSG_NOTICE(Enabling SITA ACN support)
|
||||||
V_FINDALLDEVS=sita
|
V_PCAP=sita
|
||||||
|
V_FINDALLDEVS=sita
|
||||||
|
fi
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
dnl
|
dnl
|
||||||
|
|
Reference in New Issue