001-compile.patch (2568B)
1 --- /dev/null 2 +++ b/acinclude.m4 3 @@ -0,0 +1 @@ 4 +sinclude(m4/libprelude.m4) 5 --- a/configure.in 6 +++ b/configure.in 7 @@ -285,21 +285,7 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,i 8 AC_CHECK_TYPES([boolean]) 9 10 # In case INADDR_NONE is not defined (like on Solaris) 11 -have_inaddr_none="no" 12 -AC_MSG_CHECKING([for INADDR_NONE]) 13 -AC_RUN_IFELSE( 14 -[AC_LANG_PROGRAM( 15 -[[ 16 -#include <sys/types.h> 17 -#include <netinet/in.h> 18 -#include <arpa/inet.h> 19 -]], 20 -[[ 21 - if (inet_addr("10,5,2") == INADDR_NONE); 22 - return 0; 23 -]])], 24 -[have_inaddr_none="yes"], 25 -[have_inaddr_none="no"]) 26 +have_inaddr_none="yes" 27 AC_MSG_RESULT($have_inaddr_none) 28 if test "x$have_inaddr_none" = "xno"; then 29 AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition]) 30 @@ -433,16 +419,7 @@ if test "x$LPCAP" = "xno"; then 31 fi 32 33 AC_MSG_CHECKING([for pcap_lex_destroy]) 34 -AC_RUN_IFELSE( 35 -[AC_LANG_PROGRAM( 36 -[[ 37 -#include <pcap.h> 38 -]], 39 -[[ 40 - pcap_lex_destroy(); 41 -]])], 42 -[have_pcap_lex_destroy="yes"], 43 -[have_pcap_lex_destroy="no"]) 44 +have_pcap_lex_destroy="yes" 45 AC_MSG_RESULT($have_pcap_lex_destroy) 46 if test "x$have_pcap_lex_destroy" = "xyes"; then 47 AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter]) 48 @@ -727,54 +704,21 @@ if test "x$ac_cv_func_daq_dp_add_dc" = " 49 50 fi 51 52 -AC_MSG_CHECKING([for daq address space ID]) 53 -AC_RUN_IFELSE( 54 -[AC_LANG_PROGRAM( 55 -[[ 56 -#include <daq.h> 57 -]], 58 -[[ 59 - DAQ_PktHdr_t hdr; 60 - hdr.address_space_id = 0; 61 -]])], 62 -[have_daq_address_space_id="yes"], 63 -[have_daq_address_space_id="no"]) 64 +have_daq_address_space_id="yes" 65 AC_MSG_RESULT($have_daq_address_space_id) 66 if test "x$have_daq_address_space_id" = "xyes"; then 67 AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1], 68 [DAQ version supports address space ID in header.]) 69 fi 70 71 -AC_MSG_CHECKING([for daq flow ID]) 72 -AC_RUN_IFELSE( 73 -[AC_LANG_PROGRAM( 74 -[[ 75 -#include <daq.h> 76 -]], 77 -[[ 78 - DAQ_PktHdr_t hdr; 79 - hdr.flow_id = 0; 80 -]])], 81 -[have_daq_flow_id="yes"], 82 -[have_daq_flow_id="no"]) 83 +have_daq_flow_id="yes" 84 AC_MSG_RESULT($have_daq_flow_id) 85 if test "x$have_daq_flow_id" = "xyes"; then 86 AC_DEFINE([HAVE_DAQ_FLOW_ID],[1], 87 [DAQ version supports flow ID in header.]) 88 fi 89 90 -AC_MSG_CHECKING([for DAQ_VERDICT_RETRY]) 91 -AC_RUN_IFELSE( 92 -[AC_LANG_PROGRAM( 93 -[[ 94 -#include <daq.h> 95 -]], 96 -[[ 97 - DAQ_Verdict verdict; 98 - verdict = DAQ_VERDICT_RETRY; 99 -]])], 100 -[have_daq_verdict_retry="yes"], 101 -[have_daq_verdict_retry="no"]) 102 +have_daq_verdict_retry="yes" 103 AC_MSG_RESULT($have_daq_verdict_retry) 104 if test "x$have_daq_verdict_retry" = "xyes"; then 105 AC_DEFINE([HAVE_DAQ_VERDICT_RETRY],[1],