FreeBSD Bugzilla – Attachment 136848 Details for
Bug 182183
[MAINTAINER] dns/ldns: fix build of py-ldns
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ldns-1.6.16_3.patch
ldns-1.6.16_3.patch (text/plain), 46.05 KB, created by
Jaap Akkerhuis
on 2013-09-17 09:30:00 UTC
(
hide
)
Description:
ldns-1.6.16_3.patch
Filename:
MIME Type:
Creator:
Jaap Akkerhuis
Created:
2013-09-17 09:30:00 UTC
Size:
46.05 KB
patch
obsolete
>diff -ruN ../ldns.orig/Makefile ./Makefile >--- ../ldns.orig/Makefile 2013-09-17 09:51:10.959912583 +0200 >+++ ./Makefile 2013-09-16 23:49:25.059911250 +0200 >@@ -3,7 +3,7 @@ > > PORTNAME= ldns > PORTVERSION= 1.6.16 >-PORTREVISION= 2 >+PORTREVISION= 3 > CATEGORIES= dns > MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \ > CRITICAL >diff -ruN ../ldns.orig/files/patch-configure ./files/patch-configure >--- ../ldns.orig/files/patch-configure 1970-01-01 01:00:00.000000000 +0100 >+++ ./files/patch-configure 2013-09-16 23:50:04.921000037 +0200 >@@ -0,0 +1,1213 @@ >+--- ./configure.orig 2012-11-13 11:12:39.000000000 +0100 >++++ ./configure 2013-09-16 23:36:26.006912397 +0200 >+@@ -1,13 +1,11 @@ >+ #! /bin/sh >+ # Guess values for system-dependent variables and create Makefiles. >+-# Generated by GNU Autoconf 2.68 for ldns 1.6.16. >++# Generated by GNU Autoconf 2.69 for ldns 1.6.16. >+ # >+ # Report bugs to <libdns@nlnetlabs.nl>. >+ # >+ # >+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, >+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software >+-# Foundation, Inc. >++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. >+ # >+ # >+ # This configure script is free software; the Free Software Foundation >+@@ -136,6 +134,31 @@ >+ # CDPATH. >+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH >+ >++# Use a proper internal environment variable to ensure we don't fall >++ # into an infinite loop, continuously re-executing ourselves. >++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then >++ _as_can_reexec=no; export _as_can_reexec; >++ # We cannot yet assume a decent shell, so we have to provide a >++# neutralization value for shells without unset; and this also >++# works around shells that cannot unset nonexistent variables. >++# Preserve -v and -x to the replacement shell. >++BASH_ENV=/dev/null >++ENV=/dev/null >++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV >++case $- in # (((( >++ *v*x* | *x*v* ) as_opts=-vx ;; >++ *v* ) as_opts=-v ;; >++ *x* ) as_opts=-x ;; >++ * ) as_opts= ;; >++esac >++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} >++# Admittedly, this is quite paranoid, since all the known shells bail >++# out after a failed `exec'. >++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 >++as_fn_exit 255 >++ fi >++ # We don't want this to propagate to other subprocesses. >++ { _as_can_reexec=; unset _as_can_reexec;} >+ if test "x$CONFIG_SHELL" = x; then >+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : >+ emulate sh >+@@ -169,7 +192,8 @@ >+ else >+ exitcode=1; echo positional parameters were not saved. >+ fi >+-test x\$exitcode = x0 || exit 1" >++test x\$exitcode = x0 || exit 1 >++test -x / || exit 1" >+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO >+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO >+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && >+@@ -222,21 +246,25 @@ >+ >+ >+ if test "x$CONFIG_SHELL" != x; then : >+- # We cannot yet assume a decent shell, so we have to provide a >+- # neutralization value for shells without unset; and this also >+- # works around shells that cannot unset nonexistent variables. >+- # Preserve -v and -x to the replacement shell. >+- BASH_ENV=/dev/null >+- ENV=/dev/null >+- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV >+- export CONFIG_SHELL >+- case $- in # (((( >+- *v*x* | *x*v* ) as_opts=-vx ;; >+- *v* ) as_opts=-v ;; >+- *x* ) as_opts=-x ;; >+- * ) as_opts= ;; >+- esac >+- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} >++ export CONFIG_SHELL >++ # We cannot yet assume a decent shell, so we have to provide a >++# neutralization value for shells without unset; and this also >++# works around shells that cannot unset nonexistent variables. >++# Preserve -v and -x to the replacement shell. >++BASH_ENV=/dev/null >++ENV=/dev/null >++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV >++case $- in # (((( >++ *v*x* | *x*v* ) as_opts=-vx ;; >++ *v* ) as_opts=-v ;; >++ *x* ) as_opts=-x ;; >++ * ) as_opts= ;; >++esac >++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} >++# Admittedly, this is quite paranoid, since all the known shells bail >++# out after a failed `exec'. >++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 >++exit 255 >+ fi >+ >+ if test x$as_have_required = xno; then : >+@@ -339,6 +367,14 @@ >+ >+ >+ } # as_fn_mkdir_p >++ >++# as_fn_executable_p FILE >++# ----------------------- >++# Test if FILE is an executable regular file. >++as_fn_executable_p () >++{ >++ test -f "$1" && test -x "$1" >++} # as_fn_executable_p >+ # as_fn_append VAR VALUE >+ # ---------------------- >+ # Append the text in VALUE to the end of the definition contained in VAR. Take >+@@ -460,6 +496,10 @@ >+ chmod +x "$as_me.lineno" || >+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } >+ >++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have >++ # already done that, so ensure we don't try to do so again and fall >++ # in an infinite loop. This has already happened in practice. >++ _as_can_reexec=no; export _as_can_reexec >+ # Don't try to exec as it changes $[0], causing all sort of problems >+ # (the dirname of $[0] is not the place where we might find the >+ # original and so on. Autoconf is especially sensitive to this). >+@@ -494,16 +534,16 @@ >+ # ... but there are two gotchas: >+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. >+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. >+- # In both cases, we have to default to `cp -p'. >++ # In both cases, we have to default to `cp -pR'. >+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || >+- as_ln_s='cp -p' >++ as_ln_s='cp -pR' >+ elif ln conf$$.file conf$$ 2>/dev/null; then >+ as_ln_s=ln >+ else >+- as_ln_s='cp -p' >++ as_ln_s='cp -pR' >+ fi >+ else >+- as_ln_s='cp -p' >++ as_ln_s='cp -pR' >+ fi >+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file >+ rmdir conf$$.dir 2>/dev/null >+@@ -515,28 +555,8 @@ >+ as_mkdir_p=false >+ fi >+ >+-if test -x / >/dev/null 2>&1; then >+- as_test_x='test -x' >+-else >+- if ls -dL / >/dev/null 2>&1; then >+- as_ls_L_option=L >+- else >+- as_ls_L_option= >+- fi >+- as_test_x=' >+- eval sh -c '\'' >+- if test -d "$1"; then >+- test -d "$1/."; >+- else >+- case $1 in #( >+- -*)set "./$1";; >+- esac; >+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( >+- ???[sx]*):;;*)false;;esac;fi >+- '\'' sh >+- ' >+-fi >+-as_executable_p=$as_test_x >++as_test_x='test -x' >++as_executable_p=as_fn_executable_p >+ >+ # Sed expression to map a string onto a valid CPP name. >+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" >+@@ -1242,8 +1262,6 @@ >+ if test "x$host_alias" != x; then >+ if test "x$build_alias" = x; then >+ cross_compiling=maybe >+- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. >+- If a cross compiler is detected then cross compile mode will be used" >&2 >+ elif test "x$build_alias" != "x$host_alias"; then >+ cross_compiling=yes >+ fi >+@@ -1518,9 +1536,9 @@ >+ if $ac_init_version; then >+ cat <<\_ACEOF >+ ldns configure 1.6.16 >+-generated by GNU Autoconf 2.68 >++generated by GNU Autoconf 2.69 >+ >+-Copyright (C) 2010 Free Software Foundation, Inc. >++Copyright (C) 2012 Free Software Foundation, Inc. >+ This configure script is free software; the Free Software Foundation >+ gives unlimited permission to copy, distribute and modify it. >+ _ACEOF >+@@ -1851,7 +1869,7 @@ >+ test ! -s conftest.err >+ } && test -s conftest$ac_exeext && { >+ test "$cross_compiling" = yes || >+- $as_test_x conftest$ac_exeext >++ test -x conftest$ac_exeext >+ }; then : >+ ac_retval=0 >+ else >+@@ -2000,7 +2018,8 @@ >+ main () >+ { >+ static int test_array [1 - 2 * !(($2) >= 0)]; >+-test_array [0] = 0 >++test_array [0] = 0; >++return test_array [0]; >+ >+ ; >+ return 0; >+@@ -2016,7 +2035,8 @@ >+ main () >+ { >+ static int test_array [1 - 2 * !(($2) <= $ac_mid)]; >+-test_array [0] = 0 >++test_array [0] = 0; >++return test_array [0]; >+ >+ ; >+ return 0; >+@@ -2042,7 +2062,8 @@ >+ main () >+ { >+ static int test_array [1 - 2 * !(($2) < 0)]; >+-test_array [0] = 0 >++test_array [0] = 0; >++return test_array [0]; >+ >+ ; >+ return 0; >+@@ -2058,7 +2079,8 @@ >+ main () >+ { >+ static int test_array [1 - 2 * !(($2) >= $ac_mid)]; >+-test_array [0] = 0 >++test_array [0] = 0; >++return test_array [0]; >+ >+ ; >+ return 0; >+@@ -2092,7 +2114,8 @@ >+ main () >+ { >+ static int test_array [1 - 2 * !(($2) <= $ac_mid)]; >+-test_array [0] = 0 >++test_array [0] = 0; >++return test_array [0]; >+ >+ ; >+ return 0; >+@@ -2222,7 +2245,7 @@ >+ running configure, to aid debugging if configure makes a mistake. >+ >+ It was created by ldns $as_me 1.6.16, which was >+-generated by GNU Autoconf 2.68. Invocation command line was >++generated by GNU Autoconf 2.69. Invocation command line was >+ >+ $ $0 $@ >+ >+@@ -2606,7 +2629,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_CC="${ac_tool_prefix}gcc" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -2646,7 +2669,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_CC="gcc" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -2699,7 +2722,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_CC="${ac_tool_prefix}cc" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -2740,7 +2763,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then >+ ac_prog_rejected=yes >+ continue >+@@ -2798,7 +2821,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -2842,7 +2865,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_CC="$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -3288,8 +3311,7 @@ >+ /* end confdefs.h. */ >+ #include <stdarg.h> >+ #include <stdio.h> >+-#include <sys/types.h> >+-#include <sys/stat.h> >++struct stat; >+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ >+ struct buf { int x; }; >+ FILE * (*rcsopen) (struct buf *, struct stat *, int); >+@@ -3529,7 +3551,7 @@ >+ for ac_prog in grep ggrep; do >+ for ac_exec_ext in '' $ac_executable_extensions; do >+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" >+- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue >++ as_fn_executable_p "$ac_path_GREP" || continue >+ # Check for GNU ac_path_GREP and select it if it is found. >+ # Check for GNU $ac_path_GREP >+ case `"$ac_path_GREP" --version 2>&1` in >+@@ -3595,7 +3617,7 @@ >+ for ac_prog in egrep; do >+ for ac_exec_ext in '' $ac_executable_extensions; do >+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" >+- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue >++ as_fn_executable_p "$ac_path_EGREP" || continue >+ # Check for GNU ac_path_EGREP and select it if it is found. >+ # Check for GNU $ac_path_EGREP >+ case `"$ac_path_EGREP" --version 2>&1` in >+@@ -3802,8 +3824,8 @@ >+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >+ /* end confdefs.h. */ >+ >+-# define __EXTENSIONS__ 1 >+- $ac_includes_default >++# define __EXTENSIONS__ 1 >++ $ac_includes_default >+ int >+ main () >+ { >+@@ -3857,7 +3879,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_CC="${ac_tool_prefix}gcc" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -3897,7 +3919,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_CC="gcc" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -3950,7 +3972,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_CC="${ac_tool_prefix}cc" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -3991,7 +4013,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then >+ ac_prog_rejected=yes >+ continue >+@@ -4049,7 +4071,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -4093,7 +4115,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_CC="$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -4289,8 +4311,7 @@ >+ /* end confdefs.h. */ >+ #include <stdarg.h> >+ #include <stdio.h> >+-#include <sys/types.h> >+-#include <sys/stat.h> >++struct stat; >+ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ >+ struct buf { int x; }; >+ FILE * (*rcsopen) (struct buf *, struct stat *, int); >+@@ -4624,11 +4645,11 @@ >+ int >+ main () >+ { >+-/* FIXME: Include the comments suggested by Paul. */ >++ >+ #ifndef __cplusplus >+- /* Ultrix mips cc rejects this. */ >++ /* Ultrix mips cc rejects this sort of thing. */ >+ typedef int charset[2]; >+- const charset cs; >++ const charset cs = { 0, 0 }; >+ /* SunOS 4.1.1 cc rejects this. */ >+ char const *const *pcpcc; >+ char **ppc; >+@@ -4645,8 +4666,9 @@ >+ ++pcpcc; >+ ppc = (char**) pcpcc; >+ pcpcc = (char const *const *) ppc; >+- { /* SCO 3.2v4 cc rejects this. */ >+- char *t; >++ { /* SCO 3.2v4 cc rejects this sort of thing. */ >++ char tx; >++ char *t = &tx; >+ char const *s = 0 ? (char *) 0 : (char const *) 0; >+ >+ *t++ = 0; >+@@ -4662,10 +4684,10 @@ >+ iptr p = 0; >+ ++p; >+ } >+- { /* AIX XL C 1.02.0.0 rejects this saying >++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying >+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ >+- struct s { int j; const int *ap[3]; }; >+- struct s *b; b->j = 5; >++ struct s { int j; const int *ap[3]; } bx; >++ struct s *b = &bx; b->j = 5; >+ } >+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ >+ const int foo = 10; >+@@ -5482,7 +5504,7 @@ >+ >+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_POSIX_C_SOURCE=200112 as a flag for $CC" >&5 >+ $as_echo_n "checking whether we need -D_POSIX_C_SOURCE=200112 as a flag for $CC... " >&6; } >+-cache=`$as_echo "-D_POSIX_C_SOURCE=200112" | $as_tr_sh` >++cache=_D_POSIX_C_SOURCE_200112 >+ if eval \${cv_prog_cc_flag_needed_$cache+:} false; then : >+ $as_echo_n "(cached) " >&6 >+ else >+@@ -5785,7 +5807,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_doxygen="doxygen" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -6034,7 +6056,7 @@ >+ fi >+ >+ # check for python >+-PYTHON_X_CFLAGS="" >++PYTHON_X_CFLAGS="-L/usr/local/lib" >+ ldns_with_pyldns=no >+ ldns_with_pyldnsx=no >+ >+@@ -6083,11 +6105,12 @@ >+ # LICENSE >+ # >+ # Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de> >+-# Copyright (c) 2009 Alan W. Irwin <irwin@beluga.phys.uvic.ca> >++# Copyright (c) 2009 Alan W. Irwin >+ # Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net> >+-# Copyright (c) 2009 Andrew Collier <colliera@ukzn.ac.za> >++# Copyright (c) 2009 Andrew Collier >+ # Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org> >+ # Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org> >++# Copyright (c) 2013 Daniel Mullner <muellner@math.stanford.edu> >+ # >+ # This program is free software: you can redistribute it and/or modify it >+ # under the terms of the GNU General Public License as published by the >+@@ -6115,7 +6138,7 @@ >+ # modified version of the Autoconf Macro, you may extend this special >+ # exception to the GPL to apply to your modified version as well. >+ >+-#serial 8 >++#serial 16 >+ >+ # This is what autoupdate's m4 run will expand. It fires >+ # the warning (with _au_warn_XXX), outputs it into the >+@@ -6163,7 +6186,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -6273,8 +6296,14 @@ >+ if test -z "$PYTHON_CPPFLAGS"; then >+ python_path=`$PYTHON -c "import distutils.sysconfig; \ >+ print (distutils.sysconfig.get_python_inc ());"` >++ plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ >++ print (distutils.sysconfig.get_python_inc (plat_specific=1));"` >+ if test -n "${python_path}"; then >+- python_path="-I$python_path" >++ if test "${plat_python_path}" != "${python_path}"; then >++ python_path="-I$python_path -I$plat_python_path" >++ else >++ python_path="-I$python_path" >++ fi >+ fi >+ PYTHON_CPPFLAGS=$python_path >+ fi >+@@ -6295,13 +6324,10 @@ >+ # join all versioning strings, on some systems >+ # major/minor numbers could be in different list elements >+ from distutils.sysconfig import * >+-ret = '' >+-for e in get_config_vars ('VERSION'): >+- if (e != None): >+- ret += e >+-print (ret) >+-EOD >+-` >++e = get_config_var('VERSION') >++if e is not None: >++ print(e) >++EOD` >+ >+ if test -z "$ac_python_version"; then >+ if test -n "$PYTHON_VERSION"; then >+@@ -6324,34 +6350,27 @@ >+ >+ # There should be only one >+ import distutils.sysconfig >+-for e in distutils.sysconfig.get_config_vars ('LIBDIR'): >+- if e != None: >+- print (e) >+- break >+-EOD >+-` >+- >+- # Before checking for libpythonX.Y, we need to know >+- # the extension the OS we're on uses for libraries >+- # (we take the first one, if there's more than one fix me!): >+- ac_python_soext=`$PYTHON -c \ >+- "import distutils.sysconfig; \ >+- print (distutils.sysconfig.get_config_vars('SO')[0])"` >++e = distutils.sysconfig.get_config_var('LIBDIR') >++if e is not None: >++ print (e) >++EOD` >+ >+ # Now, for the library: >+- ac_python_soname=`$PYTHON -c \ >+- "import distutils.sysconfig; \ >+- print (distutils.sysconfig.get_config_vars('LDLIBRARY')[0])"` >++ ac_python_library=`cat<<EOD | $PYTHON - >+ >+- # Strip away extension from the end to canonicalize its name: >+- ac_python_library=`echo "$ac_python_soname" | sed "s/${ac_python_soext}$//"` >++import distutils.sysconfig >++c = distutils.sysconfig.get_config_vars() >++if 'LDVERSION' in c: >++ print ('python'+c['LDVERSION']) >++else: >++ print ('python'+c['VERSION']) >++EOD` >+ >+ # This small piece shamelessly adapted from PostgreSQL python macro; >+ # credits goes to momjian, I think. I'd like to put the right name >+ # in the credits, if someone can point me in the right direction... ? >+ # >+- if test -n "$ac_python_libdir" -a -n "$ac_python_library" \ >+- -a x"$ac_python_library" != x"$ac_python_soname" >++ if test -n "$ac_python_libdir" -a -n "$ac_python_library" >+ then >+ # use the official shared library >+ ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` >+@@ -6383,7 +6402,7 @@ >+ $as_echo_n "checking for Python site-packages path... " >&6; } >+ if test -z "$PYTHON_SITE_PKG"; then >+ PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ >+- print (distutils.sysconfig.get_python_lib(1,0));"` >++ print (distutils.sysconfig.get_python_lib(0,0));"` >+ fi >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_SITE_PKG" >&5 >+ $as_echo "$PYTHON_SITE_PKG" >&6; } >+@@ -6397,7 +6416,7 @@ >+ if test -z "$PYTHON_EXTRA_LIBS"; then >+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ >+ conf = distutils.sysconfig.get_config_var; \ >+- print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"` >++ print (conf('LIBS'))"` >+ fi >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 >+ $as_echo "$PYTHON_EXTRA_LIBS" >&6; } >+@@ -6598,7 +6617,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -6717,7 +6736,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -7042,7 +7061,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -7085,7 +7104,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_path_ac_pt_AR="$as_dir/$ac_word$ac_exec_ext" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -7241,7 +7260,7 @@ >+ for ac_prog in sed gsed; do >+ for ac_exec_ext in '' $ac_executable_extensions; do >+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" >+- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue >++ as_fn_executable_p "$ac_path_SED" || continue >+ # Check for GNU ac_path_SED and select it if it is found. >+ # Check for GNU $ac_path_SED >+ case `"$ac_path_SED" --version 2>&1` in >+@@ -7320,7 +7339,7 @@ >+ for ac_prog in fgrep; do >+ for ac_exec_ext in '' $ac_executable_extensions; do >+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" >+- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue >++ as_fn_executable_p "$ac_path_FGREP" || continue >+ # Check for GNU ac_path_FGREP and select it if it is found. >+ # Check for GNU $ac_path_FGREP >+ case `"$ac_path_FGREP" --version 2>&1` in >+@@ -7576,7 +7595,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -7620,7 +7639,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8044,7 +8063,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8084,7 +8103,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_OBJDUMP="objdump" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8256,7 +8275,7 @@ >+ lt_cv_deplibs_check_method=pass_all >+ ;; >+ >+-netbsd* | netbsdelf*-gnu) >++netbsd*) >+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then >+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' >+ else >+@@ -8390,7 +8409,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8430,7 +8449,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8533,7 +8552,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8577,7 +8596,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_AR="$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8702,7 +8721,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8742,7 +8761,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_STRIP="strip" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8801,7 +8820,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8841,7 +8860,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_RANLIB="ranlib" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -8945,7 +8964,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_AWK="$ac_prog" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9532,7 +9551,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9572,7 +9591,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9652,7 +9671,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9692,7 +9711,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9744,7 +9763,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9784,7 +9803,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_NMEDIT="nmedit" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9836,7 +9855,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_LIPO="${ac_tool_prefix}lipo" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9876,7 +9895,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_LIPO="lipo" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9928,7 +9947,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_OTOOL="${ac_tool_prefix}otool" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -9968,7 +9987,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_OTOOL="otool" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -10020,7 +10039,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -10060,7 +10079,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_OTOOL64="otool64" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -11429,9 +11448,6 @@ >+ openbsd*) >+ with_gnu_ld=no >+ ;; >+- linux* | k*bsd*-gnu | gnu*) >+- link_all_deplibs=no >+- ;; >+ esac >+ >+ ld_shlibs=yes >+@@ -11653,7 +11669,7 @@ >+ fi >+ ;; >+ >+- netbsd* | netbsdelf*-gnu) >++ netbsd*) >+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then >+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' >+ wlarc= >+@@ -11830,7 +11846,6 @@ >+ if test "$aix_use_runtimelinking" = yes; then >+ shared_flag="$shared_flag "'${wl}-G' >+ fi >+- link_all_deplibs=no >+ else >+ # not using gcc >+ if test "$host_cpu" = ia64; then >+@@ -12284,7 +12299,7 @@ >+ link_all_deplibs=yes >+ ;; >+ >+- netbsd* | netbsdelf*-gnu) >++ netbsd*) >+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then >+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out >+ else >+@@ -13312,18 +13327,6 @@ >+ dynamic_linker='GNU/Linux ld.so' >+ ;; >+ >+-netbsdelf*-gnu) >+- version_type=linux >+- need_lib_prefix=no >+- need_version=no >+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' >+- soname_spec='${libname}${release}${shared_ext}$major' >+- shlibpath_var=LD_LIBRARY_PATH >+- shlibpath_overrides_runpath=no >+- hardcode_into_libs=yes >+- dynamic_linker='NetBSD ld.elf_so' >+- ;; >+- >+ netbsd*) >+ version_type=sunos >+ need_lib_prefix=no >+@@ -15112,60 +15115,60 @@ >+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext >+ /* end confdefs.h. */ >+ >+-#include <stdbool.h> >+-#ifndef bool >+- "error: bool is not defined" >+-#endif >+-#ifndef false >+- "error: false is not defined" >+-#endif >+-#if false >+- "error: false is not 0" >+-#endif >+-#ifndef true >+- "error: true is not defined" >+-#endif >+-#if true != 1 >+- "error: true is not 1" >+-#endif >+-#ifndef __bool_true_false_are_defined >+- "error: __bool_true_false_are_defined is not defined" >+-#endif >++ #include <stdbool.h> >++ #ifndef bool >++ "error: bool is not defined" >++ #endif >++ #ifndef false >++ "error: false is not defined" >++ #endif >++ #if false >++ "error: false is not 0" >++ #endif >++ #ifndef true >++ "error: true is not defined" >++ #endif >++ #if true != 1 >++ "error: true is not 1" >++ #endif >++ #ifndef __bool_true_false_are_defined >++ "error: __bool_true_false_are_defined is not defined" >++ #endif >+ >+- struct s { _Bool s: 1; _Bool t; } s; >++ struct s { _Bool s: 1; _Bool t; } s; >+ >+- char a[true == 1 ? 1 : -1]; >+- char b[false == 0 ? 1 : -1]; >+- char c[__bool_true_false_are_defined == 1 ? 1 : -1]; >+- char d[(bool) 0.5 == true ? 1 : -1]; >+- /* See body of main program for 'e'. */ >+- char f[(_Bool) 0.0 == false ? 1 : -1]; >+- char g[true]; >+- char h[sizeof (_Bool)]; >+- char i[sizeof s.t]; >+- enum { j = false, k = true, l = false * true, m = true * 256 }; >+- /* The following fails for >+- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ >+- _Bool n[m]; >+- char o[sizeof n == m * sizeof n[0] ? 1 : -1]; >+- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; >+- /* Catch a bug in an HP-UX C compiler. See >+- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html >+- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html >+- */ >+- _Bool q = true; >+- _Bool *pq = &q; >++ char a[true == 1 ? 1 : -1]; >++ char b[false == 0 ? 1 : -1]; >++ char c[__bool_true_false_are_defined == 1 ? 1 : -1]; >++ char d[(bool) 0.5 == true ? 1 : -1]; >++ /* See body of main program for 'e'. */ >++ char f[(_Bool) 0.0 == false ? 1 : -1]; >++ char g[true]; >++ char h[sizeof (_Bool)]; >++ char i[sizeof s.t]; >++ enum { j = false, k = true, l = false * true, m = true * 256 }; >++ /* The following fails for >++ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ >++ _Bool n[m]; >++ char o[sizeof n == m * sizeof n[0] ? 1 : -1]; >++ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; >++ /* Catch a bug in an HP-UX C compiler. See >++ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html >++ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html >++ */ >++ _Bool q = true; >++ _Bool *pq = &q; >+ >+ int >+ main () >+ { >+ >+- bool e = &s; >+- *pq |= q; >+- *pq |= ! q; >+- /* Refer to every declared value, to avoid compiler optimizations. */ >+- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l >+- + !m + !n + !o + !p + !q + !pq); >++ bool e = &s; >++ *pq |= q; >++ *pq |= ! q; >++ /* Refer to every declared value, to avoid compiler optimizations. */ >++ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l >++ + !m + !n + !o + !p + !q + !pq); >+ >+ ; >+ return 0; >+@@ -15180,7 +15183,7 @@ >+ fi >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 >+ $as_echo "$ac_cv_header_stdbool_h" >&6; } >+-ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" >++ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" >+ if test "x$ac_cv_type__Bool" = xyes; then : >+ >+ cat >>confdefs.h <<_ACEOF >+@@ -15190,6 +15193,7 @@ >+ >+ fi >+ >++ >+ if test $ac_cv_header_stdbool_h = yes; then >+ >+ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h >+@@ -15520,7 +15524,8 @@ >+ main () >+ { >+ static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; >+-test_array [0] = 0 >++test_array [0] = 0; >++return test_array [0]; >+ >+ ; >+ return 0; >+@@ -16336,7 +16341,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_WINDRES="${ac_tool_prefix}windres" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -16376,7 +16381,7 @@ >+ IFS=$as_save_IFS >+ test -z "$as_dir" && as_dir=. >+ for ac_exec_ext in '' $ac_executable_extensions; do >+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then >++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then >+ ac_cv_prog_ac_ct_WINDRES="windres" >+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 >+ break 2 >+@@ -17070,16 +17075,16 @@ >+ # ... but there are two gotchas: >+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. >+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. >+- # In both cases, we have to default to `cp -p'. >++ # In both cases, we have to default to `cp -pR'. >+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || >+- as_ln_s='cp -p' >++ as_ln_s='cp -pR' >+ elif ln conf$$.file conf$$ 2>/dev/null; then >+ as_ln_s=ln >+ else >+- as_ln_s='cp -p' >++ as_ln_s='cp -pR' >+ fi >+ else >+- as_ln_s='cp -p' >++ as_ln_s='cp -pR' >+ fi >+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file >+ rmdir conf$$.dir 2>/dev/null >+@@ -17139,28 +17144,16 @@ >+ as_mkdir_p=false >+ fi >+ >+-if test -x / >/dev/null 2>&1; then >+- as_test_x='test -x' >+-else >+- if ls -dL / >/dev/null 2>&1; then >+- as_ls_L_option=L >+- else >+- as_ls_L_option= >+- fi >+- as_test_x=' >+- eval sh -c '\'' >+- if test -d "$1"; then >+- test -d "$1/."; >+- else >+- case $1 in #( >+- -*)set "./$1";; >+- esac; >+- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( >+- ???[sx]*):;;*)false;;esac;fi >+- '\'' sh >+- ' >+-fi >+-as_executable_p=$as_test_x >++ >++# as_fn_executable_p FILE >++# ----------------------- >++# Test if FILE is an executable regular file. >++as_fn_executable_p () >++{ >++ test -f "$1" && test -x "$1" >++} # as_fn_executable_p >++as_test_x='test -x' >++as_executable_p=as_fn_executable_p >+ >+ # Sed expression to map a string onto a valid CPP name. >+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" >+@@ -17182,7 +17175,7 @@ >+ # values after options handling. >+ ac_log=" >+ This file was extended by ldns $as_me 1.6.16, which was >+-generated by GNU Autoconf 2.68. Invocation command line was >++generated by GNU Autoconf 2.69. Invocation command line was >+ >+ CONFIG_FILES = $CONFIG_FILES >+ CONFIG_HEADERS = $CONFIG_HEADERS >+@@ -17248,10 +17241,10 @@ >+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" >+ ac_cs_version="\\ >+ ldns config.status 1.6.16 >+-configured by $0, generated by GNU Autoconf 2.68, >++configured by $0, generated by GNU Autoconf 2.69, >+ with options \\"\$ac_cs_config\\" >+ >+-Copyright (C) 2010 Free Software Foundation, Inc. >++Copyright (C) 2012 Free Software Foundation, Inc. >+ This config.status script is free software; the Free Software Foundation >+ gives unlimited permission to copy, distribute and modify it." >+ >+@@ -17340,7 +17333,7 @@ >+ _ACEOF >+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 >+ if \$ac_cs_recheck; then >+- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion >++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion >+ shift >+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 >+ CONFIG_SHELL='$SHELL'
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 182183
: 136848 |
136849
|
136850
|
136851