218 lines
8.3 KiB
Text
218 lines
8.3 KiB
Text
$NetBSD: patch-configure,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
|
|
|
|
--- configure.orig 2015-10-09 21:48:48.000000000 +0000
|
|
+++ configure
|
|
@@ -12920,7 +12920,7 @@ fi
|
|
|
|
|
|
|
|
-if test "x$JANSSON_LIB" == "x"; then
|
|
+if test "x$JANSSON_LIB" = "x"; then
|
|
as_fn_error $? "*** JSON support not found (this typically means the libjansson development package is missing)" "$LINENO" 5
|
|
fi
|
|
|
|
@@ -13441,7 +13441,7 @@ fi
|
|
done
|
|
|
|
|
|
-ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
|
|
if test "x$ac_cv_header_sys_poll_h" = xyes; then :
|
|
|
|
else
|
|
@@ -15496,7 +15496,7 @@ fi
|
|
done
|
|
|
|
|
|
-for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
|
|
+for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strftime_l strlcat strlcpy strncasecmp strndup strnlen strptime_l strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
|
|
do :
|
|
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
@@ -15731,7 +15731,7 @@ rm -f core conftest.err conftest.$ac_obj
|
|
LDFLAGS=${old_LDFLAGS}
|
|
rm -f conftest.dynamics
|
|
|
|
-ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
|
|
if test "x$ac_cv_header_sys_poll_h" = xyes; then :
|
|
HAS_POLL=1
|
|
|
|
@@ -17520,16 +17520,16 @@ if $(${CC} -march=native -S -o /dev/null
|
|
if test "${CONFIG_CFLAGS}" = ""; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- AST_NATIVE_ARCH=1
|
|
+ AST_NATIVE_ARCH=0
|
|
else
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: user CFLAGS present" >&5
|
|
$as_echo "user CFLAGS present" >&6; }
|
|
- AST_NATIVE_ARCH=
|
|
+ AST_NATIVE_ARCH=0
|
|
fi
|
|
else
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
- AST_NATIVE_ARCH=
|
|
+ AST_NATIVE_ARCH=0
|
|
fi
|
|
|
|
|
|
@@ -18063,6 +18063,148 @@ fi
|
|
|
|
|
|
|
|
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
|
|
+ { $as_echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
|
|
+$as_echo_n "checking for sys/atomic.h... " >&6; }
|
|
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
|
|
+ $as_echo_n "(cached) " >&6
|
|
+fi
|
|
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
|
|
+$as_echo "$ac_cv_header_sys_atomic_h" >&6; }
|
|
+else
|
|
+ # Is the header compilable?
|
|
+{ $as_echo "$as_me:$LINENO: checking sys/atomic.h usability" >&5
|
|
+$as_echo_n "checking sys/atomic.h usability... " >&6; }
|
|
+cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+$ac_includes_default
|
|
+#include <sys/atomic.h>
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (ac_try="$ac_compile"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo") >&5
|
|
+ (eval "$ac_compile") 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest.$ac_objext; then
|
|
+ ac_header_compiler=yes
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_header_compiler=no
|
|
+fi
|
|
+
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
|
+$as_echo "$ac_header_compiler" >&6; }
|
|
+
|
|
+# Is the header present?
|
|
+{ $as_echo "$as_me:$LINENO: checking sys/atomic.h presence" >&5
|
|
+$as_echo_n "checking sys/atomic.h presence... " >&6; }
|
|
+cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+#include <sys/atomic.h>
|
|
+_ACEOF
|
|
+if { (ac_try="$ac_cpp conftest.$ac_ext"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
|
+$as_echo "$ac_try_echo") >&5
|
|
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } >/dev/null && {
|
|
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ }; then
|
|
+ ac_header_preproc=yes
|
|
+else
|
|
+ $as_echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_header_preproc=no
|
|
+fi
|
|
+
|
|
+rm -f conftest.err conftest.$ac_ext
|
|
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
|
+$as_echo "$ac_header_preproc" >&6; }
|
|
+
|
|
+# So? What about this header?
|
|
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
|
+ yes:no: )
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the compiler's result" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: proceeding with the compiler's result" >&2;}
|
|
+ ac_header_preproc=yes
|
|
+ ;;
|
|
+ no:yes:* )
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: present but cannot be compiled" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: present but cannot be compiled" >&2;}
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&2;}
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: see the Autoconf documentation" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: see the Autoconf documentation" >&2;}
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&2;}
|
|
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&5
|
|
+$as_echo "$as_me: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&2;}
|
|
+ ( cat <<\_ASBOX
|
|
+## ------------------------------------------ ##
|
|
+## Report this to https://issues.asterisk.org ##
|
|
+## ------------------------------------------ ##
|
|
+_ASBOX
|
|
+ ) | sed "s/^/$as_me: WARNING: /" >&2
|
|
+ ;;
|
|
+esac
|
|
+{ $as_echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
|
|
+$as_echo_n "checking for sys/atomic.h... " >&6; }
|
|
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ ac_cv_header_sys_atomic_h=$ac_header_preproc
|
|
+fi
|
|
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
|
|
+$as_echo "$ac_cv_header_sys_atomic_h" >&6; }
|
|
+
|
|
+fi
|
|
+if test "x$ac_cv_header_sys_atomic_h" = x""yes; then
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define HAVE_SYS_ATOMIC_H 1
|
|
+_ACEOF
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
+
|
|
# The cast to long int works around a bug in the HP C Compiler
|
|
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
|
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
|
@@ -19313,6 +19455,8 @@ $as_echo_n "checking if \"struct ifaddrs
|
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
+ #include <sys/types.h>
|
|
+ #include <sys/socket.h>
|
|
#include <ifaddrs.h>
|
|
int
|
|
main ()
|