Lines 1-6
Link Here
|
1 |
--- configure.orig 2018-08-08 16:02:31 UTC |
1 |
--- configure.orig 2018-12-26 18:45:13 UTC |
2 |
+++ configure |
2 |
+++ configure |
3 |
@@ -4661,8 +4661,6 @@ case "${host_os}" in |
3 |
@@ -4681,8 +4681,6 @@ case "${host_os}" in |
4 |
;; |
4 |
;; |
5 |
dragonfly*|freebsd*) |
5 |
dragonfly*|freebsd*) |
6 |
ac_default_prefix=/usr/local |
6 |
ac_default_prefix=/usr/local |
Lines 9-16
Link Here
|
9 |
;; |
9 |
;; |
10 |
openbsd*) |
10 |
openbsd*) |
11 |
ac_default_prefix=/usr/local |
11 |
ac_default_prefix=/usr/local |
12 |
@@ -20328,6 +20326,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 |
12 |
@@ -7436,93 +7434,6 @@ $as_echo "no" >&6; } |
|
|
13 |
fi |
13 |
|
14 |
|
|
|
15 |
|
16 |
-for ac_prog in xmlstarlet xml |
17 |
-do |
18 |
- # Extract the first word of "$ac_prog", so it can be a program name with args. |
19 |
-set dummy $ac_prog; ac_word=$2 |
20 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
21 |
-$as_echo_n "checking for $ac_word... " >&6; } |
22 |
-if ${ac_cv_path_XMLSTARLET+:} false; then : |
23 |
- $as_echo_n "(cached) " >&6 |
24 |
-else |
25 |
- case $XMLSTARLET in |
26 |
- [\\/]* | ?:[\\/]*) |
27 |
- ac_cv_path_XMLSTARLET="$XMLSTARLET" # Let the user override the test with a path. |
28 |
- ;; |
29 |
- *) |
30 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
31 |
-for as_dir in $PATH |
32 |
-do |
33 |
- IFS=$as_save_IFS |
34 |
- test -z "$as_dir" && as_dir=. |
35 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
36 |
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
37 |
- ac_cv_path_XMLSTARLET="$as_dir/$ac_word$ac_exec_ext" |
38 |
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
39 |
- break 2 |
40 |
- fi |
41 |
-done |
42 |
- done |
43 |
-IFS=$as_save_IFS |
44 |
- |
45 |
- ;; |
46 |
-esac |
47 |
-fi |
48 |
-XMLSTARLET=$ac_cv_path_XMLSTARLET |
49 |
-if test -n "$XMLSTARLET"; then |
50 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLSTARLET" >&5 |
51 |
-$as_echo "$XMLSTARLET" >&6; } |
52 |
-else |
53 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
54 |
-$as_echo "no" >&6; } |
55 |
-fi |
56 |
- |
57 |
- |
58 |
- test -n "$XMLSTARLET" && break |
59 |
-done |
60 |
-test -n "$XMLSTARLET" || XMLSTARLET=":" |
61 |
- |
62 |
-# Extract the first word of "bash", so it can be a program name with args. |
63 |
-set dummy bash; ac_word=$2 |
64 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
65 |
-$as_echo_n "checking for $ac_word... " >&6; } |
66 |
-if ${ac_cv_path_BASH+:} false; then : |
67 |
- $as_echo_n "(cached) " >&6 |
68 |
-else |
69 |
- case $BASH in |
70 |
- [\\/]* | ?:[\\/]*) |
71 |
- ac_cv_path_BASH="$BASH" # Let the user override the test with a path. |
72 |
- ;; |
73 |
- *) |
74 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
75 |
-for as_dir in $PATH |
76 |
-do |
77 |
- IFS=$as_save_IFS |
78 |
- test -z "$as_dir" && as_dir=. |
79 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
80 |
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
81 |
- ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext" |
82 |
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
83 |
- break 2 |
84 |
- fi |
85 |
-done |
86 |
- done |
87 |
-IFS=$as_save_IFS |
88 |
- |
89 |
- test -z "$ac_cv_path_BASH" && ac_cv_path_BASH=":" |
90 |
- ;; |
91 |
-esac |
92 |
-fi |
93 |
-BASH=$ac_cv_path_BASH |
94 |
-if test -n "$BASH"; then |
95 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5 |
96 |
-$as_echo "$BASH" >&6; } |
97 |
-else |
98 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
99 |
-$as_echo "no" >&6; } |
100 |
-fi |
101 |
- |
102 |
- |
103 |
# Extract the first word of "git", so it can be a program name with args. |
104 |
set dummy git; ac_word=$2 |
105 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
106 |
@@ -20419,6 +20330,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 |
107 |
|
14 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
108 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
15 |
/* end confdefs.h. */ |
109 |
/* end confdefs.h. */ |
16 |
+ #include <sys/types.h> |
110 |
+ #include <sys/types.h> |
Lines 18-24
Link Here
|
18 |
#include <ifaddrs.h> |
112 |
#include <ifaddrs.h> |
19 |
int |
113 |
int |
20 |
main () |
114 |
main () |
21 |
@@ -29156,6 +29156,8 @@ fi |
115 |
@@ -29295,6 +29208,8 @@ fi |
22 |
|
116 |
|
23 |
for ver in 5.3 5.2 5.1; do |
117 |
for ver in 5.3 5.2 5.1; do |
24 |
|
118 |
|
Lines 27-33
Link Here
|
27 |
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then |
121 |
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then |
28 |
pbxlibdir="" |
122 |
pbxlibdir="" |
29 |
# if --with-LUA=DIR has been specified, use it. |
123 |
# if --with-LUA=DIR has been specified, use it. |
30 |
@@ -29170,13 +29172,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; |
124 |
@@ -29309,13 +29224,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; |
31 |
ast_ext_lib_check_save_CFLAGS="${CFLAGS}" |
125 |
ast_ext_lib_check_save_CFLAGS="${CFLAGS}" |
32 |
CFLAGS="${CFLAGS} " |
126 |
CFLAGS="${CFLAGS} " |
33 |
as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` |
127 |
as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` |
Lines 44-50
Link Here
|
44 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
138 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
45 |
/* end confdefs.h. */ |
139 |
/* end confdefs.h. */ |
46 |
|
140 |
|
47 |
@@ -29218,7 +29220,7 @@ fi |
141 |
@@ -29357,7 +29272,7 @@ fi |
48 |
|
142 |
|
49 |
# now check for the header. |
143 |
# now check for the header. |
50 |
if test "${AST_LUA_FOUND}" = "yes"; then |
144 |
if test "${AST_LUA_FOUND}" = "yes"; then |
Lines 53-59
Link Here
|
53 |
# if --with-LUA=DIR has been specified, use it. |
147 |
# if --with-LUA=DIR has been specified, use it. |
54 |
if test "x${LUA_DIR}" != "x"; then |
148 |
if test "x${LUA_DIR}" != "x"; then |
55 |
LUA_INCLUDE="-I${LUA_DIR}/include" |
149 |
LUA_INCLUDE="-I${LUA_DIR}/include" |
56 |
@@ -29228,8 +29230,8 @@ fi |
150 |
@@ -29367,8 +29282,8 @@ fi |
57 |
# check for the header |
151 |
# check for the header |
58 |
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" |
152 |
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" |
59 |
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" |
153 |
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" |
Lines 64-70
Link Here
|
64 |
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
158 |
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
65 |
LUA_HEADER_FOUND=1 |
159 |
LUA_HEADER_FOUND=1 |
66 |
else |
160 |
else |
67 |
@@ -29256,9 +29258,9 @@ fi |
161 |
@@ -29395,9 +29310,9 @@ fi |
68 |
|
162 |
|
69 |
if test "x${PBX_LUA}" = "x1" ; then |
163 |
if test "x${PBX_LUA}" = "x1" ; then |
70 |
if test x"${LUA_DIR}" = x; then |
164 |
if test x"${LUA_DIR}" = x; then |