3c3
< # Generated by GNU Autoconf 2.69 for unbound 1.4.22.
---
> # Generated by GNU Autoconf 2.69 for unbound 1.5.1.
593,594c593,594
< PACKAGE_VERSION='1.4.22'
< PACKAGE_STRING='unbound 1.4.22'
---
> PACKAGE_VERSION='1.5.1'
> PACKAGE_STRING='unbound 1.5.1'
634a635,636
> date
> version
638a641,645
> DNSTAP_OBJ
> DNSTAP_SRC
> opt_dnstap_socket_path
> ENABLE_DNSTAP
> PROTOC_C
642a650
> LIBOBJ_WITHOUT_CTIMEARC4
672,673d679
< PYTHON_EXTRA_LDFLAGS
< PYTHON_EXTRA_LIBS
825a832,835
> enable_dnstap
> with_dnstap_socket_path
> with_protobuf_c
> with_libfstrm
1380c1390
< \`configure' configures unbound 1.4.22 to adapt to many kinds of systems.
---
> \`configure' configures unbound 1.5.1 to adapt to many kinds of systems.
1445c1455
< short | recursive ) echo "Configuration of unbound 1.4.22:";;
---
> short | recursive ) echo "Configuration of unbound 1.5.1:";;
1482a1493
> --enable-dnstap Enable dnstap support (requires fstrm, protobuf-c)
1508,1509c1519,1520
< --with-sysroot=DIR Search for dependent libraries within DIR
< (or the compiler's sysroot if not specified).
---
> --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
> compiler's sysroot if not specified).
1526a1538,1541
> --with-dnstap-socket-path=pathname
> set default dnstap socket path
> --with-protobuf-c=path Path where protobuf-c is installed, for dnstap
> --with-libfstrm=path Path where libfstrm is installed, for dnstap
1615c1630
< unbound configure 1.4.22
---
> unbound configure 1.5.1
2324c2339
< It was created by unbound $as_me 1.4.22, which was
---
> It was created by unbound $as_me 1.5.1, which was
2674c2689
< UNBOUND_VERSION_MINOR=4
---
> UNBOUND_VERSION_MINOR=5
2676c2691
< UNBOUND_VERSION_MICRO=22
---
> UNBOUND_VERSION_MICRO=1
2679,2681c2694,2696
< LIBUNBOUND_CURRENT=4
< LIBUNBOUND_REVISION=1
< LIBUNBOUND_AGE=2
---
> LIBUNBOUND_CURRENT=5
> LIBUNBOUND_REVISION=3
> LIBUNBOUND_AGE=3
2717a2733,2735
> # 1.4.22 had 4:1:2
> # 1.5.0 had 5:3:3 # adds ub_ctx_add_ta_autr
> # 1.5.1 had 5:4:3
6540,6541c6558,6559
< macro_version='2.4.2'
< macro_revision='1.3337'
---
> macro_version='2.4.2.418'
> macro_revision='2.4.2.418'
6555c6573
< ltmain="$ac_aux_dir/ltmain.sh"
---
> ltmain=$ac_aux_dir/ltmain.sh
6604c6622
< case "$ECHO" in
---
> case $ECHO in
6797c6815
< withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
---
> withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
6803c6821
< if test "$GCC" = yes; then
---
> if test yes = "$GCC"; then
6809c6827
< # gcc leaves a trailing carriage return which upsets mingw
---
> # gcc leaves a trailing carriage return, which upsets mingw
6823c6841
< test -z "$LD" && LD="$ac_prog"
---
> test -z "$LD" && LD=$ac_prog
6834c6852
< elif test "$with_gnu_ld" = yes; then
---
> elif test yes = "$with_gnu_ld"; then
6845c6863
< lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
---
> lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
6847c6865
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
6850c6868
< lt_cv_path_LD="$ac_dir/$ac_prog"
---
> lt_cv_path_LD=$ac_dir/$ac_prog
6856c6874
< test "$with_gnu_ld" != no && break
---
> test no != "$with_gnu_ld" && break
6859c6877
< test "$with_gnu_ld" != yes && break
---
> test yes != "$with_gnu_ld" && break
6864c6882
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
6866c6884
< lt_cv_path_LD="$LD" # Let the user override the test with a path.
---
> lt_cv_path_LD=$LD # Let the user override the test with a path.
6870c6888
< LD="$lt_cv_path_LD"
---
> LD=$lt_cv_path_LD
6913c6931
< lt_cv_path_NM="$NM"
---
> lt_cv_path_NM=$NM
6915c6933
< lt_nm_to_check="${ac_tool_prefix}nm"
---
> lt_nm_to_check=${ac_tool_prefix}nm
6920c6938
< lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
---
> lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
6922c6940
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
6924,6925c6942,6943
< tmp_nm="$ac_dir/$lt_tmp_nm"
< if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
---
> tmp_nm=$ac_dir/$lt_tmp_nm
> if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
6927c6945
< # Adding the `sed 1q' prevents false positives on HP-UX, which says:
---
> # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
6933c6951
< break
---
> break 2
6939c6957
< break
---
> break 2
6950c6968
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
6957,6958c6975,6976
< if test "$lt_cv_path_NM" != "no"; then
< NM="$lt_cv_path_NM"
---
> if test no != "$lt_cv_path_NM"; then
> NM=$lt_cv_path_NM
7064c7082
< case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
---
> case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
7066c7084
< DUMPBIN="$DUMPBIN -symbols"
---
> DUMPBIN="$DUMPBIN -symbols -headers"
7074,7075c7092,7093
< if test "$DUMPBIN" != ":"; then
< NM="$DUMPBIN"
---
> if test : != "$DUMPBIN"; then
> NM=$DUMPBIN
7126c7144
< teststring="ABCD"
---
> teststring=ABCD
7166c7184
< netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
---
> bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
7216c7234,7235
< if test -n "$lt_cv_sys_max_cmd_len"; then
---
> if test -n "$lt_cv_sys_max_cmd_len" && \
> test undefined != "$lt_cv_sys_max_cmd_len"; then
7222c7241
< for i in 1 2 3 4 5 6 7 8 ; do
---
> for i in 1 2 3 4 5 6 7 8; do
7229c7248
< while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
---
> while { test X`env echo "$teststring$teststring" 2>/dev/null` \
7231c7250
< test $i != 17 # 1/2 MB should be enough
---
> test 17 != "$i" # 1/2 MB should be enough
7249c7268
< if test -n $lt_cv_sys_max_cmd_len ; then
---
> if test -n "$lt_cv_sys_max_cmd_len"; then
7267,7290d7285
< { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
< $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
< # Try some XSI features
< xsi_shell=no
< ( _lt_dummy="a/b/c"
< test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
< = c,a/b,b/c, \
< && eval 'test $(( 1 + 1 )) -eq 2 \
< && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
< && xsi_shell=yes
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
< $as_echo "$xsi_shell" >&6; }
<
<
< { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
< $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
< lt_shell_append=no
< ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
< >/dev/null 2>&1 \
< && lt_shell_append=yes
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
< $as_echo "$lt_shell_append" >&6; }
<
<
7413c7408
< if test "$GCC" != yes; then
---
> if test yes != "$GCC"; then
7418,7419c7413,7414
< if test "$GCC" = yes; then
< reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
---
> if test yes = "$GCC"; then
> reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
7547c7542
< # `unknown' -- same as none, but documents that we really don't know.
---
> # 'unknown' -- same as none, but documents that we really don't know.
7551,7553c7546,7548
< # which responds to the $file_magic_cmd with a given extended regex.
< # If you have `file' or equivalent on your system and you're not sure
< # whether `pass_all' will *always* work, you probably want this one.
---
> # that responds to the $file_magic_cmd with a given extended regex.
> # If you have 'file' or equivalent on your system and you're not sure
> # whether 'pass_all' will *always* work, you probably want this one.
7580,7581c7575
< # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
< if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
---
> if ( file / ) >/dev/null 2>&1; then
7617,7620d7610
< gnu*)
< lt_cv_deplibs_check_method=pass_all
< ;;
<
7659c7649
< linux* | k*bsd*-gnu | kopensolaris*-gnu)
---
> linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
7681,7682c7671,7672
< openbsd*)
< if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
---
> openbsd* | bitrig*)
> if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
7892,7893c7882,7883
< # two different shell functions defined in ltmain.sh
< # decide which to use based on capabilities of $DLLTOOL
---
> # two different shell functions defined in ltmain.sh;
> # decide which one to use based on capabilities of $DLLTOOL
7905c7895
< lt_cv_sharedlib_from_linklib_cmd="$ECHO"
---
> lt_cv_sharedlib_from_linklib_cmd=$ECHO
8059c8049
< if test "$ac_status" -eq 0; then
---
> if test 0 -eq "$ac_status"; then
8067c8057
< if test "$ac_status" -ne 0; then
---
> if test 0 -ne "$ac_status"; then
8080c8070
< if test "x$lt_cv_ar_at_file" = xno; then
---
> if test no = "$lt_cv_ar_at_file"; then
8297c8287
< openbsd*)
---
> bitrig* | openbsd*)
8429c8419
< if test "$host_cpu" = ia64; then
---
> if test ia64 = "$host_cpu"; then
8461a8452,8468
> if test "$lt_cv_nm_interface" = "MS dumpbin"; then
> # Gets list of data symbols to import.
> lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
> # Adjust the below global symbol transforms to fixup imported variables.
> lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
> lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
> lt_c_name_lib_hook="\
> -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
> -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
> else
> # Disable hooks by default.
> lt_cv_sys_global_symbol_to_import=
> lt_cdecl_hook=
> lt_c_name_hook=
> lt_c_name_lib_hook=
> fi
>
8465c8472,8475
< lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
---
> lt_cv_sys_global_symbol_to_cdecl="sed -n"\
> $lt_cdecl_hook\
> " -e 's/^T .* \(.*\)$/extern int \1();/p'"\
> " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
8468,8469c8478,8481
< lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
< lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
---
> lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
> $lt_c_name_hook\
> " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
> " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
8470a8483,8490
> # Transform an extracted symbol line into symbol name with lib prefix and
> # symbol address.
> lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
> $lt_c_name_lib_hook\
> " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
> " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
> " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
>
8487,8488c8507,8508
< # Fake it for dumpbin and say T for any non-static function
< # and D for any global variable.
---
> # Fake it for dumpbin and say T for any non-static function,
> # D for any global variable and I for any imported variable.
8494a8515,8517
> " /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
> " /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
> " /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
8498,8501c8521,8524
< " {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
< " {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
< " s[1]~/^[@?]/{print s[1], s[1]; next};"\
< " s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
---
> " {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
> " {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
> " s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
> " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
8549,8550c8572,8573
< #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
< /* DATA imports from DLLs on WIN32 con't be const, because runtime
---
> #if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
> /* DATA imports from DLLs on WIN32 can't be const, because runtime
8553c8576
< #elif defined(__osf__)
---
> #elif defined __osf__
8579c8602
< $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
---
> $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
8599c8622
< LIBS="conftstm.$ac_objext"
---
> LIBS=conftstm.$ac_objext
8605c8628
< test $ac_status = 0; } && test -s conftest${ac_exeext}; then
---
> test $ac_status = 0; } && test -s conftest$ac_exeext; then
8626c8649
< if test "$pipe_works" = yes; then
---
> if test yes = "$pipe_works"; then
8678a8702,8711
>
>
>
>
>
>
>
>
>
>
8691c8724
< case ${with_sysroot} in #(
---
> case $with_sysroot in #(
8693c8726
< if test "$GCC" = yes; then
---
> if test yes = "$GCC"; then
8703,8704c8736,8737
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
< $as_echo "${with_sysroot}" >&6; }
---
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
> $as_echo "$with_sysroot" >&6; }
8721c8754
< test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
---
> test no = "$enable_libtool_lock" || enable_libtool_lock=yes
8727c8760,8761
< # Find out which ABI we are using.
---
> # Find out what ABI is being produced by ac_compile, and set mode
> # options accordingly.
8736c8770
< HPUX_IA64_MODE="32"
---
> HPUX_IA64_MODE=32
8739c8773
< HPUX_IA64_MODE="64"
---
> HPUX_IA64_MODE=64
8746c8780,8781
< # Find out which ABI we are using.
---
> # Find out what ABI is being produced by ac_compile, and set linker
> # options accordingly.
8753c8788
< if test "$lt_cv_prog_gnu_ld" = yes; then
---
> if test yes = "$lt_cv_prog_gnu_ld"; then
8782c8817,8853
< x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
---
> mips64*-*linux*)
> # Find out what ABI is being produced by ac_compile, and set linker
> # options accordingly.
> echo '#line '$LINENO' "configure"' > conftest.$ac_ext
> if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
> (eval $ac_compile) 2>&5
> ac_status=$?
> $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> test $ac_status = 0; }; then
> emul=elf
> case `/usr/bin/file conftest.$ac_objext` in
> *32-bit*)
> emul="${emul}32"
> ;;
> *64-bit*)
> emul="${emul}64"
> ;;
> esac
> case `/usr/bin/file conftest.$ac_objext` in
> *MSB*)
> emul="${emul}btsmip"
> ;;
> *LSB*)
> emul="${emul}ltsmip"
> ;;
> esac
> case `/usr/bin/file conftest.$ac_objext` in
> *N32*)
> emul="${emul}n32"
> ;;
> esac
> LD="${LD-ld} -m $emul"
> fi
> rm -rf conftest*
> ;;
>
> x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
8784c8855,8860
< # Find out which ABI we are using.
---
> # Find out what ABI is being produced by ac_compile, and set linker
> # options accordingly. Note that the listed cases only cover the
> # situations where additional linker options are needed (such as when
> # doing 32-bit compilation for a host where ld defaults to 64-bit, or
> # vice versa); the common cases where no linker options are needed do
> # not appear in the list.
8798c8874,8881
< LD="${LD-ld} -m elf_i386"
---
> case `/usr/bin/file conftest.o` in
> *x86-64*)
> LD="${LD-ld} -m elf32_x86_64"
> ;;
> *)
> LD="${LD-ld} -m elf_i386"
> ;;
> esac
8800c8883,8886
< ppc64-*linux*|powerpc64-*linux*)
---
> powerpc64le-*linux*)
> LD="${LD-ld} -m elf32lppclinux"
> ;;
> powerpc64-*linux*)
8819c8905,8908
< ppc*-*linux*|powerpc*-*linux*)
---
> powerpcle-*linux*)
> LD="${LD-ld} -m elf64lppc"
> ;;
> powerpc-*linux*)
8837c8926
< SAVE_CFLAGS="$CFLAGS"
---
> SAVE_CFLAGS=$CFLAGS
8877c8966
< if test x"$lt_cv_cc_needs_belf" != x"yes"; then
---
> if test yes != "$lt_cv_cc_needs_belf"; then
8879c8968
< CFLAGS="$SAVE_CFLAGS"
---
> CFLAGS=$SAVE_CFLAGS
8883c8972,8973
< # Find out which ABI we are using.
---
> # Find out what ABI is being produced by ac_compile, and set linker
> # options accordingly.
8895c8985
< i?86-*-solaris*)
---
> i?86-*-solaris*|x86_64-*-solaris*)
8904c8994
< LD="${LD-ld}_sol2"
---
> LD=${LD-ld}_sol2
8920c9010
< need_locks="$enable_libtool_lock"
---
> need_locks=$enable_libtool_lock
9031c9121
< if test "x$lt_cv_path_mainfest_tool" != xyes; then
---
> if test yes != "$lt_cv_path_mainfest_tool"; then
9534c9624
< if test -z "${LT_MULTI_MODULE}"; then
---
> if test -z "$LT_MULTI_MODULE"; then
9552c9642
< elif test -f libconftest.dylib && test $_lt_result -eq 0; then
---
> elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
9591c9681
< LDFLAGS="$save_LDFLAGS"
---
> LDFLAGS=$save_LDFLAGS
9620c9710
< elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
---
> elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
9633c9723
< _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
---
> _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
9635c9725
< _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
---
> _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
9642c9732
< _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
---
> _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
9644c9734
< _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
---
> _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
9646c9736
< _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
---
> _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
9650c9740
< if test "$lt_cv_apple_cc_single_mod" = "yes"; then
---
> if test yes = "$lt_cv_apple_cc_single_mod"; then
9653,9654c9743,9744
< if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
< _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
---
> if test yes = "$lt_cv_ld_exported_symbols_list"; then
> _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
9656c9746
< _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
---
> _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
9658c9748
< if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
---
> if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
9704c9794
< lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
---
> lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
9706c9796
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9711c9801
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9735c9825
< lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
---
> lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
9737c9827
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9742c9832
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9766c9856
< lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
---
> lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
9768c9858
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9773c9863
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9781d9870
< test -z "$pic_mode" && pic_mode=default
9788d9876
<
9798c9886
< lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
---
> lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
9800c9888
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9805c9893
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9823c9911
< LIBTOOL_DEPS="$ltmain"
---
> LIBTOOL_DEPS=$ltmain
9872c9960
< if test -n "${ZSH_VERSION+set}" ; then
---
> if test -n "${ZSH_VERSION+set}"; then
9911c9999
< if test "X${COLLECT_NAMES+set}" != Xset; then
---
> if test set != "${COLLECT_NAMES+set}"; then
9922c10010
< # All known linkers require a `.a' archive for static linking (except MSVC,
---
> # All known linkers require a '.a' archive for static linking (except MSVC,
9926c10014
< with_gnu_ld="$lt_cv_prog_gnu_ld"
---
> with_gnu_ld=$lt_cv_prog_gnu_ld
9928,9929c10016,10017
< old_CC="$CC"
< old_CFLAGS="$CFLAGS"
---
> old_CC=$CC
> old_CFLAGS=$CFLAGS
9961c10049
< lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
---
> lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
9964,9965c10052,10053
< lt_save_MAGIC_CMD="$MAGIC_CMD"
< lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
---
> lt_save_MAGIC_CMD=$MAGIC_CMD
> lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
9968c10056
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
9970,9971c10058,10059
< if test -f $ac_dir/${ac_tool_prefix}file; then
< lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
---
> if test -f "$ac_dir/${ac_tool_prefix}file"; then
> lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
9976c10064
< MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
---
> MAGIC_CMD=$lt_cv_path_MAGIC_CMD
9999,10000c10087,10088
< IFS="$lt_save_ifs"
< MAGIC_CMD="$lt_save_MAGIC_CMD"
---
> IFS=$lt_save_ifs
> MAGIC_CMD=$lt_save_MAGIC_CMD
10005c10093
< MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
---
> MAGIC_CMD=$lt_cv_path_MAGIC_CMD
10027c10115
< lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
---
> lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
10030,10031c10118,10119
< lt_save_MAGIC_CMD="$MAGIC_CMD"
< lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
---
> lt_save_MAGIC_CMD=$MAGIC_CMD
> lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
10034c10122
< IFS="$lt_save_ifs"
---
> IFS=$lt_save_ifs
10036,10037c10124,10125
< if test -f $ac_dir/file; then
< lt_cv_path_MAGIC_CMD="$ac_dir/file"
---
> if test -f "$ac_dir/file"; then
> lt_cv_path_MAGIC_CMD=$ac_dir/"file"
10042c10130
< MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
---
> MAGIC_CMD=$lt_cv_path_MAGIC_CMD
10065,10066c10153,10154
< IFS="$lt_save_ifs"
< MAGIC_CMD="$lt_save_MAGIC_CMD"
---
> IFS=$lt_save_ifs
> MAGIC_CMD=$lt_save_MAGIC_CMD
10071c10159
< MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
---
> MAGIC_CMD=$lt_cv_path_MAGIC_CMD
10092c10180
< lt_save_CC="$CC"
---
> lt_save_CC=$CC
10150c10238
< if test "$GCC" = yes; then
---
> if test yes = "$GCC"; then
10166c10254
< lt_compiler_flag="-fno-rtti -fno-exceptions"
---
> lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
10196c10284
< if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
---
> if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
10214c10302
< if test "$GCC" = yes; then
---
> if test yes = "$GCC"; then
10221c10309
< if test "$host_cpu" = ia64; then
---
> if test ia64 = "$host_cpu"; then
10224a10313
> lt_prog_compiler_pic='-fPIC'
10235,10236c10324,10325
< # adding the `-m68020' flag to GCC prevents building anything better,
< # like `-m68040'.
---
> # adding the '-m68020' flag to GCC prevents building anything better,
> # like '-m68040'.
10322c10411
< if test "$host_cpu" = ia64; then
---
> if test ia64 = "$host_cpu"; then
10329a10419,10432
> darwin* | rhapsody*)
> # PIC is the default on this platform
> # Common symbols not allowed in MH_DYLIB files
> lt_prog_compiler_pic='-fno-common'
> case $cc_basename in
> nagfor*)
> # NAG Fortran compiler
> lt_prog_compiler_wl='-Wl,-Wl,,'
> lt_prog_compiler_pic='-PIC'
> lt_prog_compiler_static='-Bstatic'
> ;;
> esac
> ;;
>
10349c10452
< lt_prog_compiler_static='${wl}-a ${wl}archive'
---
> lt_prog_compiler_static='$wl-a ${wl}archive'
10358c10461
< linux* | k*bsd*-gnu | kopensolaris*-gnu)
---
> linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
10360c10463
< # old Intel for x86_64 which still supported -KPIC.
---
> # old Intel for x86_64, which still supported -KPIC.
10384a10488,10493
> tcc*)
> # Fabrice Bellard et al's Tiny C Compiler
> lt_prog_compiler_wl='-Wl,'
> lt_prog_compiler_pic='-fPIC'
> lt_prog_compiler_static='-static'
> ;;
10482c10591
< if test -d /usr/nec ;then
---
> if test -d /usr/nec; then
10511c10620
< # For platforms which do not support PIC, -DPIC is meaningless:
---
> # For platforms that do not support PIC, -DPIC is meaningless:
10543c10652
< lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
---
> lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
10573c10682
< if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
---
> if test yes = "$lt_cv_prog_compiler_pic_works"; then
10605c10714
< save_LDFLAGS="$LDFLAGS"
---
> save_LDFLAGS=$LDFLAGS
10624c10733
< LDFLAGS="$save_LDFLAGS"
---
> LDFLAGS=$save_LDFLAGS
10630c10739
< if test x"$lt_cv_prog_compiler_static_works" = xyes; then
---
> if test yes = "$lt_cv_prog_compiler_static_works"; then
10750,10751c10859,10860
< hard_links="nottested"
< if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
---
> hard_links=nottested
> if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
10763,10765c10872,10874
< if test "$hard_links" = no; then
< { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
< $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
---
> if test no = "$hard_links"; then
> { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
> $as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
10808,10810c10917,10919
< # it will be wrapped by ` (' and `)$', so one must not match beginning or
< # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
< # as well as any symbol that contains `d'.
---
> # it will be wrapped by ' (' and ')$', so one must not match beginning or
> # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
> # as well as any symbol that contains 'd'.
10825c10934
< if test "$GCC" != yes; then
---
> if test yes != "$GCC"; then
10833c10942
< openbsd*)
---
> openbsd* | bitrig*)
10843c10952
< if test "$with_gnu_ld" = yes; then
---
> if test yes = "$with_gnu_ld"; then
10865c10974
< if test "$lt_use_gnu_ld_interface" = yes; then
---
> if test yes = "$lt_use_gnu_ld_interface"; then
10867c10976
< wlarc='${wl}'
---
> wlarc='$wl'
10873,10874c10982,10983
< hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
< export_dynamic_flag_spec='${wl}--export-dynamic'
---
> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
> export_dynamic_flag_spec='$wl--export-dynamic'
10877c10986
< whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
---
> whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
10882c10991
< case `$LD -v 2>&1` in
---
> case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
10895c11004
< if test "$host_cpu" != ia64; then
---
> if test ia64 != "$host_cpu"; then
10914c11023
< archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
---
> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
10930c11039
< archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
---
> archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
10940c11049
< export_dynamic_flag_spec='${wl}--export-all-symbols'
---
> export_dynamic_flag_spec='$wl--export-all-symbols'
10948,10957c11057,11066
< archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
< # If the export-symbols file already is a .def file (1st line
< # is EXPORTS), use it as is; otherwise, prepend...
< archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
< cp $export_symbols $output_objdir/$soname.def;
< else
< echo EXPORTS > $output_objdir/$soname.def;
< cat $export_symbols >> $output_objdir/$soname.def;
< fi~
< $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
---
> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
> # If the export-symbols file already is a .def file, use it as
> # is; otherwise, prepend EXPORTS...
> archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
> cp $export_symbols $output_objdir/$soname.def;
> else
> echo EXPORTS > $output_objdir/$soname.def;
> cat $export_symbols >> $output_objdir/$soname.def;
> fi~
> $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
10964c11073
< archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
---
> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
10971,10972c11080,11081
< hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
< export_dynamic_flag_spec='${wl}-E'
---
> hardcode_libdir_flag_spec='$wl-rpath,$libdir'
> export_dynamic_flag_spec='$wl-E'
10979,10980c11088,11089
< archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
< archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
---
> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
> archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
10985c11094
< if test "$host_os" = linux-dietlibc; then
---
> if test linux-dietlibc = "$host_os"; then
10991c11100
< && test "$tmp_diet" = no
---
> && test no = "$tmp_diet"
10997c11106
< whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
---
> whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
11002c11111
< whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
---
> whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
11012a11122,11123
> nagfor*) # NAGFOR 5.3
> tmp_sharedflag='-Wl,-shared' ;;
11017c11128
< whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
---
> whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
11023c11134
< whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
---
> whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
11029c11140
< archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
---
> archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
11031c11142
< if test "x$supports_anon_versioning" = xyes; then
---
> if test yes = "$supports_anon_versioning"; then
11033,11035c11144,11146
< cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
< echo "local: *; };" >> $output_objdir/$libname.ver~
< $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
---
> cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
> echo "local: *; };" >> $output_objdir/$libname.ver~
> $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
11042c11153
< hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
---
> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
11044c11155
< if test "x$supports_anon_versioning" = xyes; then
---
> if test yes = "$supports_anon_versioning"; then
11046,11048c11157,11159
< cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
< echo "local: *; };" >> $output_objdir/$libname.ver~
< $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
---
> cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
> echo "local: *; };" >> $output_objdir/$libname.ver~
> $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
11062,11063c11173,11174
< archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
< archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
---
> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
> archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
11081,11082c11192,11193
< archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
< archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
---
> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
> archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
11094c11205
< *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
---
> *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
11109,11111c11220,11222
< hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
< archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
< archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
---
> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
> archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
11128,11129c11239,11240
< archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
< archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
---
> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
> archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
11136c11247
< if test "$ld_shlibs" = no; then
---
> if test no = "$ld_shlibs"; then
11152c11263
< if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
---
> if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
11160c11271
< if test "$host_cpu" = ia64; then
---
> if test ia64 = "$host_cpu"; then
11165c11276
< no_entry_flag=""
---
> no_entry_flag=
11183c11294
< if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
---
> if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
11206c11317
< file_list_spec='${wl}-f,'
---
> file_list_spec='$wl-f,'
11208c11319
< if test "$GCC" = yes; then
---
> if test yes = "$GCC"; then
11212c11323
< collect2name=`${CC} -print-prog-name=collect2`
---
> collect2name=`$CC -print-prog-name=collect2`
11231,11232c11342,11343
< if test "$aix_use_runtimelinking" = yes; then
< shared_flag="$shared_flag "'${wl}-G'
---
> if test yes = "$aix_use_runtimelinking"; then
> shared_flag="$shared_flag "'$wl-G'
11236c11347
< if test "$host_cpu" = ia64; then
---
> if test ia64 = "$host_cpu"; then
11241,11242c11352,11353
< if test "$aix_use_runtimelinking" = yes; then
< shared_flag='${wl}-G'
---
> if test yes = "$aix_use_runtimelinking"; then
> shared_flag='$wl-G'
11244c11355
< shared_flag='${wl}-bM:SRE'
---
> shared_flag='$wl-bM:SRE'
11249c11360
< export_dynamic_flag_spec='${wl}-bexpall'
---
> export_dynamic_flag_spec='$wl-bexpall'
11253c11364
< if test "$aix_use_runtimelinking" = yes; then
---
> if test yes = "$aix_use_runtimelinking"; then
11259c11370
< if test "${lt_cv_aix_libpath+set}" = set; then
---
> if test set = "${lt_cv_aix_libpath+set}"; then
11294c11405
< lt_cv_aix_libpath_="/usr/lib:/lib"
---
> lt_cv_aix_libpath_=/usr/lib:/lib
11302,11303c11413,11414
< hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
< archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
---
> hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
> archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
11305,11306c11416,11417
< if test "$host_cpu" = ia64; then
< hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
---
> if test ia64 = "$host_cpu"; then
> hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
11308c11419
< archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
---
> archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
11312c11423
< if test "${lt_cv_aix_libpath+set}" = set; then
---
> if test set = "${lt_cv_aix_libpath+set}"; then
11347c11458
< lt_cv_aix_libpath_="/usr/lib:/lib"
---
> lt_cv_aix_libpath_=/usr/lib:/lib
11355c11466
< hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
---
> hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
11358,11360c11469,11471
< no_undefined_flag=' ${wl}-bernotok'
< allow_undefined_flag=' ${wl}-berok'
< if test "$with_gnu_ld" = yes; then
---
> no_undefined_flag=' $wl-bernotok'
> allow_undefined_flag=' $wl-berok'
> if test yes = "$with_gnu_ld"; then
11362c11473
< whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
---
> whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
11369c11480
< archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
---
> archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
11378c11489
< archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
---
> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
11408c11519
< shrext_cmds=".dll"
---
> shrext_cmds=.dll
11410,11417c11521,11529
< archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
< archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
< sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
< else
< sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
< fi~
< $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
< linknames='
---
> archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
> archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
> cp "$export_symbols" "$output_objdir/$soname.def";
> echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
> else
> $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
> fi~
> $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
> linknames='
11426,11437c11538,11549
< lt_tool_outputfile="@TOOL_OUTPUT@"~
< case $lt_outputfile in
< *.exe|*.EXE) ;;
< *)
< lt_outputfile="$lt_outputfile.exe"
< lt_tool_outputfile="$lt_tool_outputfile.exe"
< ;;
< esac~
< if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
< $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
< $RM "$lt_outputfile.manifest";
< fi'
---
> lt_tool_outputfile="@TOOL_OUTPUT@"~
> case $lt_outputfile in
> *.exe|*.EXE) ;;
> *)
> lt_outputfile=$lt_outputfile.exe
> lt_tool_outputfile=$lt_tool_outputfile.exe
> ;;
> esac~
> if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
> $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
> $RM "$lt_outputfile.manifest";
> fi'
11446c11558
< shrext_cmds=".dll"
---
> shrext_cmds=.dll
11465,11466c11577,11578
< if test "$lt_cv_ld_force_load" = "yes"; then
< whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
---
> if test yes = "$lt_cv_ld_force_load"; then
> whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
11472c11584
< allow_undefined_flag="$_lt_dar_allow_undefined"
---
> allow_undefined_flag=$_lt_dar_allow_undefined
11474c11586
< ifort*) _lt_dar_can_shared=yes ;;
---
> ifort*|nagfor*) _lt_dar_can_shared=yes ;;
11477c11589
< if test "$_lt_dar_can_shared" = "yes"; then
---
> if test yes = "$_lt_dar_can_shared"; then
11479,11482c11591,11594
< archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
< module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
< archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
< module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
---
> archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
> module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
> archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
> module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
11524,11525c11636,11637
< if test "$GCC" = yes; then
< archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
---
> if test yes = "$GCC"; then
> archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
11527c11639
< archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
---
> archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
11529c11641
< hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
---
> hardcode_libdir_flag_spec='$wl+b $wl$libdir'
11536c11648
< export_dynamic_flag_spec='${wl}-E'
---
> export_dynamic_flag_spec='$wl-E'
11540,11541c11652,11653
< if test "$GCC" = yes && test "$with_gnu_ld" = no; then
< archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
---
> if test yes,no = "$GCC,$with_gnu_ld"; then
> archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11545,11546c11657,11658
< if test "$with_gnu_ld" = no; then
< hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
---
> if test no = "$with_gnu_ld"; then
> hardcode_libdir_flag_spec='$wl+b $wl$libdir'
11550c11662
< export_dynamic_flag_spec='${wl}-E'
---
> export_dynamic_flag_spec='$wl-E'
11558c11670
< if test "$GCC" = yes && test "$with_gnu_ld" = no; then
---
> if test yes,no = "$GCC,$with_gnu_ld"; then
11561c11673
< archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
11564c11676
< archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11567c11679
< archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11573c11685
< archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
11576c11688
< archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
11588c11700
< save_LDFLAGS="$LDFLAGS"
---
> save_LDFLAGS=$LDFLAGS
11607c11719
< LDFLAGS="$save_LDFLAGS"
---
> LDFLAGS=$save_LDFLAGS
11613,11614c11725,11726
< if test x"$lt_cv_prog_compiler__b" = xyes; then
< archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
---
> if test yes = "$lt_cv_prog_compiler__b"; then
> archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
11622,11623c11734,11735
< if test "$with_gnu_ld" = no; then
< hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
---
> if test no = "$with_gnu_ld"; then
> hardcode_libdir_flag_spec='$wl+b $wl$libdir'
11634c11746
< export_dynamic_flag_spec='${wl}-E'
---
> export_dynamic_flag_spec='$wl-E'
11645,11646c11757,11758
< if test "$GCC" = yes; then
< archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
---
> if test yes = "$GCC"; then
> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
11656,11657c11768,11769
< save_LDFLAGS="$LDFLAGS"
< LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
---
> save_LDFLAGS=$LDFLAGS
> LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
11669c11781
< LDFLAGS="$save_LDFLAGS"
---
> LDFLAGS=$save_LDFLAGS
11673,11674c11785,11786
< if test "$lt_cv_irix_exported_symbol" = yes; then
< archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
---
> if test yes = "$lt_cv_irix_exported_symbol"; then
> archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
11677,11678c11789,11790
< archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
< archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
---
> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
> archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
11681c11793
< hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
---
> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
11701c11813
< hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
---
> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
11709c11821
< openbsd*)
---
> openbsd* | bitrig*)
11714c11826
< if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
---
> if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
11716,11718c11828,11830
< archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
< hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
< export_dynamic_flag_spec='${wl}-E'
---
> archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
> hardcode_libdir_flag_spec='$wl-rpath,$libdir'
> export_dynamic_flag_spec='$wl-E'
11720,11729c11832,11833
< case $host_os in
< openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
< archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
< hardcode_libdir_flag_spec='-R$libdir'
< ;;
< *)
< archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
< hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
< ;;
< esac
---
> archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
> hardcode_libdir_flag_spec='$wl-rpath,$libdir'
11745,11747c11849,11851
< if test "$GCC" = yes; then
< allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
< archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
---
> if test yes = "$GCC"; then
> allow_undefined_flag=' $wl-expect_unresolved $wl\*'
> archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
11750c11854
< archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
---
> archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
11753c11857
< hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
---
> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
11758,11761c11862,11865
< if test "$GCC" = yes; then
< allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
< archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
< hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
---
> if test yes = "$GCC"; then
> allow_undefined_flag=' $wl-expect_unresolved $wl\*'
> archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
11764c11868
< archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
---
> archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
11766c11870
< $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
---
> $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
11777,11779c11881,11883
< if test "$GCC" = yes; then
< wlarc='${wl}'
< archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
---
> if test yes = "$GCC"; then
> wlarc='$wl'
> archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
11781c11885
< $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
---
> $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11786c11890
< archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
---
> archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
11788c11892
< $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
---
> $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
11791,11792c11895,11896
< wlarc='${wl}'
< archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
---
> wlarc='$wl'
> archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
11794c11898
< $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
---
> $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
11804c11908
< # but understands `-z linker_flag'. GCC discards it without `$wl',
---
> # but understands '-z linker_flag'. GCC discards it without '$wl',
11807,11808c11911,11912
< if test "$GCC" = yes; then
< whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
---
> if test yes = "$GCC"; then
> whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
11818c11922
< if test "x$host_vendor" = xsequent; then
---
> if test sequent = "$host_vendor"; then
11821c11925
< archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
11870c11974
< no_undefined_flag='${wl}-z,text'
---
> no_undefined_flag='$wl-z,text'
11875,11877c11979,11981
< if test "$GCC" = yes; then
< archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
< archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
---
> if test yes = "$GCC"; then
> archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
> archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11879,11880c11983,11984
< archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
< archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
> archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11885c11989
< # Note: We can NOT use -z defs as we might desire, because we do not
---
> # Note: We CANNOT use -z defs as we might desire, because we do not
11891,11892c11995,11996
< no_undefined_flag='${wl}-z,text'
< allow_undefined_flag='${wl}-z,nodefs'
---
> no_undefined_flag='$wl-z,text'
> allow_undefined_flag='$wl-z,nodefs'
11895c11999
< hardcode_libdir_flag_spec='${wl}-R,$libdir'
---
> hardcode_libdir_flag_spec='$wl-R,$libdir'
11898c12002
< export_dynamic_flag_spec='${wl}-Bexport'
---
> export_dynamic_flag_spec='$wl-Bexport'
11901,11903c12005,12007
< if test "$GCC" = yes; then
< archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
< archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
---
> if test yes = "$GCC"; then
> archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
> archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11905,11906c12009,12010
< archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
< archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
---
> archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
> archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11921c12025
< if test x$host_vendor = xsni; then
---
> if test sni = "$host_vendor"; then
11924c12028
< export_dynamic_flag_spec='${wl}-Blargedynsym'
---
> export_dynamic_flag_spec='$wl-Blargedynsym'
11932c12036
< test "$ld_shlibs" = no && can_build_shared=no
---
> test no = "$ld_shlibs" && can_build_shared=no
11958c12062
< if test "$enable_shared" = yes && test "$GCC" = yes; then
---
> if test yes,yes = "$GCC,$enable_shared"; then
12173c12277
< if test "$GCC" = yes; then
---
> if test yes = "$GCC"; then
12175,12176c12279,12280
< darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
< *) lt_awk_arg="/^libraries:/" ;;
---
> darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
> *) lt_awk_arg='/^libraries:/' ;;
12179,12180c12283,12284
< mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
< *) lt_sed_strip_eq="s,=/,/,g" ;;
---
> mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
> *) lt_sed_strip_eq='s|=/|/|g' ;;
12196c12300
< # and add multilib dir if necessary.
---
> # and add multilib dir if necessary...
12198c12302,12309
< lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
---
> lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
> # ...but if some path component already ends with the multilib dir we assume
> # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
> case "$lt_multi_os_dir; $lt_search_path_spec " in
> "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
> lt_multi_os_dir=
> ;;
> esac
12200,12202c12311,12313
< if test -d "$lt_sys_path/$lt_multi_os_dir"; then
< lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
< else
---
> if test -d "$lt_sys_path$lt_multi_os_dir"; then
> lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
> elif test -n "$lt_multi_os_dir"; then
12208,12210c12319,12321
< BEGIN {RS=" "; FS="/|\n";} {
< lt_foo="";
< lt_count=0;
---
> BEGIN {RS = " "; FS = "/|\n";} {
> lt_foo = "";
> lt_count = 0;
12217c12328
< lt_foo="/" $lt_i lt_foo;
---
> lt_foo = "/" $lt_i lt_foo;
12231c12342
< $SED 's,/\([A-Za-z]:\),\1,g'` ;;
---
> $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
12240c12351
< shrext_cmds=".so"
---
> shrext_cmds=.so
12260c12371
< library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
12264c12375
< soname_spec='${libname}${release}${shared_ext}$major'
---
> soname_spec='$libname$release$shared_ext$major'
12272c12383
< if test "$host_cpu" = ia64; then
---
> if test ia64 = "$host_cpu"; then
12274c12385
< library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
---
> library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
12279,12280c12390,12391
< # the line `#! .'. This would cause the generated library to
< # depend on `.', always an invalid library. This was fixed in
---
> # the line '#! .'. This would cause the generated library to
> # depend on '.', always an invalid library. This was fixed in
12286c12397
< echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
---
> echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
12293c12404
< # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
---
> # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
12296c12407
< if test "$aix_use_runtimelinking" = yes; then
---
> if test yes = "$aix_use_runtimelinking"; then
12300c12411
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
12304,12305c12415,12416
< library_names_spec='${libname}${release}.a $libname.a'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release.a $libname.a'
> soname_spec='$libname$release$shared_ext$major'
12316c12427
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
12321c12432
< finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
---
> finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
12327c12438
< library_names_spec='${libname}${shared_ext}'
---
> library_names_spec='$libname$shared_ext'
12335,12336c12446,12447
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12348c12459
< shrext_cmds=".dll"
---
> shrext_cmds=.dll
12357,12358c12468,12469
< postinstall_cmds='base_file=`basename \${file}`~
< dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
---
> postinstall_cmds='base_file=`basename \$file`~
> dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
12374c12485
< soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
---
> soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
12380c12491
< soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
---
> soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
12384c12495
< library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
---
> library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
12393,12394c12504,12505
< soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
< library_names_spec='${libname}.dll.lib'
---
> soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
> library_names_spec='$libname.dll.lib'
12421c12532
< sys_lib_search_path_spec="$LIB"
---
> sys_lib_search_path_spec=$LIB
12434,12435c12545,12546
< postinstall_cmds='base_file=`basename \${file}`~
< dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
---
> postinstall_cmds='base_file=`basename \$file`~
> dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
12448c12559
< library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
---
> library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
12461,12462c12572,12573
< library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
< soname_spec='${libname}${release}${major}$shared_ext'
---
> library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
> soname_spec='$libname$release$major$shared_ext'
12475,12476c12586,12587
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12494c12605,12606
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12499c12611
< library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
12524,12534d12635
< gnu*)
< version_type=linux # correct to gnu/linux during the next big refactor
< 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
< ;;
<
12540,12541c12641,12642
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12543c12644
< shlibpath_overrides_runpath=yes
---
> shlibpath_overrides_runpath=no
12561,12563c12662,12664
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
< if test "X$HPUX_IA64_MODE" = X32; then
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
> if test 32 = "$HPUX_IA64_MODE"; then
12576,12577c12677,12678
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12586,12587c12687,12688
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12600,12601c12701,12702
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12612c12713
< if test "$lt_cv_prog_gnu_ld" = yes; then
---
> if test yes = "$lt_cv_prog_gnu_ld"; then
12620,12621c12721,12722
< soname_spec='${libname}${release}${shared_ext}$major'
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
---
> soname_spec='$libname$release$shared_ext$major'
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
12640,12641c12741,12742
< sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
< sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
---
> sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
> sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
12649a12751,12770
> linux*android*)
> version_type=none # Android doesn't support versioned libraries.
> need_lib_prefix=no
> need_version=no
> library_names_spec='$libname$release$shared_ext'
> soname_spec='$libname$release$shared_ext'
> finish_cmds=
> shlibpath_var=LD_LIBRARY_PATH
> shlibpath_overrides_runpath=yes
>
> # This implies no fast_install, which is unacceptable.
> # Some rework will be needed to allow for fast_install
> # before this can be enabled.
> hardcode_into_libs=yes
>
> dynamic_linker='Android linker'
> # Don't embed -rpath directories since the linker doesn't support them.
> hardcode_libdir_flag_spec='-L$libdir'
> ;;
>
12651c12772
< linux* | k*bsd*-gnu | kopensolaris*-gnu)
---
> linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
12655,12656c12776,12777
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12700,12702d12820
< # Add ABI-specific directories to the system library path.
< sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
<
12706,12707c12824
< sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
<
---
> sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
12724c12841
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
12728,12729c12845,12846
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12739c12856
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
12748,12749c12865,12866
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12756c12873
< openbsd*)
---
> openbsd* | bitrig*)
12758c12875
< sys_lib_dlsearch_path_spec="/usr/lib"
---
> sys_lib_dlsearch_path_spec=/usr/lib
12760,12776c12877,12878
< # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
< case $host_os in
< openbsd3.3 | openbsd3.3.*) need_version=yes ;;
< *) need_version=no ;;
< esac
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
< finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
< shlibpath_var=LD_LIBRARY_PATH
< if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
< case $host_os in
< openbsd2.[89] | openbsd2.[89].*)
< shlibpath_overrides_runpath=no
< ;;
< *)
< shlibpath_overrides_runpath=yes
< ;;
< esac
---
> if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
> need_version=no
12778c12880
< shlibpath_overrides_runpath=yes
---
> need_version=yes
12779a12882,12885
> library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
> finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
> shlibpath_var=LD_LIBRARY_PATH
> shlibpath_overrides_runpath=yes
12784c12890
< shrext_cmds=".dll"
---
> shrext_cmds=.dll
12786c12892
< library_names_spec='$libname${shared_ext} $libname.a'
---
> library_names_spec='$libname$shared_ext $libname.a'
12795,12796c12901,12902
< soname_spec='${libname}${release}${shared_ext}$major'
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
---
> soname_spec='$libname$release$shared_ext$major'
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
12799c12905
< sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
---
> sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
12810,12811c12916,12917
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12821c12927
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
12825c12931
< if test "$with_gnu_ld" = yes; then
---
> if test yes = "$with_gnu_ld"; then
12833,12834c12939,12940
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12855c12961
< if test -d /usr/nec ;then
---
> if test -d /usr/nec; then
12857,12858c12963,12964
< library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
< soname_spec='$libname${shared_ext}.$major'
---
> library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
> soname_spec='$libname$shared_ext.$major'
12867,12868c12973,12974
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12872c12978
< if test "$with_gnu_ld" = yes; then
---
> if test yes = "$with_gnu_ld"; then
12890c12996
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
12898,12899c13004,13005
< library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
< soname_spec='${libname}${release}${shared_ext}$major'
---
> library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
> soname_spec='$libname$release$shared_ext$major'
12909c13015
< test "$dynamic_linker" = no && can_build_shared=no
---
> test no = "$dynamic_linker" && can_build_shared=no
12912c13018
< if test "$GCC" = yes; then
---
> if test yes = "$GCC"; then
12916,12917c13022,13023
< if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
< sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
---
> if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
> sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
12919,12920c13025,13026
< if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
< sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
---
> if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
> sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
13019c13125
< test "X$hardcode_automatic" = "Xyes" ; then
---
> test yes = "$hardcode_automatic"; then
13022c13128
< if test "$hardcode_direct" != no &&
---
> if test no != "$hardcode_direct" &&
13026,13027c13132,13133
< ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
< test "$hardcode_minus_L" != no; then
---
> ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
> test no != "$hardcode_minus_L"; then
13042,13043c13148,13149
< if test "$hardcode_action" = relink ||
< test "$inherit_rpath" = yes; then
---
> if test relink = "$hardcode_action" ||
> test yes = "$inherit_rpath"; then
13046,13047c13152,13153
< elif test "$shlibpath_overrides_runpath" = yes ||
< test "$enable_shared" = no; then
---
> elif test yes = "$shlibpath_overrides_runpath" ||
> test no = "$enable_shared"; then
13057c13163
< if test "x$enable_dlopen" != xyes; then
---
> if test yes != "$enable_dlopen"; then
13067c13173
< lt_cv_dlopen="load_add_on"
---
> lt_cv_dlopen=load_add_on
13073c13179
< lt_cv_dlopen="LoadLibrary"
---
> lt_cv_dlopen=LoadLibrary
13078c13184
< lt_cv_dlopen="dlopen"
---
> lt_cv_dlopen=dlopen
13083c13189
< # if libdl is installed we need to link against it
---
> # if libdl is installed we need to link against it
13121c13227
< lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
---
> lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
13124c13230
< lt_cv_dlopen="dyld"
---
> lt_cv_dlopen=dyld
13131a13238,13245
> tpf*)
> # Don't try to run any link tests for TPF. We know it's impossible
> # because TPF is a cross-compiler, and we know how we open DSOs.
> lt_cv_dlopen=dlopen
> lt_cv_dlopen_libs=
> lt_cv_dlopen_self=no
> ;;
>
13135c13249
< lt_cv_dlopen="shl_load"
---
> lt_cv_dlopen=shl_load
13174c13288
< lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
---
> lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
13178c13292
< lt_cv_dlopen="dlopen"
---
> lt_cv_dlopen=dlopen
13217c13331
< lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
---
> lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
13256c13370
< lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
---
> lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
13295c13409
< lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
---
> lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
13316,13318c13430
< if test "x$lt_cv_dlopen" != xno; then
< enable_dlopen=yes
< else
---
> if test no = "$lt_cv_dlopen"; then
13319a13432,13433
> else
> enable_dlopen=yes
13324,13325c13438,13439
< save_CPPFLAGS="$CPPFLAGS"
< test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
---
> save_CPPFLAGS=$CPPFLAGS
> test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
13327c13441
< save_LDFLAGS="$LDFLAGS"
---
> save_LDFLAGS=$LDFLAGS
13330c13444
< save_LIBS="$LIBS"
---
> save_LIBS=$LIBS
13338c13452
< if test "$cross_compiling" = yes; then :
---
> if test yes = "$cross_compiling"; then :
13387c13501
< #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
---
> #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
13417c13531
< test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
---
> test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
13437c13551
< if test "x$lt_cv_dlopen_self" = xyes; then
---
> if test yes = "$lt_cv_dlopen_self"; then
13444c13558
< if test "$cross_compiling" = yes; then :
---
> if test yes = "$cross_compiling"; then :
13493c13607
< #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
---
> #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
13523c13637
< test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
---
> test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
13544,13546c13658,13660
< CPPFLAGS="$save_CPPFLAGS"
< LDFLAGS="$save_LDFLAGS"
< LIBS="$save_LIBS"
---
> CPPFLAGS=$save_CPPFLAGS
> LDFLAGS=$save_LDFLAGS
> LIBS=$save_LIBS
13590c13704
< if test -n "$STRIP" ; then
---
> if test -n "$STRIP"; then
13618c13732
< # Report which library types will actually be built
---
> # Report what library types will actually be built
13626c13740
< test "$can_build_shared" = "no" && enable_shared=no
---
> test no = "$can_build_shared" && enable_shared=no
13632c13746
< test "$enable_shared" = yes && enable_static=no
---
> test yes = "$enable_shared" && enable_static=no
13640,13641c13754,13755
< if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
< test "$enable_shared" = yes && enable_static=no
---
> if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
> test yes = "$enable_shared" && enable_static=no
13651c13765
< test "$enable_shared" = yes || enable_static=yes
---
> test yes = "$enable_shared" || enable_static=yes
13665c13779
< CC="$lt_save_CC"
---
> CC=$lt_save_CC
13692c13806
< for ac_header in stdarg.h stdbool.h netinet/in.h sys/param.h sys/socket.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h
---
> for ac_header in stdarg.h stdbool.h netinet/in.h sys/param.h sys/socket.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h
15053c15167
< #define _XOPEN_SOURCE
---
> #define _XOPEN_SOURCE 600
15910,15911c16024,16025
< PYTHON_VERSION=`$PYTHON -c "import sys, string; \
< print string.split(sys.version)[0]"`
---
> PYTHON_VERSION=`$PYTHON -c "import sys; \
> print(sys.version.split()[0])"`
15915,15971d16028
< # Check for a version of Python >= 2.1.0
< #
< { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python >= '2.1.0'" >&5
< $as_echo_n "checking for a version of Python >= '2.1.0'... " >&6; }
< ac_supports_python_ver=`$PYTHON -c "import sys, string; \
< ver = string.split(sys.version)[0]; \
< print ver >= '2.1.0'"`
< if test "$ac_supports_python_ver" != "True"; then
< if test -z "$PYTHON_NOVERSIONCHECK"; then
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
< $as_echo "no" >&6; }
< { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
< $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
< as_fn_error $? "
< This version of the AC_PYTHON_DEVEL macro
< doesn't work properly with versions of Python before
< 2.1.0. You may need to re-run configure, setting the
< variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
< PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
< Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
< to something else than an empty string.
<
< See \`config.log' for more details" "$LINENO" 5; }
< else
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: skip at user request" >&5
< $as_echo "skip at user request" >&6; }
< fi
< else
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
< $as_echo "yes" >&6; }
< fi
<
< #
< # if the macro parameter ``version'' is set, honour it
< #
< if test -n ""; then
< { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of Python " >&5
< $as_echo_n "checking for a version of Python ... " >&6; }
< ac_supports_python_ver=`$PYTHON -c "import sys, string; \
< ver = string.split(sys.version)[0]; \
< print ver "`
< if test "$ac_supports_python_ver" = "True"; then
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
< $as_echo "yes" >&6; }
< else
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
< $as_echo "no" >&6; }
< as_fn_error $? "this package requires Python .
< If you have it installed, but it isn't the default Python
< interpreter in your system path, please pass the PYTHON_VERSION
< variable to configure. See \`\`configure --help'' for reference.
< " "$LINENO" 5
< PYTHON_VERSION=""
< fi
< fi
<
< #
15996c16053
< print distutils.sysconfig.get_python_inc();"`
---
> print(distutils.sysconfig.get_python_inc());"`
16012,16025d16068
< # (makes two attempts to ensure we've got a version number
< # from the interpreter)
< py_version=`$PYTHON -c "from distutils.sysconfig import *; \
< from string import join; \
< print join(get_config_vars('VERSION'))"`
< if test "$py_version" = "None"; then
< if test -n "$PYTHON_VERSION"; then
< py_version=$PYTHON_VERSION
< else
< py_version=`$PYTHON -c "import sys; \
< print sys.version[:3]"`
< fi
< fi
<
16027,16030c16070
< from string import join; \
< print '-L' + get_python_lib(0,1), \
< '-L' + os.path.dirname(get_python_lib(0,1)), \
< '-lpython';"`$py_version
---
> print(get_config_var('BLDLIBRARY'));"`
16043c16083
< print distutils.sysconfig.get_python_lib(1,0);"`
---
> print(distutils.sysconfig.get_python_lib(1,0));"`
16050,16077d16089
< # libraries which must be linked in when embedding
< #
< { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5
< $as_echo_n "checking python extra libraries... " >&6; }
< 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')"`
< fi
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
< $as_echo "$PYTHON_EXTRA_LIBS" >&6; }
<
<
< #
< # linking flags needed when embedding
< #
< { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
< $as_echo_n "checking python extra linking flags... " >&6; }
< if test -z "$PYTHON_EXTRA_LDFLAGS"; then
< PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
< conf = distutils.sysconfig.get_config_var; \
< print conf('LINKFORSHARED')"`
< fi
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
< $as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
<
<
< #
16149c16161
< if test `$PYTHON -c "print '$PYTHON_VERSION' >= '2.4.0'"` = "False"; then
---
> if test `$PYTHON -c "print('$PYTHON_VERSION' >= '2.4.0')"` = "False"; then
16731a16744,16798
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL" >&5
> $as_echo_n "checking for LibreSSL... " >&6; }
> if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
>
> $as_echo "#define HAVE_LIBRESSL 1" >>confdefs.h
>
> # libressl provides these compat functions, but they may also be
> # declared by the OS in libc. See if they have been declared.
> ac_fn_c_check_decl "$LINENO" "strlcpy" "ac_cv_have_decl_strlcpy" "$ac_includes_default"
> if test "x$ac_cv_have_decl_strlcpy" = xyes; then :
> ac_have_decl=1
> else
> ac_have_decl=0
> fi
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_DECL_STRLCPY $ac_have_decl
> _ACEOF
> ac_fn_c_check_decl "$LINENO" "strlcat" "ac_cv_have_decl_strlcat" "$ac_includes_default"
> if test "x$ac_cv_have_decl_strlcat" = xyes; then :
> ac_have_decl=1
> else
> ac_have_decl=0
> fi
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_DECL_STRLCAT $ac_have_decl
> _ACEOF
> ac_fn_c_check_decl "$LINENO" "arc4random" "ac_cv_have_decl_arc4random" "$ac_includes_default"
> if test "x$ac_cv_have_decl_arc4random" = xyes; then :
> ac_have_decl=1
> else
> ac_have_decl=0
> fi
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_DECL_ARC4RANDOM $ac_have_decl
> _ACEOF
> ac_fn_c_check_decl "$LINENO" "arc4random_uniform" "ac_cv_have_decl_arc4random_uniform" "$ac_includes_default"
> if test "x$ac_cv_have_decl_arc4random_uniform" = xyes; then :
> ac_have_decl=1
> else
> ac_have_decl=0
> fi
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_DECL_ARC4RANDOM_UNIFORM $ac_have_decl
> _ACEOF
>
> else
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
17065,17066c17132,17134
< if grep OPENSSL_VERSION_NUMBER $ssldir/include/openssl/opensslv.h | grep 0x0 >/dev/null; then
< { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
---
> if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "OpenSSL" >/dev/null; then
> if grep OPENSSL_VERSION_NUMBER $ssldir/include/openssl/opensslv.h | grep 0x0 >/dev/null; then
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17072a17141,17144
> else
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> fi
17073a17146
> # not OpenSSL, thus likely LibreSSL, which supports it
18112a18186,18412
> LIBOBJ_WITHOUT_CTIMEARC4="$LIBOBJS"
>
> if test "$USE_NSS" = "no"; then
> ac_fn_c_check_func "$LINENO" "arc4random" "ac_cv_func_arc4random"
> if test "x$ac_cv_func_arc4random" = xyes; then :
> $as_echo "#define HAVE_ARC4RANDOM 1" >>confdefs.h
>
> else
> case " $LIBOBJS " in
> *" arc4random.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS arc4random.$ac_objext"
> ;;
> esac
>
> fi
>
>
> ac_fn_c_check_func "$LINENO" "arc4random_uniform" "ac_cv_func_arc4random_uniform"
> if test "x$ac_cv_func_arc4random_uniform" = xyes; then :
> $as_echo "#define HAVE_ARC4RANDOM_UNIFORM 1" >>confdefs.h
>
> else
> case " $LIBOBJS " in
> *" arc4random_uniform.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS arc4random_uniform.$ac_objext"
> ;;
> esac
>
> fi
>
>
> if test "$ac_cv_func_arc4random" = "no"; then
> case " $LIBOBJS " in
> *" explicit_bzero.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext"
> ;;
> esac
>
> case " $LIBOBJS " in
> *" arc4_lock.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS arc4_lock.$ac_objext"
> ;;
> esac
>
> for ac_func in getentropy
> do :
> ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
> if test "x$ac_cv_func_getentropy" = xyes; then :
> cat >>confdefs.h <<_ACEOF
> #define HAVE_GETENTROPY 1
> _ACEOF
>
> else
>
> if test "$USE_WINSOCK" = 1; then
> case " $LIBOBJS " in
> *" getentropy_win.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS getentropy_win.$ac_objext"
> ;;
> esac
>
> else
> case `uname` in
> Darwin)
> case " $LIBOBJS " in
> *" getentropy_osx.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS getentropy_osx.$ac_objext"
> ;;
> esac
>
> ;;
> SunOS)
> case " $LIBOBJS " in
> *" getentropy_solaris.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS getentropy_solaris.$ac_objext"
> ;;
> esac
>
> for ac_header in sys/sha2.h
> do :
> ac_fn_c_check_header_compile "$LINENO" "sys/sha2.h" "ac_cv_header_sys_sha2_h" "$ac_includes_default
> "
> if test "x$ac_cv_header_sys_sha2_h" = xyes; then :
> cat >>confdefs.h <<_ACEOF
> #define HAVE_SYS_SHA2_H 1
> _ACEOF
>
> else
>
> for ac_func in SHA512_Update
> do :
> ac_fn_c_check_func "$LINENO" "SHA512_Update" "ac_cv_func_SHA512_Update"
> if test "x$ac_cv_func_SHA512_Update" = xyes; then :
> cat >>confdefs.h <<_ACEOF
> #define HAVE_SHA512_UPDATE 1
> _ACEOF
>
> else
>
> case " $LIBOBJS " in
> *" sha512.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS sha512.$ac_objext"
> ;;
> esac
>
>
> fi
> done
>
>
> fi
>
> done
>
> if test "$ac_cv_header_sys_sha2_h" = "yes"; then
> # this lib needed for sha2 on solaris
> LIBS="$LIBS -lmd"
> fi
> ;;
> Linux|*)
> case " $LIBOBJS " in
> *" getentropy_linux.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS getentropy_linux.$ac_objext"
> ;;
> esac
>
> for ac_func in SHA512_Update
> do :
> ac_fn_c_check_func "$LINENO" "SHA512_Update" "ac_cv_func_SHA512_Update"
> if test "x$ac_cv_func_SHA512_Update" = xyes; then :
> cat >>confdefs.h <<_ACEOF
> #define HAVE_SHA512_UPDATE 1
> _ACEOF
>
> else
>
>
> $as_echo "#define COMPAT_SHA512 1" >>confdefs.h
>
> case " $LIBOBJS " in
> *" sha512.$ac_objext "* ) ;;
> *) LIBOBJS="$LIBOBJS sha512.$ac_objext"
> ;;
> esac
>
>
> fi
> done
>
> for ac_header in sys/sysctl.h
> do :
> ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "$ac_includes_default
> "
> if test "x$ac_cv_header_sys_sysctl_h" = xyes; then :
> cat >>confdefs.h <<_ACEOF
> #define HAVE_SYS_SYSCTL_H 1
> _ACEOF
>
> fi
>
> done
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
> $as_echo_n "checking for library containing clock_gettime... " >&6; }
> if ${ac_cv_search_clock_gettime+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_func_search_save_LIBS=$LIBS
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> Use char because int might match the return type of a GCC
> builtin and then its argument prototype would still apply. */
> #ifdef __cplusplus
> extern "C"
> #endif
> char clock_gettime ();
> int
> main ()
> {
> return clock_gettime ();
> ;
> return 0;
> }
> _ACEOF
> for ac_lib in '' rt; do
> if test -z "$ac_lib"; then
> ac_res="none required"
> else
> ac_res=-l$ac_lib
> LIBS="-l$ac_lib $ac_func_search_save_LIBS"
> fi
> if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_search_clock_gettime=$ac_res
> fi
> rm -f core conftest.err conftest.$ac_objext \
> conftest$ac_exeext
> if ${ac_cv_search_clock_gettime+:} false; then :
> break
> fi
> done
> if ${ac_cv_search_clock_gettime+:} false; then :
>
> else
> ac_cv_search_clock_gettime=no
> fi
> rm conftest.$ac_ext
> LIBS=$ac_func_search_save_LIBS
> fi
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
> $as_echo "$ac_cv_search_clock_gettime" >&6; }
> ac_res=$ac_cv_search_clock_gettime
> if test "$ac_res" != no; then :
> test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
>
> fi
>
> ;;
> esac
> fi
>
> fi
> done
>
> fi
> fi
18167a18468,18711
> # check for dnstap if requested
>
> # Check whether --enable-dnstap was given.
> if test "${enable_dnstap+set}" = set; then :
> enableval=$enable_dnstap; opt_dnstap=$enableval
> else
> opt_dnstap=no
> fi
>
>
>
> # Check whether --with-dnstap-socket-path was given.
> if test "${with_dnstap_socket_path+set}" = set; then :
> withval=$with_dnstap_socket_path; opt_dnstap_socket_path=$withval
> else
> opt_dnstap_socket_path="$UNBOUND_RUN_DIR/dnstap.sock"
> fi
>
>
> if test "x$opt_dnstap" != "xno"; then
> # Extract the first word of "protoc-c", so it can be a program name with args.
> set dummy protoc-c; ac_word=$2
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> if ${ac_cv_path_PROTOC_C+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> case $PROTOC_C in
> [\\/]* | ?:[\\/]*)
> ac_cv_path_PROTOC_C="$PROTOC_C" # Let the user override the test with a path.
> ;;
> *)
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> for ac_exec_ext in '' $ac_executable_extensions; do
> if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
> ac_cv_path_PROTOC_C="$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
> fi
> done
> done
> IFS=$as_save_IFS
>
> ;;
> esac
> fi
> PROTOC_C=$ac_cv_path_PROTOC_C
> if test -n "$PROTOC_C"; then
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOC_C" >&5
> $as_echo "$PROTOC_C" >&6; }
> else
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
>
> if test -z "$PROTOC_C"; then
> as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5
> fi
>
> # Check whether --with-protobuf-c was given.
> if test "${with_protobuf_c+set}" = set; then :
> withval=$with_protobuf_c;
> # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
> if test -f $withval/include/google/protobuf-c/protobuf-c.h; then
> CFLAGS="$CFLAGS -I$withval/include/google"
> else
> CFLAGS="$CFLAGS -I$withval/include"
> fi
> LDFLAGS="$LDFLAGS -L$withval/lib"
>
> else
>
> # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
> if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
> CFLAGS="$CFLAGS -I/usr/include/google"
> else
> if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
> CFLAGS="$CFLAGS -I/usr/local/include/google"
> LDFLAGS="$LDFLAGS -L/usr/local/lib"
> fi
> fi
>
> fi
>
>
> # Check whether --with-libfstrm was given.
> if test "${with_libfstrm+set}" = set; then :
> withval=$with_libfstrm;
> CFLAGS="$CFLAGS -I$withval/include"
> LDFLAGS="$LDFLAGS -L$withval/lib"
>
> fi
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fstrm_iothr_init" >&5
> $as_echo_n "checking for library containing fstrm_iothr_init... " >&6; }
> if ${ac_cv_search_fstrm_iothr_init+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_func_search_save_LIBS=$LIBS
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> Use char because int might match the return type of a GCC
> builtin and then its argument prototype would still apply. */
> #ifdef __cplusplus
> extern "C"
> #endif
> char fstrm_iothr_init ();
> int
> main ()
> {
> return fstrm_iothr_init ();
> ;
> return 0;
> }
> _ACEOF
> for ac_lib in '' fstrm; do
> if test -z "$ac_lib"; then
> ac_res="none required"
> else
> ac_res=-l$ac_lib
> LIBS="-l$ac_lib $ac_func_search_save_LIBS"
> fi
> if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_search_fstrm_iothr_init=$ac_res
> fi
> rm -f core conftest.err conftest.$ac_objext \
> conftest$ac_exeext
> if ${ac_cv_search_fstrm_iothr_init+:} false; then :
> break
> fi
> done
> if ${ac_cv_search_fstrm_iothr_init+:} false; then :
>
> else
> ac_cv_search_fstrm_iothr_init=no
> fi
> rm conftest.$ac_ext
> LIBS=$ac_func_search_save_LIBS
> fi
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fstrm_iothr_init" >&5
> $as_echo "$ac_cv_search_fstrm_iothr_init" >&6; }
> ac_res=$ac_cv_search_fstrm_iothr_init
> if test "$ac_res" != no; then :
> test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
>
> else
> as_fn_error $? "The fstrm library was not found. Please install fstrm!" "$LINENO" 5
> fi
>
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5
> $as_echo_n "checking for library containing protobuf_c_message_pack... " >&6; }
> if ${ac_cv_search_protobuf_c_message_pack+:} false; then :
> $as_echo_n "(cached) " >&6
> else
> ac_func_search_save_LIBS=$LIBS
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> Use char because int might match the return type of a GCC
> builtin and then its argument prototype would still apply. */
> #ifdef __cplusplus
> extern "C"
> #endif
> char protobuf_c_message_pack ();
> int
> main ()
> {
> return protobuf_c_message_pack ();
> ;
> return 0;
> }
> _ACEOF
> for ac_lib in '' protobuf-c; do
> if test -z "$ac_lib"; then
> ac_res="none required"
> else
> ac_res=-l$ac_lib
> LIBS="-l$ac_lib $ac_func_search_save_LIBS"
> fi
> if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_search_protobuf_c_message_pack=$ac_res
> fi
> rm -f core conftest.err conftest.$ac_objext \
> conftest$ac_exeext
> if ${ac_cv_search_protobuf_c_message_pack+:} false; then :
> break
> fi
> done
> if ${ac_cv_search_protobuf_c_message_pack+:} false; then :
>
> else
> ac_cv_search_protobuf_c_message_pack=no
> fi
> rm conftest.$ac_ext
> LIBS=$ac_func_search_save_LIBS
> fi
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_protobuf_c_message_pack" >&5
> $as_echo "$ac_cv_search_protobuf_c_message_pack" >&6; }
> ac_res=$ac_cv_search_protobuf_c_message_pack
> if test "$ac_res" != no; then :
> test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
>
> else
> as_fn_error $? "The protobuf-c library was not found. Please install protobuf-c!" "$LINENO" 5
> fi
>
>
>
> $as_echo "#define USE_DNSTAP 1" >>confdefs.h
>
> ENABLE_DNSTAP=1
>
>
>
> hdr_dnstap_socket_path="`echo $opt_dnstap_socket_path | sed -e 's/\\\\/\\\\\\\\/g'`"
>
>
> cat >>confdefs.h <<_ACEOF
> #define DNSTAP_SOCKET_PATH "$hdr_dnstap_socket_path"
> _ACEOF
>
>
> DNSTAP_SRC="dnstap/dnstap.c dnstap/dnstap.pb-c.c"
>
> DNSTAP_OBJ="dnstap.lo dnstap.pb-c.lo"
>
>
> else
>
> ENABLE_DNSTAP=0
>
>
>
> fi
>
>
18301c18845
< ac_config_files="$ac_config_files Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 smallapp/unbound-control-setup.sh"
---
> version=1.5.1
18302a18847,18851
> date=`date +'%b %e, %Y'`
>
>
> ac_config_files="$ac_config_files Makefile doc/example.conf doc/libunbound.3 doc/unbound.8 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound.conf.5 doc/unbound-control.8 doc/unbound-host.1 smallapp/unbound-control-setup.sh dnstap/dnstap_config.h"
>
18811c19360
< This file was extended by unbound $as_me 1.4.22, which was
---
> This file was extended by unbound $as_me 1.5.1, which was
18877c19426
< unbound config.status 1.4.22
---
> unbound config.status 1.5.1
19057a19607
> lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
19059a19610
> lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
19176a19728
> lt_cv_sys_global_symbol_to_import \
19178a19731
> lt_cv_nm_interface \
19214c19767
< eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
---
> eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
19244c19797
< eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
---
> eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
19253,19254d19805
< xsi_shell='$xsi_shell'
< lt_shell_append='$lt_shell_append'
19256c19807
< # See if we are running on zsh, and set the options which allow our
---
> # See if we are running on zsh, and set the options that allow our
19258c19809
< if test -n "\${ZSH_VERSION+set}" ; then
---
> if test -n "\${ZSH_VERSION+set}"; then
19265d19815
< TIMESTAMP='$TIMESTAMP'
19289a19840
> "doc/unbound-host.1") CONFIG_FILES="$CONFIG_FILES doc/unbound-host.1" ;;
19290a19842
> "dnstap/dnstap_config.h") CONFIG_FILES="$CONFIG_FILES dnstap/dnstap_config.h" ;;
19844c20396
< # See if we are running on zsh, and set the options which allow our
---
> # See if we are running on zsh, and set the options that allow our
19846c20398
< if test -n "${ZSH_VERSION+set}" ; then
---
> if test -n "${ZSH_VERSION+set}"; then
19850c20402
< cfgfile="${ofile}T"
---
> cfgfile=${ofile}T
19858c20410
< # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
---
> # Generated automatically by $as_me ($PACKAGE) $VERSION
19892c20444
< available_tags=""
---
> available_tags=''
20028a20581,20583
> # Transform the output of nm into a list of symbols to manually relocate.
> global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
>
20034a20590,20592
> # The name lister interface.
> nm_interface=$lt_lt_cv_nm_interface
>
20038c20596
< # The root where to search for dependent libraries,and in which our libraries should be installed.
---
> # The root where to search for dependent libraries,and where our libraries should be installed.
20225c20783
< # Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
---
> # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
20229c20787
< # Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
---
> # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
20231c20789
< # "absolute",i.e impossible to change by setting \${shlibpath_var} if the
---
> # "absolute",i.e impossible to change by setting \$shlibpath_var if the
20289c20847
< if test "X${COLLECT_NAMES+set}" != Xset; then
---
> if test set != "${COLLECT_NAMES+set}"; then
20298c20856
< ltmain="$ac_aux_dir/ltmain.sh"
---
> ltmain=$ac_aux_dir/ltmain.sh
20308,20466d20865
< if test x"$xsi_shell" = xyes; then
< sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
< func_dirname ()\
< {\
< \ case ${1} in\
< \ */*) func_dirname_result="${1%/*}${2}" ;;\
< \ * ) func_dirname_result="${3}" ;;\
< \ esac\
< } # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_basename ()$/,/^} # func_basename /c\
< func_basename ()\
< {\
< \ func_basename_result="${1##*/}"\
< } # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
< func_dirname_and_basename ()\
< {\
< \ case ${1} in\
< \ */*) func_dirname_result="${1%/*}${2}" ;;\
< \ * ) func_dirname_result="${3}" ;;\
< \ esac\
< \ func_basename_result="${1##*/}"\
< } # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
< func_stripname ()\
< {\
< \ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
< \ # positional parameters, so assign one to ordinary parameter first.\
< \ func_stripname_result=${3}\
< \ func_stripname_result=${func_stripname_result#"${1}"}\
< \ func_stripname_result=${func_stripname_result%"${2}"}\
< } # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
< func_split_long_opt ()\
< {\
< \ func_split_long_opt_name=${1%%=*}\
< \ func_split_long_opt_arg=${1#*=}\
< } # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
< func_split_short_opt ()\
< {\
< \ func_split_short_opt_arg=${1#??}\
< \ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
< } # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
< func_lo2o ()\
< {\
< \ case ${1} in\
< \ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
< \ *) func_lo2o_result=${1} ;;\
< \ esac\
< } # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_xform ()$/,/^} # func_xform /c\
< func_xform ()\
< {\
< func_xform_result=${1%.*}.lo\
< } # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_arith ()$/,/^} # func_arith /c\
< func_arith ()\
< {\
< func_arith_result=$(( $* ))\
< } # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_len ()$/,/^} # func_len /c\
< func_len ()\
< {\
< func_len_result=${#1}\
< } # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
< fi
<
< if test x"$lt_shell_append" = xyes; then
< sed -e '/^func_append ()$/,/^} # func_append /c\
< func_append ()\
< {\
< eval "${1}+=\\${2}"\
< } # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
< func_append_quoted ()\
< {\
< \ func_quote_for_eval "${2}"\
< \ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
< } # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
<
<
< # Save a `func_append' function call where possible by direct use of '+='
< sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
< else
< # Save a `func_append' function call even when '+=' is not available
< sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
< && mv -f "$cfgfile.tmp" "$cfgfile" \
< || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
< test 0 -eq $? || _lt_function_replace_fail=:
< fi
<
< if test x"$_lt_function_replace_fail" = x":"; then
< { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
< $as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
< fi
<
<