Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [configuration] |
| 2 | |
| 3 | diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4 |
| 4 | --- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800 |
| 5 | +++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800 |
| 6 | @@ -37,7 +37,7 @@ |
| 7 | dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC, |
| 8 | dnl and AC_LBL_C_INIT at the top level. |
| 9 | dnl |
| 10 | -AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, |
| 11 | +AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC], |
| 12 | [ |
| 13 | AC_BEFORE([$0], [AC_LBL_C_INIT]) |
| 14 | AC_BEFORE([$0], [AC_PROG_CC]) |
| 15 | @@ -90,7 +90,7 @@ |
| 16 | dnl LDFLAGS |
| 17 | dnl LBL_CFLAGS |
| 18 | dnl |
| 19 | -AC_DEFUN(AC_LBL_C_INIT, |
| 20 | +AC_DEFUN([AC_LBL_C_INIT], |
| 21 | [ |
| 22 | AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) |
| 23 | AC_BEFORE([$0], [AC_LBL_DEVEL]) |
| 24 | @@ -217,7 +217,7 @@ |
| 25 | dnl V_SONAME_OPT |
| 26 | dnl V_RPATH_OPT |
| 27 | dnl |
| 28 | -AC_DEFUN(AC_LBL_SHLIBS_INIT, |
| 29 | +AC_DEFUN([AC_LBL_SHLIBS_INIT], |
| 30 | [AC_PREREQ(2.50) |
| 31 | if test "$GCC" = yes ; then |
| 32 | # |
| 33 | @@ -361,7 +361,7 @@ |
| 34 | # Make sure we use the V_CCOPT flags, because some of those might |
| 35 | # disable inlining. |
| 36 | # |
| 37 | -AC_DEFUN(AC_LBL_C_INLINE, |
| 38 | +AC_DEFUN([AC_LBL_C_INLINE], |
| 39 | [AC_MSG_CHECKING(for inline) |
| 40 | save_CFLAGS="$CFLAGS" |
| 41 | CFLAGS="$V_CCOPT" |
| 42 | @@ -407,7 +407,7 @@ |
| 43 | dnl |
| 44 | dnl AC_LBL_FIXINCLUDES |
| 45 | dnl |
| 46 | -AC_DEFUN(AC_LBL_FIXINCLUDES, |
| 47 | +AC_DEFUN([AC_LBL_FIXINCLUDES], |
| 48 | [if test "$GCC" = yes ; then |
| 49 | AC_MSG_CHECKING(for ANSI ioctl definitions) |
| 50 | AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes, |
| 51 | @@ -453,7 +453,7 @@ |
| 52 | dnl $2 (yacc appended) |
| 53 | dnl $3 (optional flex and bison -P prefix) |
| 54 | dnl |
| 55 | -AC_DEFUN(AC_LBL_LEX_AND_YACC, |
| 56 | +AC_DEFUN([AC_LBL_LEX_AND_YACC], |
| 57 | [AC_ARG_WITH(flex, [ --without-flex don't use flex]) |
| 58 | AC_ARG_WITH(bison, [ --without-bison don't use bison]) |
| 59 | if test "$with_flex" = no ; then |
| 60 | @@ -506,7 +506,7 @@ |
| 61 | dnl |
| 62 | dnl DECLWAITSTATUS (defined) |
| 63 | dnl |
| 64 | -AC_DEFUN(AC_LBL_UNION_WAIT, |
| 65 | +AC_DEFUN([AC_LBL_UNION_WAIT], |
| 66 | [AC_MSG_CHECKING(if union wait is used) |
| 67 | AC_CACHE_VAL(ac_cv_lbl_union_wait, |
| 68 | AC_TRY_COMPILE([ |
| 69 | @@ -535,7 +535,7 @@ |
| 70 | dnl |
| 71 | dnl HAVE_SOCKADDR_SA_LEN (defined) |
| 72 | dnl |
| 73 | -AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN, |
| 74 | +AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN], |
| 75 | [AC_MSG_CHECKING(if sockaddr struct has the sa_len member) |
| 76 | AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len, |
| 77 | AC_TRY_COMPILE([ |
| 78 | @@ -560,7 +560,7 @@ |
| 79 | dnl |
| 80 | dnl HAVE_SOCKADDR_STORAGE (defined) |
| 81 | dnl |
| 82 | -AC_DEFUN(AC_LBL_SOCKADDR_STORAGE, |
| 83 | +AC_DEFUN([AC_LBL_SOCKADDR_STORAGE], |
| 84 | [AC_MSG_CHECKING(if sockaddr_storage struct exists) |
| 85 | AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage, |
| 86 | AC_TRY_COMPILE([ |
| 87 | @@ -593,7 +593,7 @@ |
| 88 | dnl won't be using code that would use that member, or we wouldn't |
| 89 | dnl compile in any case). |
| 90 | dnl |
| 91 | -AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1, |
| 92 | +AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1], |
| 93 | [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member) |
| 94 | AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, |
| 95 | AC_TRY_COMPILE([ |
| 96 | @@ -619,7 +619,7 @@ |
| 97 | dnl |
| 98 | dnl ac_cv_lbl_have_run_path (yes or no) |
| 99 | dnl |
| 100 | -AC_DEFUN(AC_LBL_HAVE_RUN_PATH, |
| 101 | +AC_DEFUN([AC_LBL_HAVE_RUN_PATH], |
| 102 | [AC_MSG_CHECKING(for ${CC-cc} -R) |
| 103 | AC_CACHE_VAL(ac_cv_lbl_have_run_path, |
| 104 | [echo 'main(){}' > conftest.c |
| 105 | @@ -644,7 +644,7 @@ |
| 106 | dnl |
| 107 | dnl LBL_ALIGN (DEFINED) |
| 108 | dnl |
| 109 | -AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, |
| 110 | +AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], |
| 111 | [AC_MSG_CHECKING(if unaligned accesses fail) |
| 112 | AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, |
| 113 | [case "$host_cpu" in |
| 114 | @@ -749,7 +749,7 @@ |
| 115 | dnl HAVE_OS_PROTO_H (defined) |
| 116 | dnl os-proto.h (symlinked) |
| 117 | dnl |
| 118 | -AC_DEFUN(AC_LBL_DEVEL, |
| 119 | +AC_DEFUN([AC_LBL_DEVEL], |
| 120 | [rm -f os-proto.h |
| 121 | if test "${LBL_CFLAGS+set}" = set; then |
| 122 | $1="$$1 ${LBL_CFLAGS}" |
| 123 | @@ -886,7 +886,7 @@ |
| 124 | dnl statically and happen to have a libresolv.a lying around (and no |
| 125 | dnl libnsl.a). |
| 126 | dnl |
| 127 | -AC_DEFUN(AC_LBL_LIBRARY_NET, [ |
| 128 | +AC_DEFUN([AC_LBL_LIBRARY_NET], [ |
| 129 | # Most operating systems have gethostbyname() in the default searched |
| 130 | # libraries (i.e. libc): |
| 131 | # Some OSes (eg. Solaris) place it in libnsl |
| 132 | @@ -909,7 +909,7 @@ |
| 133 | dnl Test for __attribute__ |
| 134 | dnl |
| 135 | |
| 136 | -AC_DEFUN(AC_C___ATTRIBUTE__, [ |
| 137 | +AC_DEFUN([AC_C___ATTRIBUTE__], [ |
| 138 | AC_MSG_CHECKING(for __attribute__) |
| 139 | AC_CACHE_VAL(ac_cv___attribute__, [ |
| 140 | AC_COMPILE_IFELSE( |
| 141 | @@ -947,7 +947,7 @@ |
| 142 | dnl |
| 143 | dnl -Scott Barron |
| 144 | dnl |
| 145 | -AC_DEFUN(AC_LBL_TPACKET_STATS, |
| 146 | +AC_DEFUN([AC_LBL_TPACKET_STATS], |
| 147 | [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined) |
| 148 | AC_CACHE_VAL(ac_cv_lbl_tpacket_stats, |
| 149 | AC_TRY_COMPILE([ |
| 150 | @@ -976,7 +976,7 @@ |
| 151 | dnl doesn't have that member (which is OK, as either we won't be using |
| 152 | dnl code that would use that member, or we wouldn't compile in any case). |
| 153 | dnl |
| 154 | -AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI, |
| 155 | +AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI], |
| 156 | [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member) |
| 157 | AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, |
| 158 | AC_TRY_COMPILE([ |
| 159 | @@ -1003,7 +1003,7 @@ |
| 160 | dnl |
| 161 | dnl HAVE_DLPI_PASSIVE (defined) |
| 162 | dnl |
| 163 | -AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T, |
| 164 | +AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T], |
| 165 | [AC_MSG_CHECKING(if dl_passive_req_t struct exists) |
| 166 | AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t, |
| 167 | AC_TRY_COMPILE([ |