1
0

001-compile.patch 2.5 KB

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