| Index: third_party/libxslt/src/configure
|
| diff --git a/third_party/libxslt/configure b/third_party/libxslt/src/configure
|
| similarity index 88%
|
| rename from third_party/libxslt/configure
|
| rename to third_party/libxslt/src/configure
|
| index f1f82c59c1f6d6daa94c2110a3a949be9e26155e..a3c2bbf73215b45d884de13c46d33ed61803da3f 100755
|
| --- a/third_party/libxslt/configure
|
| +++ b/third_party/libxslt/src/configure
|
| @@ -682,6 +682,7 @@ THREAD_LIBS
|
| USE_VERSION_SCRIPT_FALSE
|
| USE_VERSION_SCRIPT_TRUE
|
| VERSION_SCRIPT_FLAGS
|
| +LT_SYS_LIBRARY_PATH
|
| OTOOL64
|
| OTOOL
|
| LIPO
|
| @@ -827,6 +828,7 @@ enable_shared
|
| enable_static
|
| with_pic
|
| enable_fast_install
|
| +with_aix_soname
|
| with_gnu_ld
|
| with_sysroot
|
| enable_libtool_lock
|
| @@ -849,7 +851,8 @@ CFLAGS
|
| LDFLAGS
|
| LIBS
|
| CPPFLAGS
|
| -CPP'
|
| +CPP
|
| +LT_SYS_LIBRARY_PATH'
|
|
|
|
|
| # Initialize some variables set by options.
|
| @@ -1487,9 +1490,12 @@ Optional Packages:
|
| $PACKAGE-$VERSION/html
|
| --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
|
| both]
|
| + --with-aix-soname=aix|svr4|both
|
| + shared library versioning (aka "SONAME") variant to
|
| + provide on AIX, [default=aix].
|
| --with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
| - --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).
|
| --with-python=DIR Build Python bindings if found
|
| --with-crypto Add crypto support to exslt (on)
|
| --with-debug Add the debugging code (on)
|
| @@ -1510,6 +1516,8 @@ Some influential environment variables:
|
| CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
| you have headers in a nonstandard directory <include dir>
|
| CPP C preprocessor
|
| + LT_SYS_LIBRARY_PATH
|
| + User-defined run-time library search path.
|
|
|
| Use these variables to override the choices made by `configure' or to help
|
| it to find libraries and programs with nonstandard names/locations.
|
| @@ -2392,8 +2400,8 @@ IFS=$ac_save_IFS
|
| case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
|
|
|
| -# expand $ac_aux_dir to an absolute path
|
| -am_aux_dir=`cd $ac_aux_dir && pwd`
|
| +# Expand $ac_aux_dir to an absolute path.
|
| +am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
|
|
| ac_ext=c
|
| ac_cpp='$CPP $CPPFLAGS'
|
| @@ -3773,7 +3781,7 @@ fi
|
|
|
| VERSION=${LIBXSLT_VERSION}
|
|
|
| -am__api_version='1.14'
|
| +am__api_version='1.15'
|
|
|
| # Find a good install program. We prefer a C program (faster),
|
| # so one script is as good as another. But avoid the broken or
|
| @@ -3962,7 +3970,7 @@ else
|
| $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
|
| fi
|
|
|
| -if test x"${install_sh}" != xset; then
|
| +if test x"${install_sh+set}" != xset; then
|
| case $am_aux_dir in
|
| *\ * | *\ *)
|
| install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
| @@ -4354,8 +4362,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
| # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
| mkdir_p='$(MKDIR_P)'
|
|
|
| -# We need awk for the "check" target. The system "awk" is bad on
|
| -# some platforms.
|
| +# We need awk for the "check" target (and possibly the TAP driver). The
|
| +# system "awk" is bad on some platforms.
|
| # Always define AMTAR for backward compatibility. Yes, it's still used
|
| # in the wild :-( We should find a proper way to deprecate it ...
|
| AMTAR='$${TAR-tar}'
|
| @@ -4541,6 +4549,7 @@ END
|
| fi
|
| fi
|
|
|
| +
|
| # AM_MAINTAINER_MODE
|
|
|
| # Support silent build rules, requires at least automake-1.11. Disable
|
| @@ -5671,8 +5680,8 @@ esac
|
|
|
|
|
|
|
| -macro_version='2.4.2'
|
| -macro_revision='1.3337'
|
| +macro_version='2.4.6'
|
| +macro_revision='2.4.6'
|
|
|
|
|
|
|
| @@ -5686,7 +5695,7 @@ macro_revision='1.3337'
|
|
|
|
|
|
|
| -ltmain="$ac_aux_dir/ltmain.sh"
|
| +ltmain=$ac_aux_dir/ltmain.sh
|
|
|
| # Backslashify metacharacters that are still active within
|
| # double-quoted strings.
|
| @@ -5735,7 +5744,7 @@ func_echo_all ()
|
| $ECHO ""
|
| }
|
|
|
| -case "$ECHO" in
|
| +case $ECHO in
|
| printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
|
| $as_echo "printf" >&6; } ;;
|
| print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
|
| @@ -5928,19 +5937,19 @@ test -z "$GREP" && GREP=grep
|
|
|
| # Check whether --with-gnu-ld was given.
|
| if test "${with_gnu_ld+set}" = set; then :
|
| - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
|
| + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
|
| else
|
| with_gnu_ld=no
|
| fi
|
|
|
| ac_prog=ld
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| # Check if gcc -print-prog-name=ld gives a path.
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
|
| $as_echo_n "checking for ld used by $CC... " >&6; }
|
| case $host in
|
| *-*-mingw*)
|
| - # gcc leaves a trailing carriage return which upsets mingw
|
| + # gcc leaves a trailing carriage return, which upsets mingw
|
| ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
| *)
|
| ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
| @@ -5954,7 +5963,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
|
| while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
|
| ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
|
| done
|
| - test -z "$LD" && LD="$ac_prog"
|
| + test -z "$LD" && LD=$ac_prog
|
| ;;
|
| "")
|
| # If it fails, then pretend we aren't using GCC.
|
| @@ -5965,7 +5974,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
|
| with_gnu_ld=unknown
|
| ;;
|
| esac
|
| -elif test "$with_gnu_ld" = yes; then
|
| +elif test yes = "$with_gnu_ld"; then
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
|
| $as_echo_n "checking for GNU ld... " >&6; }
|
| else
|
| @@ -5976,32 +5985,32 @@ if ${lt_cv_path_LD+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| if test -z "$LD"; then
|
| - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
| + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
|
| for ac_dir in $PATH; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| test -z "$ac_dir" && ac_dir=.
|
| if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
| - lt_cv_path_LD="$ac_dir/$ac_prog"
|
| + lt_cv_path_LD=$ac_dir/$ac_prog
|
| # Check to see if the program is GNU ld. I'd rather use --version,
|
| # but apparently some variants of GNU ld only accept -v.
|
| # Break only if it was the GNU/non-GNU ld that we prefer.
|
| case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
|
| *GNU* | *'with BFD'*)
|
| - test "$with_gnu_ld" != no && break
|
| + test no != "$with_gnu_ld" && break
|
| ;;
|
| *)
|
| - test "$with_gnu_ld" != yes && break
|
| + test yes != "$with_gnu_ld" && break
|
| ;;
|
| esac
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| else
|
| - 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.
|
| fi
|
| fi
|
|
|
| -LD="$lt_cv_path_LD"
|
| +LD=$lt_cv_path_LD
|
| if test -n "$LD"; then
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
|
| $as_echo "$LD" >&6; }
|
| @@ -6044,33 +6053,38 @@ if ${lt_cv_path_NM+:} false; then :
|
| else
|
| if test -n "$NM"; then
|
| # Let the user override the test.
|
| - lt_cv_path_NM="$NM"
|
| + lt_cv_path_NM=$NM
|
| else
|
| - lt_nm_to_check="${ac_tool_prefix}nm"
|
| + lt_nm_to_check=${ac_tool_prefix}nm
|
| if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
|
| lt_nm_to_check="$lt_nm_to_check nm"
|
| fi
|
| for lt_tmp_nm in $lt_nm_to_check; do
|
| - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
| + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
|
| for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| test -z "$ac_dir" && ac_dir=.
|
| - 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
|
| # Check to see if the nm accepts a BSD-compat flag.
|
| - # Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
| + # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
|
| # nm: unknown option "B" ignored
|
| # Tru64's nm complains that /dev/null is an invalid object file
|
| - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
|
| - */dev/null* | *'Invalid file or object type'*)
|
| + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
|
| + case $build_os in
|
| + mingw*) lt_bad_file=conftest.nm/nofile ;;
|
| + *) lt_bad_file=/dev/null ;;
|
| + esac
|
| + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
|
| + *$lt_bad_file* | *'Invalid file or object type'*)
|
| lt_cv_path_NM="$tmp_nm -B"
|
| - break
|
| + break 2
|
| ;;
|
| *)
|
| case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
|
| */dev/null*)
|
| lt_cv_path_NM="$tmp_nm -p"
|
| - break
|
| + break 2
|
| ;;
|
| *)
|
| lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
|
| @@ -6081,15 +6095,15 @@ else
|
| esac
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| done
|
| : ${lt_cv_path_NM=no}
|
| fi
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
|
| $as_echo "$lt_cv_path_NM" >&6; }
|
| -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
|
| else
|
| # Didn't find any BSD compatible name lister, look for dumpbin.
|
| if test -n "$DUMPBIN"; then :
|
| @@ -6195,9 +6209,9 @@ esac
|
| fi
|
| fi
|
|
|
| - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
|
| + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
|
| *COFF*)
|
| - DUMPBIN="$DUMPBIN -symbols"
|
| + DUMPBIN="$DUMPBIN -symbols -headers"
|
| ;;
|
| *)
|
| DUMPBIN=:
|
| @@ -6205,8 +6219,8 @@ fi
|
| esac
|
| fi
|
|
|
| - if test "$DUMPBIN" != ":"; then
|
| - NM="$DUMPBIN"
|
| + if test : != "$DUMPBIN"; then
|
| + NM=$DUMPBIN
|
| fi
|
| fi
|
| test -z "$NM" && NM=nm
|
| @@ -6257,7 +6271,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| i=0
|
| - teststring="ABCD"
|
| + teststring=ABCD
|
|
|
| case $build_os in
|
| msdosdjgpp*)
|
| @@ -6297,7 +6311,7 @@ else
|
| lt_cv_sys_max_cmd_len=8192;
|
| ;;
|
|
|
| - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
|
| + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
|
| # This has been around since 386BSD, at least. Likely further.
|
| if test -x /sbin/sysctl; then
|
| lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
| @@ -6348,22 +6362,22 @@ else
|
| *)
|
| lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
|
| if test -n "$lt_cv_sys_max_cmd_len" && \
|
| - test undefined != "$lt_cv_sys_max_cmd_len"; then
|
| + test undefined != "$lt_cv_sys_max_cmd_len"; then
|
| lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
| lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
|
| else
|
| # Make teststring a little bigger before we do anything with it.
|
| # a 1K string should be a reasonable start.
|
| - for i in 1 2 3 4 5 6 7 8 ; do
|
| + for i in 1 2 3 4 5 6 7 8; do
|
| teststring=$teststring$teststring
|
| done
|
| SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
|
| # If test is not a shell built-in, we'll probably end up computing a
|
| # maximum length that is only half of the actual maximum length, but
|
| # we can't tell.
|
| - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
|
| + while { test X`env echo "$teststring$teststring" 2>/dev/null` \
|
| = "X$teststring$teststring"; } >/dev/null 2>&1 &&
|
| - test $i != 17 # 1/2 MB should be enough
|
| + test 17 != "$i" # 1/2 MB should be enough
|
| do
|
| i=`expr $i + 1`
|
| teststring=$teststring$teststring
|
| @@ -6381,7 +6395,7 @@ else
|
|
|
| fi
|
|
|
| -if test -n $lt_cv_sys_max_cmd_len ; then
|
| +if test -n "$lt_cv_sys_max_cmd_len"; then
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
|
| $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
|
| else
|
| @@ -6399,30 +6413,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
|
| : ${MV="mv -f"}
|
| : ${RM="rm -f"}
|
|
|
| -{ $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; }
|
| -
|
| -
|
| if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
| lt_unset=unset
|
| else
|
| @@ -6545,13 +6535,13 @@ esac
|
| reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
| case $host_os in
|
| cygwin* | mingw* | pw32* | cegcc*)
|
| - if test "$GCC" != yes; then
|
| + if test yes != "$GCC"; then
|
| reload_cmds=false
|
| fi
|
| ;;
|
| darwin*)
|
| - 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'
|
| else
|
| reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
| fi
|
| @@ -6676,13 +6666,13 @@ lt_cv_deplibs_check_method='unknown'
|
| # Need to set the preceding variable on all platforms that support
|
| # interlibrary dependencies.
|
| # 'none' -- dependencies not supported.
|
| -# `unknown' -- same as none, but documents that we really don't know.
|
| +# 'unknown' -- same as none, but documents that we really don't know.
|
| # 'pass_all' -- all dependencies passed with no checks.
|
| # 'test_compile' -- check by making test program.
|
| # 'file_magic [[regex]]' -- check by looking for files in library path
|
| -# 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.
|
|
|
| case $host_os in
|
| aix[4-9]*)
|
| @@ -6709,8 +6699,7 @@ mingw* | pw32*)
|
| # Base MSYS/MinGW do not provide the 'file' command needed by
|
| # func_win32_libid shell function, so use a weaker test based on 'objdump',
|
| # unless we find 'file', for example because we are cross-compiling.
|
| - # 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
|
| lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
| lt_cv_file_magic_cmd='func_win32_libid'
|
| else
|
| @@ -6788,7 +6777,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
|
|
| -netbsd* | netbsdelf*-gnu)
|
| +netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
| lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
|
| else
|
| @@ -6806,8 +6795,8 @@ newos6*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
|
|
| -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
|
| lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
|
| else
|
| lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
|
| @@ -6860,6 +6849,9 @@ sysv4 | sysv4.3*)
|
| tpf*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
| +os2*)
|
| + lt_cv_deplibs_check_method=pass_all
|
| + ;;
|
| esac
|
|
|
| fi
|
| @@ -7014,8 +7006,8 @@ else
|
|
|
| case $host_os in
|
| cygwin* | mingw* | pw32* | cegcc*)
|
| - # 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
|
| case `$DLLTOOL --help 2>&1` in
|
| *--identify-strict*)
|
| lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
|
| @@ -7027,7 +7019,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| ;;
|
| *)
|
| # fallback: assume linklib IS sharedlib
|
| - lt_cv_sharedlib_from_linklib_cmd="$ECHO"
|
| + lt_cv_sharedlib_from_linklib_cmd=$ECHO
|
| ;;
|
| esac
|
|
|
| @@ -7181,7 +7173,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_status=$?
|
| $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| test $ac_status = 0; }
|
| - if test "$ac_status" -eq 0; then
|
| + if test 0 -eq "$ac_status"; then
|
| # Ensure the archiver fails upon bogus file names.
|
| rm -f conftest.$ac_objext libconftest.a
|
| { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
|
| @@ -7189,7 +7181,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
|
| ac_status=$?
|
| $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| test $ac_status = 0; }
|
| - if test "$ac_status" -ne 0; then
|
| + if test 0 -ne "$ac_status"; then
|
| lt_cv_ar_at_file=@
|
| fi
|
| fi
|
| @@ -7202,7 +7194,7 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
|
| $as_echo "$lt_cv_ar_at_file" >&6; }
|
|
|
| -if test "x$lt_cv_ar_at_file" = xno; then
|
| +if test no = "$lt_cv_ar_at_file"; then
|
| archiver_list_spec=
|
| else
|
| archiver_list_spec=$lt_cv_ar_at_file
|
| @@ -7419,7 +7411,7 @@ old_postuninstall_cmds=
|
|
|
| if test -n "$RANLIB"; then
|
| case $host_os in
|
| - openbsd*)
|
| + bitrig* | openbsd*)
|
| old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
|
| ;;
|
| *)
|
| @@ -7509,7 +7501,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| symcode='[ABCDGISTW]'
|
| ;;
|
| hpux*)
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| symcode='[ABCDEGRST]'
|
| fi
|
| ;;
|
| @@ -7542,14 +7534,44 @@ case `$NM -V 2>&1` in
|
| symcode='[ABCDGIRSTW]' ;;
|
| esac
|
|
|
| +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
|
| +
|
| # Transform an extracted symbol line into a proper C declaration.
|
| # Some systems (esp. on ia64) link data and code symbols differently,
|
| # so use this general approach.
|
| -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'"
|
|
|
| # Transform an extracted symbol line into symbol name and symbol address
|
| -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'"
|
| +
|
| +# 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'"
|
|
|
| # Handle CRLF in mingw tool chain
|
| opt_cr=
|
| @@ -7567,21 +7589,24 @@ for ac_symprfx in "" "_"; do
|
|
|
| # Write the raw and C identifiers.
|
| if test "$lt_cv_nm_interface" = "MS dumpbin"; then
|
| - # 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.
|
| # Also find C++ and __fastcall symbols from MSVC++,
|
| # which start with @ or ?.
|
| lt_cv_sys_global_symbol_pipe="$AWK '"\
|
| " {last_section=section; section=\$ 3};"\
|
| " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
|
| " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
|
| +" /^ *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))};"\
|
| " \$ 0!~/External *\|/{next};"\
|
| " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
|
| " {if(hide[section]) next};"\
|
| -" {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))}"\
|
| " ' prfx=^$ac_symprfx"
|
| else
|
| lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
|
| @@ -7629,11 +7654,11 @@ _LT_EOF
|
| if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
|
| cat <<_LT_EOF > conftest.$ac_ext
|
| /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
|
| -#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
|
| relocations are performed -- see ld's documentation on pseudo-relocs. */
|
| # define LT_DLSYM_CONST
|
| -#elif defined(__osf__)
|
| +#elif defined __osf__
|
| /* This system does not cope well with relocations in const data. */
|
| # define LT_DLSYM_CONST
|
| #else
|
| @@ -7659,7 +7684,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
|
| {
|
| { "@PROGRAM@", (void *) 0 },
|
| _LT_EOF
|
| - $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
|
| cat <<\_LT_EOF >> conftest.$ac_ext
|
| {0, (void *) 0}
|
| };
|
| @@ -7679,13 +7704,13 @@ _LT_EOF
|
| mv conftest.$ac_objext conftstm.$ac_objext
|
| lt_globsym_save_LIBS=$LIBS
|
| lt_globsym_save_CFLAGS=$CFLAGS
|
| - LIBS="conftstm.$ac_objext"
|
| + LIBS=conftstm.$ac_objext
|
| CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
|
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
|
| (eval $ac_link) 2>&5
|
| ac_status=$?
|
| $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - test $ac_status = 0; } && test -s conftest${ac_exeext}; then
|
| + test $ac_status = 0; } && test -s conftest$ac_exeext; then
|
| pipe_works=yes
|
| fi
|
| LIBS=$lt_globsym_save_LIBS
|
| @@ -7706,7 +7731,7 @@ _LT_EOF
|
| rm -rf conftest* conftst*
|
|
|
| # Do not use the global_symbol_pipe unless it works.
|
| - if test "$pipe_works" = yes; then
|
| + if test yes = "$pipe_works"; then
|
| break
|
| else
|
| lt_cv_sys_global_symbol_pipe=
|
| @@ -7748,6 +7773,16 @@ fi
|
|
|
|
|
|
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
|
|
|
|
|
|
| @@ -7771,9 +7806,9 @@ fi
|
|
|
|
|
| lt_sysroot=
|
| -case ${with_sysroot} in #(
|
| +case $with_sysroot in #(
|
| yes)
|
| - if test "$GCC" = yes; then
|
| + if test yes = "$GCC"; then
|
| lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
| fi
|
| ;; #(
|
| @@ -7783,8 +7818,8 @@ case ${with_sysroot} in #(
|
| no|'')
|
| ;; #(
|
| *)
|
| - { $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; }
|
| as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
| ;;
|
| esac
|
| @@ -7796,18 +7831,99 @@ $as_echo "${lt_sysroot:-no}" >&6; }
|
|
|
|
|
|
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
|
| +$as_echo_n "checking for a working dd... " >&6; }
|
| +if ${ac_cv_path_lt_DD+:} false; then :
|
| + $as_echo_n "(cached) " >&6
|
| +else
|
| + printf 0123456789abcdef0123456789abcdef >conftest.i
|
| +cat conftest.i conftest.i >conftest2.i
|
| +: ${lt_DD:=$DD}
|
| +if test -z "$lt_DD"; then
|
| + ac_path_lt_DD_found=false
|
| + # Loop through the user's path and test for each of PROGNAME-LIST
|
| + 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_prog in dd; do
|
| + for ac_exec_ext in '' $ac_executable_extensions; do
|
| + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
|
| + as_fn_executable_p "$ac_path_lt_DD" || continue
|
| +if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
|
| + cmp -s conftest.i conftest.out \
|
| + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
|
| +fi
|
| + $ac_path_lt_DD_found && break 3
|
| + done
|
| + done
|
| + done
|
| +IFS=$as_save_IFS
|
| + if test -z "$ac_cv_path_lt_DD"; then
|
| + :
|
| + fi
|
| +else
|
| + ac_cv_path_lt_DD=$lt_DD
|
| +fi
|
| +
|
| +rm -f conftest.i conftest2.i conftest.out
|
| +fi
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
|
| +$as_echo "$ac_cv_path_lt_DD" >&6; }
|
| +
|
| +
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
|
| +$as_echo_n "checking how to truncate binary pipes... " >&6; }
|
| +if ${lt_cv_truncate_bin+:} false; then :
|
| + $as_echo_n "(cached) " >&6
|
| +else
|
| + printf 0123456789abcdef0123456789abcdef >conftest.i
|
| +cat conftest.i conftest.i >conftest2.i
|
| +lt_cv_truncate_bin=
|
| +if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
|
| + cmp -s conftest.i conftest.out \
|
| + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
|
| +fi
|
| +rm -f conftest.i conftest2.i conftest.out
|
| +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
|
| +fi
|
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
|
| +$as_echo "$lt_cv_truncate_bin" >&6; }
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
|
| +func_cc_basename ()
|
| +{
|
| + for cc_temp in $*""; do
|
| + case $cc_temp in
|
| + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
| + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
| + \-*) ;;
|
| + *) break;;
|
| + esac
|
| + done
|
| + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
| +}
|
| +
|
| # Check whether --enable-libtool-lock was given.
|
| if test "${enable_libtool_lock+set}" = set; then :
|
| enableval=$enable_libtool_lock;
|
| fi
|
|
|
| -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
| +test no = "$enable_libtool_lock" || enable_libtool_lock=yes
|
|
|
| # Some flags need to be propagated to the compiler or linker for good
|
| # libtool support.
|
| case $host in
|
| ia64-*-hpux*)
|
| - # Find out which ABI we are using.
|
| + # Find out what ABI is being produced by ac_compile, and set mode
|
| + # options accordingly.
|
| echo 'int i;' > conftest.$ac_ext
|
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
| (eval $ac_compile) 2>&5
|
| @@ -7816,24 +7932,25 @@ ia64-*-hpux*)
|
| test $ac_status = 0; }; then
|
| case `/usr/bin/file conftest.$ac_objext` in
|
| *ELF-32*)
|
| - HPUX_IA64_MODE="32"
|
| + HPUX_IA64_MODE=32
|
| ;;
|
| *ELF-64*)
|
| - HPUX_IA64_MODE="64"
|
| + HPUX_IA64_MODE=64
|
| ;;
|
| esac
|
| fi
|
| rm -rf conftest*
|
| ;;
|
| *-*-irix6*)
|
| - # Find out which ABI we are using.
|
| + # 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
|
| - if test "$lt_cv_prog_gnu_ld" = yes; then
|
| + if test yes = "$lt_cv_prog_gnu_ld"; then
|
| case `/usr/bin/file conftest.$ac_objext` in
|
| *32-bit*)
|
| LD="${LD-ld} -melf32bsmip"
|
| @@ -7862,9 +7979,50 @@ ia64-*-hpux*)
|
| rm -rf conftest*
|
| ;;
|
|
|
| +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*| \
|
| s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| - # 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.
|
| echo 'int i;' > conftest.$ac_ext
|
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
| (eval $ac_compile) 2>&5
|
| @@ -7887,10 +8045,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| ;;
|
| esac
|
| ;;
|
| - powerpc64le-*)
|
| + powerpc64le-*linux*)
|
| LD="${LD-ld} -m elf32lppclinux"
|
| ;;
|
| - powerpc64-*)
|
| + powerpc64-*linux*)
|
| LD="${LD-ld} -m elf32ppclinux"
|
| ;;
|
| s390x-*linux*)
|
| @@ -7909,10 +8067,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| x86_64-*linux*)
|
| LD="${LD-ld} -m elf_x86_64"
|
| ;;
|
| - powerpcle-*)
|
| + powerpcle-*linux*)
|
| LD="${LD-ld} -m elf64lppc"
|
| ;;
|
| - powerpc-*)
|
| + powerpc-*linux*)
|
| LD="${LD-ld} -m elf64ppc"
|
| ;;
|
| s390*-*linux*|s390*-*tpf*)
|
| @@ -7930,7 +8088,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
|
| *-*-sco3.2v5*)
|
| # On SCO OpenServer 5, we need -belf to get full-featured binaries.
|
| - SAVE_CFLAGS="$CFLAGS"
|
| + SAVE_CFLAGS=$CFLAGS
|
| CFLAGS="$CFLAGS -belf"
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
|
| $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
|
| @@ -7970,13 +8128,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
|
| $as_echo "$lt_cv_cc_needs_belf" >&6; }
|
| - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
|
| + if test yes != "$lt_cv_cc_needs_belf"; then
|
| # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
|
| - CFLAGS="$SAVE_CFLAGS"
|
| + CFLAGS=$SAVE_CFLAGS
|
| fi
|
| ;;
|
| *-*solaris*)
|
| - # Find out which ABI we are using.
|
| + # Find out what ABI is being produced by ac_compile, and set linker
|
| + # options accordingly.
|
| echo 'int i;' > conftest.$ac_ext
|
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
| (eval $ac_compile) 2>&5
|
| @@ -7988,7 +8147,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
|
| case $lt_cv_prog_gnu_ld in
|
| yes*)
|
| case $host in
|
| - i?86-*-solaris*)
|
| + i?86-*-solaris*|x86_64-*-solaris*)
|
| LD="${LD-ld} -m elf_x86_64"
|
| ;;
|
| sparc*-*-solaris*)
|
| @@ -7997,7 +8156,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
|
| esac
|
| # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
|
| if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
|
| - LD="${LD-ld}_sol2"
|
| + LD=${LD-ld}_sol2
|
| fi
|
| ;;
|
| *)
|
| @@ -8013,7 +8172,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
|
| ;;
|
| esac
|
|
|
| -need_locks="$enable_libtool_lock"
|
| +need_locks=$enable_libtool_lock
|
|
|
| if test -n "$ac_tool_prefix"; then
|
| # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
|
| @@ -8124,7 +8283,7 @@ else
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
|
| $as_echo "$lt_cv_path_mainfest_tool" >&6; }
|
| -if test "x$lt_cv_path_mainfest_tool" != xyes; then
|
| +if test yes != "$lt_cv_path_mainfest_tool"; then
|
| MANIFEST_TOOL=:
|
| fi
|
|
|
| @@ -8627,7 +8786,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| lt_cv_apple_cc_single_mod=no
|
| - if test -z "${LT_MULTI_MODULE}"; then
|
| + if test -z "$LT_MULTI_MODULE"; then
|
| # By default we will add the -single_module flag. You can override
|
| # by either setting the environment variable LT_MULTI_MODULE
|
| # non-empty at configure time, or by adding -multi_module to the
|
| @@ -8645,7 +8804,7 @@ else
|
| cat conftest.err >&5
|
| # Otherwise, if the output was created with a 0 exit code from
|
| # the compiler, it worked.
|
| - elif test -f libconftest.dylib && test $_lt_result -eq 0; then
|
| + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
|
| lt_cv_apple_cc_single_mod=yes
|
| else
|
| cat conftest.err >&5
|
| @@ -8684,7 +8843,7 @@ else
|
| fi
|
| rm -f core conftest.err conftest.$ac_objext \
|
| conftest$ac_exeext conftest.$ac_ext
|
| - LDFLAGS="$save_LDFLAGS"
|
| + LDFLAGS=$save_LDFLAGS
|
|
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
|
| @@ -8713,7 +8872,7 @@ _LT_EOF
|
| _lt_result=$?
|
| if test -s conftest.err && $GREP force_load conftest.err; then
|
| cat conftest.err >&5
|
| - 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
|
| lt_cv_ld_force_load=yes
|
| else
|
| cat conftest.err >&5
|
| @@ -8726,32 +8885,32 @@ fi
|
| $as_echo "$lt_cv_ld_force_load" >&6; }
|
| case $host_os in
|
| rhapsody* | darwin1.[012])
|
| - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
|
| + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
|
| darwin1.*)
|
| - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
| + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
| darwin*) # darwin 5.x on
|
| # if running on 10.5 or later, the deployment target defaults
|
| # to the OS version, if on x86, and 10.4, the deployment
|
| # target defaults to 10.4. Don't you love it?
|
| case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
| 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
|
| - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
| - 10.[012]*)
|
| - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
| + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
| + 10.[012][,.]*)
|
| + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
| 10.*)
|
| - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
| + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
| esac
|
| ;;
|
| esac
|
| - if test "$lt_cv_apple_cc_single_mod" = "yes"; then
|
| + if test yes = "$lt_cv_apple_cc_single_mod"; then
|
| _lt_dar_single_mod='$single_module'
|
| fi
|
| - 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'
|
| else
|
| - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
| + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
|
| fi
|
| - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
|
| + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
|
| _lt_dsymutil='~$DSYMUTIL $lib || :'
|
| else
|
| _lt_dsymutil=
|
| @@ -8759,6 +8918,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
|
| ;;
|
| esac
|
|
|
| +# func_munge_path_list VARIABLE PATH
|
| +# -----------------------------------
|
| +# VARIABLE is name of variable containing _space_ separated list of
|
| +# directories to be munged by the contents of PATH, which is string
|
| +# having a format:
|
| +# "DIR[:DIR]:"
|
| +# string "DIR[ DIR]" will be prepended to VARIABLE
|
| +# ":DIR[:DIR]"
|
| +# string "DIR[ DIR]" will be appended to VARIABLE
|
| +# "DIRP[:DIRP]::[DIRA:]DIRA"
|
| +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
|
| +# "DIRA[ DIRA]" will be appended to VARIABLE
|
| +# "DIR[:DIR]"
|
| +# VARIABLE will be replaced by "DIR[ DIR]"
|
| +func_munge_path_list ()
|
| +{
|
| + case x$2 in
|
| + x)
|
| + ;;
|
| + *:)
|
| + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
|
| + ;;
|
| + x:*)
|
| + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
|
| + ;;
|
| + *::*)
|
| + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
|
| + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
|
| + ;;
|
| + *)
|
| + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
|
| + ;;
|
| + esac
|
| +}
|
| +
|
| for ac_header in dlfcn.h
|
| do :
|
| ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
|
| @@ -9093,14 +9287,14 @@ if test "${enable_shared+set}" = set; then :
|
| *)
|
| enable_shared=no
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for pkg in $enableval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$pkg" = "X$p"; then
|
| enable_shared=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac
|
| else
|
| @@ -9124,14 +9318,14 @@ if test "${enable_static+set}" = set; then :
|
| *)
|
| enable_static=no
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for pkg in $enableval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$pkg" = "X$p"; then
|
| enable_static=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac
|
| else
|
| @@ -9155,14 +9349,14 @@ if test "${with_pic+set}" = set; then :
|
| *)
|
| pic_mode=default
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for lt_pkg in $withval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$lt_pkg" = "X$lt_p"; then
|
| pic_mode=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac
|
| else
|
| @@ -9170,8 +9364,6 @@ else
|
| fi
|
|
|
|
|
| -test -z "$pic_mode" && pic_mode=default
|
| -
|
|
|
|
|
|
|
| @@ -9187,14 +9379,14 @@ if test "${enable_fast_install+set}" = set; then :
|
| *)
|
| enable_fast_install=no
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for pkg in $enableval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$pkg" = "X$p"; then
|
| enable_fast_install=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac
|
| else
|
| @@ -9208,11 +9400,63 @@ fi
|
|
|
|
|
|
|
| + shared_archive_member_spec=
|
| +case $host,$enable_shared in
|
| +power*-*-aix[5-9]*,yes)
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
|
| +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
|
| +
|
| +# Check whether --with-aix-soname was given.
|
| +if test "${with_aix_soname+set}" = set; then :
|
| + withval=$with_aix_soname; case $withval in
|
| + aix|svr4|both)
|
| + ;;
|
| + *)
|
| + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
|
| + ;;
|
| + esac
|
| + lt_cv_with_aix_soname=$with_aix_soname
|
| +else
|
| + if ${lt_cv_with_aix_soname+:} false; then :
|
| + $as_echo_n "(cached) " >&6
|
| +else
|
| + lt_cv_with_aix_soname=aix
|
| +fi
|
| +
|
| + with_aix_soname=$lt_cv_with_aix_soname
|
| +fi
|
| +
|
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
|
| +$as_echo "$with_aix_soname" >&6; }
|
| + if test aix != "$with_aix_soname"; then
|
| + # For the AIX way of multilib, we name the shared archive member
|
| + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
|
| + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
|
| + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
|
| + # the AIX toolchain works better with OBJECT_MODE set (default 32).
|
| + if test 64 = "${OBJECT_MODE-32}"; then
|
| + shared_archive_member_spec=shr_64
|
| + else
|
| + shared_archive_member_spec=shr
|
| + fi
|
| + fi
|
| + ;;
|
| +*)
|
| + with_aix_soname=aix
|
| + ;;
|
| +esac
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
|
|
|
|
|
|
| # This can be used to rebuild libtool when needed
|
| -LIBTOOL_DEPS="$ltmain"
|
| +LIBTOOL_DEPS=$ltmain
|
|
|
| # Always use our own libtool.
|
| LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
| @@ -9261,7 +9505,7 @@ test -z "$LN_S" && LN_S="ln -s"
|
|
|
|
|
|
|
| -if test -n "${ZSH_VERSION+set}" ; then
|
| +if test -n "${ZSH_VERSION+set}"; then
|
| setopt NO_GLOB_SUBST
|
| fi
|
|
|
| @@ -9300,7 +9544,7 @@ aix3*)
|
| # AIX sometimes has problems with the GCC collect2 program. For some
|
| # reason, if we set the COLLECT_NAMES environment variable, the problems
|
| # vanish in a puff of smoke.
|
| - if test "X${COLLECT_NAMES+set}" != Xset; then
|
| + if test set != "${COLLECT_NAMES+set}"; then
|
| COLLECT_NAMES=
|
| export COLLECT_NAMES
|
| fi
|
| @@ -9311,14 +9555,14 @@ esac
|
| ofile=libtool
|
| can_build_shared=yes
|
|
|
| -# All known linkers require a `.a' archive for static linking (except MSVC,
|
| +# All known linkers require a '.a' archive for static linking (except MSVC,
|
| # which needs '.lib').
|
| libext=a
|
|
|
| -with_gnu_ld="$lt_cv_prog_gnu_ld"
|
| +with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
|
| -old_CC="$CC"
|
| -old_CFLAGS="$CFLAGS"
|
| +old_CC=$CC
|
| +old_CFLAGS=$CFLAGS
|
|
|
| # Set sane defaults for various variables
|
| test -z "$CC" && CC=cc
|
| @@ -9327,15 +9571,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
|
| test -z "$LD" && LD=ld
|
| test -z "$ac_objext" && ac_objext=o
|
|
|
| -for cc_temp in $compiler""; do
|
| - case $cc_temp in
|
| - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
| - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
| - \-*) ;;
|
| - *) break;;
|
| - esac
|
| -done
|
| -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
| +func_cc_basename $compiler
|
| +cc_basename=$func_cc_basename_result
|
|
|
|
|
| # Only perform the check for file, if the check method requires it
|
| @@ -9350,22 +9587,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
|
| else
|
| case $MAGIC_CMD in
|
| [\\/*] | ?:[\\/]*)
|
| - 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.
|
| ;;
|
| *)
|
| - 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
|
| ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
|
| for ac_dir in $ac_dummy; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| test -z "$ac_dir" && ac_dir=.
|
| - 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"
|
| if test -n "$file_magic_test_file"; then
|
| case $deplibs_check_method in
|
| "file_magic "*)
|
| file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
|
| - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
| + MAGIC_CMD=$lt_cv_path_MAGIC_CMD
|
| if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
|
| $EGREP "$file_magic_regex" > /dev/null; then
|
| :
|
| @@ -9388,13 +9625,13 @@ _LT_EOF
|
| break
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| - MAGIC_CMD="$lt_save_MAGIC_CMD"
|
| + IFS=$lt_save_ifs
|
| + MAGIC_CMD=$lt_save_MAGIC_CMD
|
| ;;
|
| esac
|
| fi
|
|
|
| -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
| +MAGIC_CMD=$lt_cv_path_MAGIC_CMD
|
| if test -n "$MAGIC_CMD"; then
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
|
| $as_echo "$MAGIC_CMD" >&6; }
|
| @@ -9416,22 +9653,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
|
| else
|
| case $MAGIC_CMD in
|
| [\\/*] | ?:[\\/]*)
|
| - 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.
|
| ;;
|
| *)
|
| - 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
|
| ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
|
| for ac_dir in $ac_dummy; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| test -z "$ac_dir" && ac_dir=.
|
| - 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"
|
| if test -n "$file_magic_test_file"; then
|
| case $deplibs_check_method in
|
| "file_magic "*)
|
| file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
|
| - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
| + MAGIC_CMD=$lt_cv_path_MAGIC_CMD
|
| if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
|
| $EGREP "$file_magic_regex" > /dev/null; then
|
| :
|
| @@ -9454,13 +9691,13 @@ _LT_EOF
|
| break
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| - MAGIC_CMD="$lt_save_MAGIC_CMD"
|
| + IFS=$lt_save_ifs
|
| + MAGIC_CMD=$lt_save_MAGIC_CMD
|
| ;;
|
| esac
|
| fi
|
|
|
| -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
| +MAGIC_CMD=$lt_cv_path_MAGIC_CMD
|
| if test -n "$MAGIC_CMD"; then
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
|
| $as_echo "$MAGIC_CMD" >&6; }
|
| @@ -9481,7 +9718,7 @@ esac
|
|
|
| # Use C for the default configuration in the libtool script
|
|
|
| -lt_save_CC="$CC"
|
| +lt_save_CC=$CC
|
| ac_ext=c
|
| ac_cpp='$CPP $CPPFLAGS'
|
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
| @@ -9539,7 +9776,7 @@ if test -n "$compiler"; then
|
|
|
| lt_prog_compiler_no_builtin_flag=
|
|
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| case $cc_basename in
|
| nvcc*)
|
| lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
|
| @@ -9555,7 +9792,7 @@ else
|
| lt_cv_prog_compiler_rtti_exceptions=no
|
| ac_outfile=conftest.$ac_objext
|
| echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
| - lt_compiler_flag="-fno-rtti -fno-exceptions"
|
| + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
|
| # Insert the option either (1) after the last *FLAGS variable, or
|
| # (2) before a word containing "conftest.", or (3) at the end.
|
| # Note that $ac_compile itself does not contain backslashes and begins
|
| @@ -9585,7 +9822,7 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
|
| $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
|
|
|
| -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
|
| +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
|
| lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
|
| else
|
| :
|
| @@ -9603,17 +9840,18 @@ lt_prog_compiler_pic=
|
| lt_prog_compiler_static=
|
|
|
|
|
| - if test "$GCC" = yes; then
|
| + if test yes = "$GCC"; then
|
| lt_prog_compiler_wl='-Wl,'
|
| lt_prog_compiler_static='-static'
|
|
|
| case $host_os in
|
| aix*)
|
| # All AIX code is PIC.
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 now supports IA64 processor
|
| lt_prog_compiler_static='-Bstatic'
|
| fi
|
| + lt_prog_compiler_pic='-fPIC'
|
| ;;
|
|
|
| amigaos*)
|
| @@ -9624,8 +9862,8 @@ lt_prog_compiler_static=
|
| ;;
|
| m68k)
|
| # FIXME: we need at least 68020 code to build shared libraries, but
|
| - # adding the `-m68020' flag to GCC prevents building anything better,
|
| - # like `-m68040'.
|
| + # adding the '-m68020' flag to GCC prevents building anything better,
|
| + # like '-m68040'.
|
| lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
|
| ;;
|
| esac
|
| @@ -9641,6 +9879,11 @@ lt_prog_compiler_static=
|
| # Although the cygwin gcc ignores -fPIC, still need this for old-style
|
| # (--disable-auto-import) libraries
|
| lt_prog_compiler_pic='-DDLL_EXPORT'
|
| + case $host_os in
|
| + os2*)
|
| + lt_prog_compiler_static='$wl-static'
|
| + ;;
|
| + esac
|
| ;;
|
|
|
| darwin* | rhapsody*)
|
| @@ -9711,7 +9954,7 @@ lt_prog_compiler_static=
|
| case $host_os in
|
| aix*)
|
| lt_prog_compiler_wl='-Wl,'
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 now supports IA64 processor
|
| lt_prog_compiler_static='-Bstatic'
|
| else
|
| @@ -9719,10 +9962,29 @@ lt_prog_compiler_static=
|
| fi
|
| ;;
|
|
|
| + 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
|
| + ;;
|
| +
|
| mingw* | cygwin* | pw32* | os2* | cegcc*)
|
| # This hack is so that the source file can tell whether it is being
|
| # built for inclusion in a dll (and should export symbols for example).
|
| lt_prog_compiler_pic='-DDLL_EXPORT'
|
| + case $host_os in
|
| + os2*)
|
| + lt_prog_compiler_static='$wl-static'
|
| + ;;
|
| + esac
|
| ;;
|
|
|
| hpux9* | hpux10* | hpux11*)
|
| @@ -9738,7 +10000,7 @@ lt_prog_compiler_static=
|
| ;;
|
| esac
|
| # Is there a better lt_prog_compiler_static that works with the bundled CC?
|
| - lt_prog_compiler_static='${wl}-a ${wl}archive'
|
| + lt_prog_compiler_static='$wl-a ${wl}archive'
|
| ;;
|
|
|
| irix5* | irix6* | nonstopux*)
|
| @@ -9749,7 +10011,7 @@ lt_prog_compiler_static=
|
|
|
| linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| case $cc_basename in
|
| - # old Intel for x86_64 which still supported -KPIC.
|
| + # old Intel for x86_64, which still supported -KPIC.
|
| ecc*)
|
| lt_prog_compiler_wl='-Wl,'
|
| lt_prog_compiler_pic='-KPIC'
|
| @@ -9774,6 +10036,12 @@ lt_prog_compiler_static=
|
| lt_prog_compiler_pic='-PIC'
|
| lt_prog_compiler_static='-Bstatic'
|
| ;;
|
| + tcc*)
|
| + # Fabrice Bellard et al's Tiny C Compiler
|
| + lt_prog_compiler_wl='-Wl,'
|
| + lt_prog_compiler_pic='-fPIC'
|
| + lt_prog_compiler_static='-static'
|
| + ;;
|
| pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
|
| # Portland Group compilers (*not* the Pentium gcc compiler,
|
| # which looks to be a dead project)
|
| @@ -9871,7 +10139,7 @@ lt_prog_compiler_static=
|
| ;;
|
|
|
| sysv4*MP*)
|
| - if test -d /usr/nec ;then
|
| + if test -d /usr/nec; then
|
| lt_prog_compiler_pic='-Kconform_pic'
|
| lt_prog_compiler_static='-Bstatic'
|
| fi
|
| @@ -9900,7 +10168,7 @@ lt_prog_compiler_static=
|
| fi
|
|
|
| case $host_os in
|
| - # For platforms which do not support PIC, -DPIC is meaningless:
|
| + # For platforms that do not support PIC, -DPIC is meaningless:
|
| *djgpp*)
|
| lt_prog_compiler_pic=
|
| ;;
|
| @@ -9932,7 +10200,7 @@ else
|
| lt_cv_prog_compiler_pic_works=no
|
| ac_outfile=conftest.$ac_objext
|
| echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
| - lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
|
| + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
|
| # Insert the option either (1) after the last *FLAGS variable, or
|
| # (2) before a word containing "conftest.", or (3) at the end.
|
| # Note that $ac_compile itself does not contain backslashes and begins
|
| @@ -9962,7 +10230,7 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
|
| $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
|
|
|
| -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
|
| +if test yes = "$lt_cv_prog_compiler_pic_works"; then
|
| case $lt_prog_compiler_pic in
|
| "" | " "*) ;;
|
| *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
|
| @@ -9994,7 +10262,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| lt_cv_prog_compiler_static_works=no
|
| - save_LDFLAGS="$LDFLAGS"
|
| + save_LDFLAGS=$LDFLAGS
|
| LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
|
| echo "$lt_simple_link_test_code" > conftest.$ac_ext
|
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
|
| @@ -10013,13 +10281,13 @@ else
|
| fi
|
| fi
|
| $RM -r conftest*
|
| - LDFLAGS="$save_LDFLAGS"
|
| + LDFLAGS=$save_LDFLAGS
|
|
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
|
| $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
|
|
|
| -if test x"$lt_cv_prog_compiler_static_works" = xyes; then
|
| +if test yes = "$lt_cv_prog_compiler_static_works"; then
|
| :
|
| else
|
| lt_prog_compiler_static=
|
| @@ -10139,8 +10407,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
|
|
|
|
|
|
|
| -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
|
| # do not overwrite the value of need_locks provided by the user
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
|
| $as_echo_n "checking if we can lock with hard links... " >&6; }
|
| @@ -10152,9 +10420,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
|
| ln conftest.a conftest.b 2>/dev/null && hard_links=no
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
|
| $as_echo "$hard_links" >&6; }
|
| - 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;}
|
| need_locks=warn
|
| fi
|
| else
|
| @@ -10197,9 +10465,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
| # included in the symbol list
|
| include_expsyms=
|
| # exclude_expsyms can be an extended regexp of symbols to exclude
|
| - # 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'.
|
| exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
|
| # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
|
| # platforms (ab)use it in PIC code, but their linkers get confused if
|
| @@ -10214,7 +10482,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
| # FIXME: the MSVC++ port hasn't been tested in a loooong time
|
| # When not using gcc, we currently assume that we are using
|
| # Microsoft Visual C++.
|
| - if test "$GCC" != yes; then
|
| + if test yes != "$GCC"; then
|
| with_gnu_ld=no
|
| fi
|
| ;;
|
| @@ -10222,12 +10490,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
| # we just hope/assume this is gcc and not c89 (= MSVC++)
|
| with_gnu_ld=yes
|
| ;;
|
| - openbsd*)
|
| + openbsd* | bitrig*)
|
| with_gnu_ld=no
|
| ;;
|
| - linux* | k*bsd*-gnu | gnu*)
|
| - link_all_deplibs=no
|
| - ;;
|
| esac
|
|
|
| ld_shlibs=yes
|
| @@ -10235,7 +10500,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
| # On some targets, GNU ld is compatible enough with the native linker
|
| # that we're better off using the native interface for both.
|
| lt_use_gnu_ld_interface=no
|
| - if test "$with_gnu_ld" = yes; then
|
| + if test yes = "$with_gnu_ld"; then
|
| case $host_os in
|
| aix*)
|
| # The AIX port of GNU ld has always aspired to compatibility
|
| @@ -10257,24 +10522,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
| esac
|
| fi
|
|
|
| - if test "$lt_use_gnu_ld_interface" = yes; then
|
| + if test yes = "$lt_use_gnu_ld_interface"; then
|
| # If archive_cmds runs LD, not CC, wlarc should be empty
|
| - wlarc='${wl}'
|
| + wlarc='$wl'
|
|
|
| # Set some defaults for GNU ld with shared library support. These
|
| # are reset later if shared libraries are not supported. Putting them
|
| # here allows them to be overridden if necessary.
|
| runpath_var=LD_RUN_PATH
|
| - 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'
|
| # ancient GNU ld didn't support --whole-archive et. al.
|
| if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
|
| - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
| + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
|
| else
|
| whole_archive_flag_spec=
|
| fi
|
| supports_anon_versioning=no
|
| - case `$LD -v 2>&1` in
|
| + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
|
| *GNU\ gold*) supports_anon_versioning=yes ;;
|
| *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
|
| *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
|
| @@ -10287,7 +10552,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
| case $host_os in
|
| aix[3-9]*)
|
| # On AIX/PPC, the GNU linker is very broken
|
| - if test "$host_cpu" != ia64; then
|
| + if test ia64 != "$host_cpu"; then
|
| ld_shlibs=no
|
| cat <<_LT_EOF 1>&2
|
|
|
| @@ -10306,7 +10571,7 @@ _LT_EOF
|
| case $host_cpu in
|
| powerpc)
|
| # see comment about AmigaOS4 .so support
|
| - 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'
|
| archive_expsym_cmds=''
|
| ;;
|
| m68k)
|
| @@ -10322,7 +10587,7 @@ _LT_EOF
|
| allow_undefined_flag=unsupported
|
| # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
| # support --undefined. This deserves some investigation. FIXME
|
| - 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'
|
| else
|
| ld_shlibs=no
|
| fi
|
| @@ -10332,7 +10597,7 @@ _LT_EOF
|
| # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
|
| # as there is no search path for DLLs.
|
| hardcode_libdir_flag_spec='-L$libdir'
|
| - export_dynamic_flag_spec='${wl}--export-all-symbols'
|
| + export_dynamic_flag_spec='$wl--export-all-symbols'
|
| allow_undefined_flag=unsupported
|
| always_export_symbols=no
|
| enable_shared_with_static_runtimes=yes
|
| @@ -10340,61 +10605,89 @@ _LT_EOF
|
| exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
|
|
|
| if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
| - 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'
|
| else
|
| ld_shlibs=no
|
| fi
|
| ;;
|
|
|
| haiku*)
|
| - 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'
|
| link_all_deplibs=yes
|
| ;;
|
|
|
| + os2*)
|
| + hardcode_libdir_flag_spec='-L$libdir'
|
| + hardcode_minus_L=yes
|
| + allow_undefined_flag=unsupported
|
| + shrext_cmds=.dll
|
| + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
|
| + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
|
| + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
| + $ECHO EXPORTS >> $output_objdir/$libname.def~
|
| + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
|
| + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
|
| + emximp -o $lib $output_objdir/$libname.def'
|
| + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
|
| + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
|
| + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
| + $ECHO EXPORTS >> $output_objdir/$libname.def~
|
| + prefix_cmds="$SED"~
|
| + if test EXPORTS = "`$SED 1q $export_symbols`"; then
|
| + prefix_cmds="$prefix_cmds -e 1d";
|
| + fi~
|
| + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
|
| + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
|
| + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
|
| + emximp -o $lib $output_objdir/$libname.def'
|
| + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
|
| + enable_shared_with_static_runtimes=yes
|
| + ;;
|
| +
|
| interix[3-9]*)
|
| hardcode_direct=no
|
| hardcode_shlibpath_var=no
|
| - 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'
|
| # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
|
| # Instead, shared libraries are loaded at an image base (0x10000000 by
|
| # default) and relocated if they conflict, which is a slow very memory
|
| # consuming and fragmenting process. To avoid this, we pick a random,
|
| # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
|
| # time. Moving up from 0x10000000 also allows more sbrk(2) space.
|
| - 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'
|
| ;;
|
|
|
| gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
| tmp_diet=no
|
| - if test "$host_os" = linux-dietlibc; then
|
| + if test linux-dietlibc = "$host_os"; then
|
| case $cc_basename in
|
| diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
|
| esac
|
| fi
|
| if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
|
| - && test "$tmp_diet" = no
|
| + && test no = "$tmp_diet"
|
| then
|
| tmp_addflag=' $pic_flag'
|
| tmp_sharedflag='-shared'
|
| case $cc_basename,$host_cpu in
|
| pgcc*) # Portland Group C compiler
|
| - 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'
|
| tmp_addflag=' $pic_flag'
|
| ;;
|
| pgf77* | pgf90* | pgf95* | pgfortran*)
|
| # Portland Group f77 and f90 compilers
|
| - 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'
|
| tmp_addflag=' $pic_flag -Mnomain' ;;
|
| ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
|
| tmp_addflag=' -i_dynamic' ;;
|
| @@ -10405,42 +10698,47 @@ _LT_EOF
|
| lf95*) # Lahey Fortran 8.1
|
| whole_archive_flag_spec=
|
| tmp_sharedflag='--shared' ;;
|
| + nagfor*) # NAGFOR 5.3
|
| + tmp_sharedflag='-Wl,-shared' ;;
|
| xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
|
| tmp_sharedflag='-qmkshrobj'
|
| tmp_addflag= ;;
|
| nvcc*) # Cuda Compiler Driver 2.2
|
| - 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'
|
| compiler_needs_object=yes
|
| ;;
|
| esac
|
| case `$CC -V 2>&1 | sed 5q` in
|
| *Sun\ C*) # Sun C 5.9
|
| - 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'
|
| compiler_needs_object=yes
|
| tmp_sharedflag='-G' ;;
|
| *Sun\ F*) # Sun Fortran 8.3
|
| tmp_sharedflag='-G' ;;
|
| esac
|
| - 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'
|
|
|
| - if test "x$supports_anon_versioning" = xyes; then
|
| + if test yes = "$supports_anon_versioning"; then
|
| archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
|
| - 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'
|
| fi
|
|
|
| case $cc_basename in
|
| + tcc*)
|
| + export_dynamic_flag_spec='-rdynamic'
|
| + ;;
|
| xlf* | bgf* | bgxlf* | mpixlf*)
|
| # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
|
| whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
|
| - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
| + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
|
| archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
|
| - if test "x$supports_anon_versioning" = xyes; then
|
| + if test yes = "$supports_anon_versioning"; then
|
| archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
|
| - 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'
|
| fi
|
| ;;
|
| esac
|
| @@ -10449,13 +10747,13 @@ _LT_EOF
|
| fi
|
| ;;
|
|
|
| - netbsd* | netbsdelf*-gnu)
|
| + netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
| wlarc=
|
| else
|
| - 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'
|
| fi
|
| ;;
|
|
|
| @@ -10473,8 +10771,8 @@ _LT_EOF
|
|
|
| _LT_EOF
|
| elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
| - 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'
|
| else
|
| ld_shlibs=no
|
| fi
|
| @@ -10486,7 +10784,7 @@ _LT_EOF
|
| ld_shlibs=no
|
| cat <<_LT_EOF 1>&2
|
|
|
| -*** 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
|
| *** reliably create shared libraries on SCO systems. Therefore, libtool
|
| *** is disabling shared libraries support. We urge you to upgrade GNU
|
| *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
|
| @@ -10501,9 +10799,9 @@ _LT_EOF
|
| # DT_RUNPATH tag from executables and libraries. But doing so
|
| # requires that you compile everything twice, which is a pain.
|
| if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
| - 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'
|
| else
|
| ld_shlibs=no
|
| fi
|
| @@ -10520,15 +10818,15 @@ _LT_EOF
|
|
|
| *)
|
| if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
| - 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'
|
| else
|
| ld_shlibs=no
|
| fi
|
| ;;
|
| esac
|
|
|
| - if test "$ld_shlibs" = no; then
|
| + if test no = "$ld_shlibs"; then
|
| runpath_var=
|
| hardcode_libdir_flag_spec=
|
| export_dynamic_flag_spec=
|
| @@ -10544,7 +10842,7 @@ _LT_EOF
|
| # Note: this linker hardcodes the directories in LIBPATH if there
|
| # are no directories specified by -L.
|
| hardcode_minus_L=yes
|
| - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
|
| + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
|
| # Neither direct hardcoding nor static linking is supported with a
|
| # broken collect2.
|
| hardcode_direct=unsupported
|
| @@ -10552,34 +10850,57 @@ _LT_EOF
|
| ;;
|
|
|
| aix[4-9]*)
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # On IA64, the linker does run time linking by default, so we don't
|
| # have to do anything special.
|
| aix_use_runtimelinking=no
|
| exp_sym_flag='-Bexport'
|
| - no_entry_flag=""
|
| + no_entry_flag=
|
| else
|
| # If we're using GNU nm, then we don't want the "-C" option.
|
| - # -C means demangle to AIX nm, but means don't demangle with GNU nm
|
| - # Also, AIX nm treats weak defined symbols like other global
|
| - # defined symbols, whereas GNU nm marks them as "W".
|
| + # -C means demangle to GNU nm, but means don't demangle to AIX nm.
|
| + # Without the "-l" option, or with the "-B" option, AIX nm treats
|
| + # weak defined symbols like other global defined symbols, whereas
|
| + # GNU nm marks them as "W".
|
| + # While the 'weak' keyword is ignored in the Export File, we need
|
| + # it in the Import File for the 'aix-soname' feature, so we have
|
| + # to replace the "-B" option with "-P" for AIX nm.
|
| if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
| - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
| + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
|
| else
|
| - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
| + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
|
| fi
|
| aix_use_runtimelinking=no
|
|
|
| # Test if we are trying to use run time linking or normal
|
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
| - # need to do runtime linking.
|
| + # have runtime linking enabled, and use it for executables.
|
| + # For shared libraries, we enable/disable runtime linking
|
| + # depending on the kind of the shared library created -
|
| + # when "with_aix_soname,aix_use_runtimelinking" is:
|
| + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
|
| + # "aix,yes" lib.so shared, rtl:yes, for executables
|
| + # lib.a static archive
|
| + # "both,no" lib.so.V(shr.o) shared, rtl:yes
|
| + # lib.a(lib.so.V) shared, rtl:no, for executables
|
| + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
|
| + # lib.a(lib.so.V) shared, rtl:no
|
| + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
|
| + # lib.a static archive
|
| case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
|
| for ld_flag in $LDFLAGS; do
|
| - 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
|
| aix_use_runtimelinking=yes
|
| break
|
| fi
|
| done
|
| + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
|
| + # With aix-soname=svr4, we create the lib.so.V shared archives only,
|
| + # so we don't have lib.a shared libs to link our executables.
|
| + # We have to force runtime linking in this case.
|
| + aix_use_runtimelinking=yes
|
| + LDFLAGS="$LDFLAGS -Wl,-brtl"
|
| + fi
|
| ;;
|
| esac
|
|
|
| @@ -10598,13 +10919,21 @@ _LT_EOF
|
| hardcode_direct_absolute=yes
|
| hardcode_libdir_separator=':'
|
| link_all_deplibs=yes
|
| - file_list_spec='${wl}-f,'
|
| + file_list_spec='$wl-f,'
|
| + case $with_aix_soname,$aix_use_runtimelinking in
|
| + aix,*) ;; # traditional, no import file
|
| + svr4,* | *,yes) # use import file
|
| + # The Import File defines what to hardcode.
|
| + hardcode_direct=no
|
| + hardcode_direct_absolute=no
|
| + ;;
|
| + esac
|
|
|
| - if test "$GCC" = yes; then
|
| + if test yes = "$GCC"; then
|
| case $host_os in aix4.[012]|aix4.[012].*)
|
| # We only want to do this on AIX 4.2 and lower, the check
|
| # below for broken collect2 doesn't work under 4.3+
|
| - collect2name=`${CC} -print-prog-name=collect2`
|
| + collect2name=`$CC -print-prog-name=collect2`
|
| if test -f "$collect2name" &&
|
| strings "$collect2name" | $GREP resolve_lib_name >/dev/null
|
| then
|
| @@ -10623,36 +10952,42 @@ _LT_EOF
|
| ;;
|
| esac
|
| shared_flag='-shared'
|
| - 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'
|
| fi
|
| - link_all_deplibs=no
|
| + # Need to ensure runtime linking is disabled for the traditional
|
| + # shared library, or the linker may eventually find shared libraries
|
| + # /with/ Import File - we do not want to mix them.
|
| + shared_flag_aix='-shared'
|
| + shared_flag_svr4='-shared $wl-G'
|
| else
|
| # not using gcc
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
| # chokes on -Wl,-G. The following line is correct:
|
| shared_flag='-G'
|
| else
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| - shared_flag='${wl}-G'
|
| + if test yes = "$aix_use_runtimelinking"; then
|
| + shared_flag='$wl-G'
|
| else
|
| - shared_flag='${wl}-bM:SRE'
|
| + shared_flag='$wl-bM:SRE'
|
| fi
|
| + shared_flag_aix='$wl-bM:SRE'
|
| + shared_flag_svr4='$wl-G'
|
| fi
|
| fi
|
|
|
| - export_dynamic_flag_spec='${wl}-bexpall'
|
| + export_dynamic_flag_spec='$wl-bexpall'
|
| # It seems that -bexpall does not export symbols beginning with
|
| # underscore (_), so it is better to generate a list of symbols to export.
|
| always_export_symbols=yes
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
|
| # Warning - without using the other runtime loading flags (-brtl),
|
| # -berok will link without error, but may produce a broken library.
|
| allow_undefined_flag='-berok'
|
| # Determine the default libpath from the value encoded in an
|
| # empty executable.
|
| - if test "${lt_cv_aix_libpath+set}" = set; then
|
| + if test set = "${lt_cv_aix_libpath+set}"; then
|
| aix_libpath=$lt_cv_aix_libpath
|
| else
|
| if ${lt_cv_aix_libpath_+:} false; then :
|
| @@ -10687,7 +11022,7 @@ fi
|
| rm -f core conftest.err conftest.$ac_objext \
|
| conftest$ac_exeext conftest.$ac_ext
|
| if test -z "$lt_cv_aix_libpath_"; then
|
| - lt_cv_aix_libpath_="/usr/lib:/lib"
|
| + lt_cv_aix_libpath_=/usr/lib:/lib
|
| fi
|
|
|
| fi
|
| @@ -10695,17 +11030,17 @@ fi
|
| aix_libpath=$lt_cv_aix_libpath_
|
| fi
|
|
|
| - 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
|
| else
|
| - 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'
|
| allow_undefined_flag="-z nodefs"
|
| - 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"
|
| else
|
| # Determine the default libpath from the value encoded in an
|
| # empty executable.
|
| - if test "${lt_cv_aix_libpath+set}" = set; then
|
| + if test set = "${lt_cv_aix_libpath+set}"; then
|
| aix_libpath=$lt_cv_aix_libpath
|
| else
|
| if ${lt_cv_aix_libpath_+:} false; then :
|
| @@ -10740,7 +11075,7 @@ fi
|
| rm -f core conftest.err conftest.$ac_objext \
|
| conftest$ac_exeext conftest.$ac_ext
|
| if test -z "$lt_cv_aix_libpath_"; then
|
| - lt_cv_aix_libpath_="/usr/lib:/lib"
|
| + lt_cv_aix_libpath_=/usr/lib:/lib
|
| fi
|
|
|
| fi
|
| @@ -10748,21 +11083,33 @@ fi
|
| aix_libpath=$lt_cv_aix_libpath_
|
| fi
|
|
|
| - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
| + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
|
| # Warning - without using the other run time loading flags,
|
| # -berok will link without error, but may produce a broken library.
|
| - 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
|
| # We only use this code for GNU lds that support --whole-archive.
|
| - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
| + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
|
| else
|
| # Exported symbols can be pulled into shared objects from archives
|
| whole_archive_flag_spec='$convenience'
|
| fi
|
| archive_cmds_need_lc=yes
|
| - # This is similar to how AIX traditionally builds its shared libraries.
|
| - 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='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
|
| + # -brtl affects multiple linker settings, -berok does not and is overridden later
|
| + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
|
| + if test svr4 != "$with_aix_soname"; then
|
| + # This is similar to how AIX traditionally builds its shared libraries.
|
| + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
|
| + fi
|
| + if test aix != "$with_aix_soname"; then
|
| + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
|
| + else
|
| + # used by -dlpreopen to get the symbols
|
| + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
|
| + fi
|
| + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
|
| fi
|
| fi
|
| ;;
|
| @@ -10771,7 +11118,7 @@ fi
|
| case $host_cpu in
|
| powerpc)
|
| # see comment about AmigaOS4 .so support
|
| - 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'
|
| archive_expsym_cmds=''
|
| ;;
|
| m68k)
|
| @@ -10801,16 +11148,17 @@ fi
|
| # Tell ltmain to make .lib files, not .a files.
|
| libext=lib
|
| # Tell ltmain to make .dll files, not .so files.
|
| - shrext_cmds=".dll"
|
| + shrext_cmds=.dll
|
| # FIXME: Setting linknames here is a bad hack.
|
| - 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='
|
| # The linker will not automatically build a static lib if we build a DLL.
|
| # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
|
| enable_shared_with_static_runtimes=yes
|
| @@ -10819,18 +11167,18 @@ fi
|
| # Don't use ranlib
|
| old_postinstall_cmds='chmod 644 $oldlib'
|
| postlink_cmds='lt_outputfile="@OUTPUT@"~
|
| - 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'
|
| ;;
|
| *)
|
| # Assume MSVC wrapper
|
| @@ -10839,7 +11187,7 @@ fi
|
| # Tell ltmain to make .lib files, not .a files.
|
| libext=lib
|
| # Tell ltmain to make .dll files, not .so files.
|
| - shrext_cmds=".dll"
|
| + shrext_cmds=.dll
|
| # FIXME: Setting linknames here is a bad hack.
|
| archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
|
| # The linker will automatically build a .lib file if we build a DLL.
|
| @@ -10858,24 +11206,24 @@ fi
|
| hardcode_direct=no
|
| hardcode_automatic=yes
|
| hardcode_shlibpath_var=unsupported
|
| - 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\"`'
|
|
|
| else
|
| whole_archive_flag_spec=''
|
| fi
|
| link_all_deplibs=yes
|
| - allow_undefined_flag="$_lt_dar_allow_undefined"
|
| + allow_undefined_flag=$_lt_dar_allow_undefined
|
| case $cc_basename in
|
| - ifort*) _lt_dar_can_shared=yes ;;
|
| + ifort*|nagfor*) _lt_dar_can_shared=yes ;;
|
| *) _lt_dar_can_shared=$GCC ;;
|
| esac
|
| - if test "$_lt_dar_can_shared" = "yes"; then
|
| + if test yes = "$_lt_dar_can_shared"; then
|
| output_verbose_link_cmd=func_echo_all
|
| - 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"
|
|
|
| else
|
| ld_shlibs=no
|
| @@ -10917,33 +11265,33 @@ fi
|
| ;;
|
|
|
| hpux9*)
|
| - 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'
|
| else
|
| - 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'
|
| fi
|
| - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
| + hardcode_libdir_flag_spec='$wl+b $wl$libdir'
|
| hardcode_libdir_separator=:
|
| hardcode_direct=yes
|
|
|
| # hardcode_minus_L: Not really in the search PATH,
|
| # but as the default location of the library.
|
| hardcode_minus_L=yes
|
| - export_dynamic_flag_spec='${wl}-E'
|
| + export_dynamic_flag_spec='$wl-E'
|
| ;;
|
|
|
| hpux10*)
|
| - 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'
|
| else
|
| archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
|
| fi
|
| - 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'
|
| hardcode_libdir_separator=:
|
| hardcode_direct=yes
|
| hardcode_direct_absolute=yes
|
| - export_dynamic_flag_spec='${wl}-E'
|
| + export_dynamic_flag_spec='$wl-E'
|
| # hardcode_minus_L: Not really in the search PATH,
|
| # but as the default location of the library.
|
| hardcode_minus_L=yes
|
| @@ -10951,25 +11299,25 @@ fi
|
| ;;
|
|
|
| hpux11*)
|
| - if test "$GCC" = yes && test "$with_gnu_ld" = no; then
|
| + if test yes,no = "$GCC,$with_gnu_ld"; then
|
| case $host_cpu in
|
| hppa*64*)
|
| - 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'
|
| ;;
|
| ia64*)
|
| - 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'
|
| ;;
|
| *)
|
| - 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'
|
| ;;
|
| esac
|
| else
|
| case $host_cpu in
|
| hppa*64*)
|
| - 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'
|
| ;;
|
| ia64*)
|
| - 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'
|
| ;;
|
| *)
|
|
|
| @@ -10981,7 +11329,7 @@ if ${lt_cv_prog_compiler__b+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| lt_cv_prog_compiler__b=no
|
| - save_LDFLAGS="$LDFLAGS"
|
| + save_LDFLAGS=$LDFLAGS
|
| LDFLAGS="$LDFLAGS -b"
|
| echo "$lt_simple_link_test_code" > conftest.$ac_ext
|
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
|
| @@ -11000,14 +11348,14 @@ else
|
| fi
|
| fi
|
| $RM -r conftest*
|
| - LDFLAGS="$save_LDFLAGS"
|
| + LDFLAGS=$save_LDFLAGS
|
|
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
|
| $as_echo "$lt_cv_prog_compiler__b" >&6; }
|
|
|
| -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'
|
| else
|
| archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
|
| fi
|
| @@ -11015,8 +11363,8 @@ fi
|
| ;;
|
| esac
|
| fi
|
| - 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'
|
| hardcode_libdir_separator=:
|
|
|
| case $host_cpu in
|
| @@ -11027,7 +11375,7 @@ fi
|
| *)
|
| hardcode_direct=yes
|
| hardcode_direct_absolute=yes
|
| - export_dynamic_flag_spec='${wl}-E'
|
| + export_dynamic_flag_spec='$wl-E'
|
|
|
| # hardcode_minus_L: Not really in the search PATH,
|
| # but as the default location of the library.
|
| @@ -11038,8 +11386,8 @@ fi
|
| ;;
|
|
|
| irix5* | irix6* | nonstopux*)
|
| - 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'
|
| # Try to use the -exported_symbol ld option, if it does not
|
| # work, assume that -exports_file does not work either and
|
| # implicitly export all symbols.
|
| @@ -11049,8 +11397,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >
|
| if ${lt_cv_irix_exported_symbol+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| - 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"
|
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
| /* end confdefs.h. */
|
| int foo (void) { return 0; }
|
| @@ -11062,25 +11410,35 @@ else
|
| fi
|
| rm -f core conftest.err conftest.$ac_objext \
|
| conftest$ac_exeext conftest.$ac_ext
|
| - LDFLAGS="$save_LDFLAGS"
|
| + LDFLAGS=$save_LDFLAGS
|
| fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
|
| $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| - 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'
|
| fi
|
| else
|
| - 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'
|
| fi
|
| archive_cmds_need_lc='no'
|
| - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
| + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
|
| hardcode_libdir_separator=:
|
| inherit_rpath=yes
|
| link_all_deplibs=yes
|
| ;;
|
|
|
| - netbsd* | netbsdelf*-gnu)
|
| + linux*)
|
| + case $cc_basename in
|
| + tcc*)
|
| + # Fabrice Bellard et al's Tiny C Compiler
|
| + ld_shlibs=yes
|
| + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
| + ;;
|
| + esac
|
| + ;;
|
| +
|
| + netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
| else
|
| @@ -11094,7 +11452,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| newsos6)
|
| archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
| hardcode_direct=yes
|
| - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
| + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
|
| hardcode_libdir_separator=:
|
| hardcode_shlibpath_var=no
|
| ;;
|
| @@ -11102,27 +11460,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| *nto* | *qnx*)
|
| ;;
|
|
|
| - openbsd*)
|
| + openbsd* | bitrig*)
|
| if test -f /usr/libexec/ld.so; then
|
| hardcode_direct=yes
|
| hardcode_shlibpath_var=no
|
| hardcode_direct_absolute=yes
|
| - 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
|
| archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
| - 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'
|
| else
|
| - 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'
|
| fi
|
| else
|
| ld_shlibs=no
|
| @@ -11133,33 +11483,53 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| hardcode_libdir_flag_spec='-L$libdir'
|
| hardcode_minus_L=yes
|
| allow_undefined_flag=unsupported
|
| - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
|
| - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
|
| + shrext_cmds=.dll
|
| + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
|
| + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
|
| + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
| + $ECHO EXPORTS >> $output_objdir/$libname.def~
|
| + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
|
| + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
|
| + emximp -o $lib $output_objdir/$libname.def'
|
| + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
|
| + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
|
| + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
|
| + $ECHO EXPORTS >> $output_objdir/$libname.def~
|
| + prefix_cmds="$SED"~
|
| + if test EXPORTS = "`$SED 1q $export_symbols`"; then
|
| + prefix_cmds="$prefix_cmds -e 1d";
|
| + fi~
|
| + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
|
| + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
|
| + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
|
| + emximp -o $lib $output_objdir/$libname.def'
|
| + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
|
| + enable_shared_with_static_runtimes=yes
|
| ;;
|
|
|
| osf3*)
|
| - 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'
|
| else
|
| allow_undefined_flag=' -expect_unresolved \*'
|
| - 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'
|
| fi
|
| archive_cmds_need_lc='no'
|
| - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
| + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
|
| hardcode_libdir_separator=:
|
| ;;
|
|
|
| osf4* | osf5*) # as osf3* with the addition of -msym flag
|
| - 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'
|
| else
|
| allow_undefined_flag=' -expect_unresolved \*'
|
| - 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'
|
| archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $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'
|
| + $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'
|
|
|
| # Both c and cxx compiler support -rpath directly
|
| hardcode_libdir_flag_spec='-rpath $libdir'
|
| @@ -11170,24 +11540,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
|
|
| solaris*)
|
| no_undefined_flag=' -z defs'
|
| - 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'
|
| archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $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'
|
| + $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'
|
| else
|
| case `$CC -V 2>&1` in
|
| *"Compilers 5.0"*)
|
| wlarc=''
|
| - 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'
|
| archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
| - $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'
|
| ;;
|
| *)
|
| - 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'
|
| archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
| - $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'
|
| ;;
|
| esac
|
| fi
|
| @@ -11197,11 +11567,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| solaris2.[0-5] | solaris2.[0-5].*) ;;
|
| *)
|
| # The compiler driver will combine and reorder linker options,
|
| - # but understands `-z linker_flag'. GCC discards it without `$wl',
|
| + # but understands '-z linker_flag'. GCC discards it without '$wl',
|
| # but is careful enough not to reorder.
|
| # Supported since Solaris 2.6 (maybe 2.5.1?)
|
| - 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'
|
| else
|
| whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
|
| fi
|
| @@ -11211,10 +11581,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| ;;
|
|
|
| sunos4*)
|
| - if test "x$host_vendor" = xsequent; then
|
| + if test sequent = "$host_vendor"; then
|
| # Use $CC to link under sequent, because it throws in some extra .o
|
| # files that make .init and .fini sections work.
|
| - 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'
|
| else
|
| archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
|
| fi
|
| @@ -11263,43 +11633,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| ;;
|
|
|
| sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
|
| - no_undefined_flag='${wl}-z,text'
|
| + no_undefined_flag='$wl-z,text'
|
| archive_cmds_need_lc=no
|
| hardcode_shlibpath_var=no
|
| runpath_var='LD_RUN_PATH'
|
|
|
| - 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'
|
| else
|
| - 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'
|
| fi
|
| ;;
|
|
|
| sysv5* | sco3.2v5* | sco5v6*)
|
| - # 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
|
| # link with -lc, and that would cause any symbols used from libc to
|
| # always be unresolved, which means just about no library would
|
| # ever link correctly. If we're not using GNU ld we use -z text
|
| # though, which does catch some bad symbols but isn't as heavy-handed
|
| # as -z defs.
|
| - no_undefined_flag='${wl}-z,text'
|
| - allow_undefined_flag='${wl}-z,nodefs'
|
| + no_undefined_flag='$wl-z,text'
|
| + allow_undefined_flag='$wl-z,nodefs'
|
| archive_cmds_need_lc=no
|
| hardcode_shlibpath_var=no
|
| - hardcode_libdir_flag_spec='${wl}-R,$libdir'
|
| + hardcode_libdir_flag_spec='$wl-R,$libdir'
|
| hardcode_libdir_separator=':'
|
| link_all_deplibs=yes
|
| - export_dynamic_flag_spec='${wl}-Bexport'
|
| + export_dynamic_flag_spec='$wl-Bexport'
|
| runpath_var='LD_RUN_PATH'
|
|
|
| - 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'
|
| else
|
| - 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'
|
| fi
|
| ;;
|
|
|
| @@ -11314,10 +11684,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
| ;;
|
| esac
|
|
|
| - if test x$host_vendor = xsni; then
|
| + if test sni = "$host_vendor"; then
|
| case $host in
|
| sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
| - export_dynamic_flag_spec='${wl}-Blargedynsym'
|
| + export_dynamic_flag_spec='$wl-Blargedynsym'
|
| ;;
|
| esac
|
| fi
|
| @@ -11325,7 +11695,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
|
|
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
|
| $as_echo "$ld_shlibs" >&6; }
|
| -test "$ld_shlibs" = no && can_build_shared=no
|
| +test no = "$ld_shlibs" && can_build_shared=no
|
|
|
| with_gnu_ld=$with_gnu_ld
|
|
|
| @@ -11351,7 +11721,7 @@ x|xyes)
|
| # Assume -lc should be added
|
| archive_cmds_need_lc=yes
|
|
|
| - if test "$enable_shared" = yes && test "$GCC" = yes; then
|
| + if test yes,yes = "$GCC,$enable_shared"; then
|
| case $archive_cmds in
|
| *'~'*)
|
| # FIXME: we may have to deal with multi-command sequences.
|
| @@ -11566,14 +11936,14 @@ esac
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
|
| $as_echo_n "checking dynamic linker characteristics... " >&6; }
|
|
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| case $host_os in
|
| - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
|
| - *) lt_awk_arg="/^libraries:/" ;;
|
| + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
|
| + *) lt_awk_arg='/^libraries:/' ;;
|
| esac
|
| case $host_os in
|
| - 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' ;;
|
| esac
|
| lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
|
| case $lt_search_path_spec in
|
| @@ -11589,28 +11959,35 @@ if test "$GCC" = yes; then
|
| ;;
|
| esac
|
| # Ok, now we have the path, separated by spaces, we can step through it
|
| - # and add multilib dir if necessary.
|
| + # and add multilib dir if necessary...
|
| lt_tmp_lt_search_path_spec=
|
| - 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
|
| for lt_sys_path in $lt_search_path_spec; do
|
| - 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
|
| test -d "$lt_sys_path" && \
|
| lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
| fi
|
| done
|
| lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
|
| -BEGIN {RS=" "; FS="/|\n";} {
|
| - lt_foo="";
|
| - lt_count=0;
|
| +BEGIN {RS = " "; FS = "/|\n";} {
|
| + lt_foo = "";
|
| + lt_count = 0;
|
| for (lt_i = NF; lt_i > 0; lt_i--) {
|
| if ($lt_i != "" && $lt_i != ".") {
|
| if ($lt_i == "..") {
|
| lt_count++;
|
| } else {
|
| if (lt_count == 0) {
|
| - lt_foo="/" $lt_i lt_foo;
|
| + lt_foo = "/" $lt_i lt_foo;
|
| } else {
|
| lt_count--;
|
| }
|
| @@ -11624,7 +12001,7 @@ BEGIN {RS=" "; FS="/|\n";} {
|
| # for these hosts.
|
| case $host_os in
|
| mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
|
| - $SED 's,/\([A-Za-z]:\),\1,g'` ;;
|
| + $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
|
| esac
|
| sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
|
| else
|
| @@ -11633,7 +12010,7 @@ fi
|
| library_names_spec=
|
| libname_spec='lib$name'
|
| soname_spec=
|
| -shrext_cmds=".so"
|
| +shrext_cmds=.so
|
| postinstall_cmds=
|
| postuninstall_cmds=
|
| finish_cmds=
|
| @@ -11650,14 +12027,16 @@ hardcode_into_libs=no
|
| # flags to be left without arguments
|
| need_version=unknown
|
|
|
| +
|
| +
|
| case $host_os in
|
| aix3*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
|
| shlibpath_var=LIBPATH
|
|
|
| # AIX 3 has no versioning support, so we append a major version to the name.
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| ;;
|
|
|
| aix[4-9]*)
|
| @@ -11665,41 +12044,91 @@ aix[4-9]*)
|
| need_lib_prefix=no
|
| need_version=no
|
| hardcode_into_libs=yes
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 supports IA64
|
| - 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'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| else
|
| # With GCC up to 2.95.x, collect2 would create an import file
|
| # for dependence libraries. The import file would start with
|
| - # 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
|
| # development snapshots of GCC prior to 3.0.
|
| case $host_os in
|
| aix4 | aix4.[01] | aix4.[01].*)
|
| if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
|
| echo ' yes '
|
| - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
|
| + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
|
| :
|
| else
|
| can_build_shared=no
|
| fi
|
| ;;
|
| esac
|
| - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
|
| + # Using Import Files as archive members, it is possible to support
|
| + # filename-based versioning of shared library archives on AIX. While
|
| + # this would work for both with and without runtime linking, it will
|
| + # prevent static linking of such archives. So we do filename-based
|
| + # shared library versioning with .so extension only, which is used
|
| + # when both runtime linking and shared linking is enabled.
|
| + # Unfortunately, runtime linking may impact performance, so we do
|
| + # not want this to be the default eventually. Also, we use the
|
| + # versioned .so libs for executables only if there is the -brtl
|
| + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
|
| + # To allow for filename-based versioning support, we need to create
|
| + # libNAME.so.V as an archive file, containing:
|
| + # *) an Import File, referring to the versioned filename of the
|
| + # archive as well as the shared archive member, telling the
|
| + # bitwidth (32 or 64) of that shared object, and providing the
|
| + # list of exported symbols of that shared object, eventually
|
| + # decorated with the 'weak' keyword
|
| + # *) the shared object with the F_LOADONLY flag set, to really avoid
|
| + # it being seen by the linker.
|
| + # At run time we better use the real file rather than another symlink,
|
| + # but for link time we create the symlink libNAME.so -> libNAME.so.V
|
| +
|
| + case $with_aix_soname,$aix_use_runtimelinking in
|
| + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
|
| # soname into executable. Probably we can add versioning support to
|
| # collect2, so additional links can be useful in future.
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| + aix,yes) # traditional libtool
|
| + dynamic_linker='AIX unversionable lib.so'
|
| # If using run time linking (on AIX 4.2 or later) use lib<name>.so
|
| # instead of lib<name>.a to let people know that these are not
|
| # typical AIX shared libraries.
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - else
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + ;;
|
| + aix,no) # traditional AIX only
|
| + dynamic_linker='AIX lib.a(lib.so.V)'
|
| # We preserve .a as extension for shared libraries through AIX4.2
|
| # and later when we are not doing run time linking.
|
| - library_names_spec='${libname}${release}.a $libname.a'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - fi
|
| + library_names_spec='$libname$release.a $libname.a'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| + ;;
|
| + svr4,*) # full svr4 only
|
| + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
|
| + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
|
| + # We do not specify a path in Import Files, so LIBPATH fires.
|
| + shlibpath_overrides_runpath=yes
|
| + ;;
|
| + *,yes) # both, prefer svr4
|
| + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
|
| + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
|
| + # unpreferred sharedlib libNAME.a needs extra handling
|
| + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
|
| + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
|
| + # We do not specify a path in Import Files, so LIBPATH fires.
|
| + shlibpath_overrides_runpath=yes
|
| + ;;
|
| + *,no) # both, prefer aix
|
| + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
|
| + library_names_spec='$libname$release.a $libname.a'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
|
| + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
|
| + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
|
| + ;;
|
| + esac
|
| shlibpath_var=LIBPATH
|
| fi
|
| ;;
|
| @@ -11709,18 +12138,18 @@ amigaos*)
|
| powerpc)
|
| # Since July 2007 AmigaOS4 officially supports .so libraries.
|
| # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
|
| - 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'
|
| ;;
|
| m68k)
|
| library_names_spec='$libname.ixlibrary $libname.a'
|
| # Create ${libname}_ixlibrary.a entries in /sys/libs.
|
| - 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'
|
| ;;
|
| esac
|
| ;;
|
|
|
| beos*)
|
| - library_names_spec='${libname}${shared_ext}'
|
| + library_names_spec='$libname$shared_ext'
|
| dynamic_linker="$host_os ld.so"
|
| shlibpath_var=LIBRARY_PATH
|
| ;;
|
| @@ -11728,8 +12157,8 @@ beos*)
|
| bsdi[45]*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| 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'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
|
| @@ -11741,7 +12170,7 @@ bsdi[45]*)
|
|
|
| cygwin* | mingw* | pw32* | cegcc*)
|
| version_type=windows
|
| - shrext_cmds=".dll"
|
| + shrext_cmds=.dll
|
| need_version=no
|
| need_lib_prefix=no
|
|
|
| @@ -11750,8 +12179,8 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| # gcc
|
| library_names_spec='$libname.dll.a'
|
| # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
| - 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'\''`~
|
| dldir=$destdir/`dirname \$dlpath`~
|
| test -d \$dldir || mkdir -p \$dldir~
|
| $install_prog $dir/$dlname \$dldir/$dlname~
|
| @@ -11767,17 +12196,17 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| case $host_os in
|
| cygwin*)
|
| # Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
| - 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'
|
|
|
| sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
| ;;
|
| mingw* | cegcc*)
|
| # MinGW DLLs use traditional 'lib' prefix
|
| - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
| + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
|
| ;;
|
| pw32*)
|
| # pw32 DLLs use 'pw' prefix rather than 'lib'
|
| - 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'
|
| ;;
|
| esac
|
| dynamic_linker='Win32 ld.exe'
|
| @@ -11786,8 +12215,8 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| *,cl*)
|
| # Native MSVC
|
| libname_spec='$name'
|
| - 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'
|
|
|
| case $build_os in
|
| mingw*)
|
| @@ -11814,7 +12243,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
| ;;
|
| *)
|
| - sys_lib_search_path_spec="$LIB"
|
| + sys_lib_search_path_spec=$LIB
|
| if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
|
| # It is most probably a Windows format PATH.
|
| sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
| @@ -11827,8 +12256,8 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| esac
|
|
|
| # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
| - 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'\''`~
|
| dldir=$destdir/`dirname \$dlpath`~
|
| test -d \$dldir || mkdir -p \$dldir~
|
| $install_prog $dir/$dlname \$dldir/$dlname'
|
| @@ -11841,7 +12270,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
| *)
|
| # Assume MSVC wrapper
|
| - 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'
|
| dynamic_linker='Win32 ld.exe'
|
| ;;
|
| esac
|
| @@ -11854,8 +12283,8 @@ darwin* | rhapsody*)
|
| version_type=darwin
|
| need_lib_prefix=no
|
| need_version=no
|
| - 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'
|
| shlibpath_overrides_runpath=yes
|
| shlibpath_var=DYLD_LIBRARY_PATH
|
| shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
| @@ -11868,8 +12297,8 @@ dgux*)
|
| 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'
|
| + 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
|
| ;;
|
|
|
| @@ -11887,12 +12316,13 @@ freebsd* | dragonfly*)
|
| version_type=freebsd-$objformat
|
| case $version_type in
|
| freebsd-elf*)
|
| - 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'
|
| need_version=no
|
| need_lib_prefix=no
|
| ;;
|
| freebsd-*)
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
| need_version=yes
|
| ;;
|
| esac
|
| @@ -11922,10 +12352,10 @@ haiku*)
|
| need_lib_prefix=no
|
| need_version=no
|
| dynamic_linker="$host_os runtime_loader"
|
| - 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'
|
| shlibpath_var=LIBRARY_PATH
|
| - shlibpath_overrides_runpath=yes
|
| + shlibpath_overrides_runpath=no
|
| sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
|
| hardcode_into_libs=yes
|
| ;;
|
| @@ -11943,14 +12373,15 @@ hpux9* | hpux10* | hpux11*)
|
| dynamic_linker="$host_os dld.so"
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
|
| - 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
|
| sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
|
| + sys_lib_dlsearch_path_spec=/usr/lib/hpux32
|
| else
|
| sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
|
| + sys_lib_dlsearch_path_spec=/usr/lib/hpux64
|
| fi
|
| - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| ;;
|
| hppa*64*)
|
| shrext_cmds='.sl'
|
| @@ -11958,8 +12389,8 @@ hpux9* | hpux10* | hpux11*)
|
| dynamic_linker="$host_os dld.sl"
|
| shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
| shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
|
| - 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'
|
| sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
|
| sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| ;;
|
| @@ -11968,8 +12399,8 @@ hpux9* | hpux10* | hpux11*)
|
| dynamic_linker="$host_os dld.sl"
|
| shlibpath_var=SHLIB_PATH
|
| shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
| - 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'
|
| ;;
|
| esac
|
| # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
|
| @@ -11982,8 +12413,8 @@ interix[3-9]*)
|
| 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'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| @@ -11994,7 +12425,7 @@ irix5* | irix6* | nonstopux*)
|
| case $host_os in
|
| nonstopux*) version_type=nonstopux ;;
|
| *)
|
| - if test "$lt_cv_prog_gnu_ld" = yes; then
|
| + if test yes = "$lt_cv_prog_gnu_ld"; then
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| else
|
| version_type=irix
|
| @@ -12002,8 +12433,8 @@ irix5* | irix6* | nonstopux*)
|
| esac
|
| need_lib_prefix=no
|
| need_version=no
|
| - 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'
|
| case $host_os in
|
| irix5* | nonstopux*)
|
| libsuff= shlibsuff=
|
| @@ -12022,8 +12453,8 @@ irix5* | irix6* | nonstopux*)
|
| esac
|
| shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
|
| shlibpath_overrides_runpath=no
|
| - 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"
|
| hardcode_into_libs=yes
|
| ;;
|
|
|
| @@ -12032,13 +12463,33 @@ linux*oldld* | linux*aout* | linux*coff*)
|
| dynamic_linker=no
|
| ;;
|
|
|
| +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'
|
| + ;;
|
| +
|
| # This must be glibc/ELF.
|
| linux* | k*bsd*-gnu | kopensolaris*-gnu | 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'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| @@ -12082,7 +12533,12 @@ fi
|
| # before this can be enabled.
|
| hardcode_into_libs=yes
|
|
|
| - # Append ld.so.conf contents to the search path
|
| + # Ideally, we could use ldconfig to report *all* directores which are
|
| + # searched for libraries, however this is still not possible. Aside from not
|
| + # being certain /sbin/ldconfig is available, command
|
| + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
|
| + # even though it is searched at run-time. Try to do the best guess by
|
| + # appending ld.so.conf contents (and includes) to the search path.
|
| if test -f /etc/ld.so.conf; then
|
| lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
| sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
| @@ -12097,29 +12553,17 @@ fi
|
| dynamic_linker='GNU/Linux ld.so'
|
| ;;
|
|
|
| -netbsdelf*-gnu)
|
| - version_type=linux
|
| - need_lib_prefix=no
|
| - need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - shlibpath_var=LD_LIBRARY_PATH
|
| - shlibpath_overrides_runpath=no
|
| - hardcode_into_libs=yes
|
| - dynamic_linker='NetBSD ld.elf_so'
|
| - ;;
|
| -
|
| netbsd*)
|
| version_type=sunos
|
| need_lib_prefix=no
|
| need_version=no
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
| finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
| dynamic_linker='NetBSD (a.out) ld.so'
|
| else
|
| - 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'
|
| dynamic_linker='NetBSD ld.elf_so'
|
| fi
|
| shlibpath_var=LD_LIBRARY_PATH
|
| @@ -12129,7 +12573,7 @@ netbsd*)
|
|
|
| newsos6)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - 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'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes
|
| ;;
|
| @@ -12138,58 +12582,68 @@ newsos6)
|
| version_type=qnx
|
| 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'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| hardcode_into_libs=yes
|
| dynamic_linker='ldqnx.so'
|
| ;;
|
|
|
| -openbsd*)
|
| +openbsd* | bitrig*)
|
| version_type=sunos
|
| - sys_lib_dlsearch_path_spec="/usr/lib"
|
| + sys_lib_dlsearch_path_spec=/usr/lib
|
| need_lib_prefix=no
|
| - # 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
|
| else
|
| - shlibpath_overrides_runpath=yes
|
| + need_version=yes
|
| fi
|
| + 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
|
| ;;
|
|
|
| os2*)
|
| libname_spec='$name'
|
| - shrext_cmds=".dll"
|
| + version_type=windows
|
| + shrext_cmds=.dll
|
| + need_version=no
|
| need_lib_prefix=no
|
| - library_names_spec='$libname${shared_ext} $libname.a'
|
| + # OS/2 can only load a DLL with a base name of 8 characters or less.
|
| + soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
|
| + v=$($ECHO $release$versuffix | tr -d .-);
|
| + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
|
| + $ECHO $n$v`$shared_ext'
|
| + library_names_spec='${libname}_dll.$libext'
|
| dynamic_linker='OS/2 ld.exe'
|
| - shlibpath_var=LIBPATH
|
| + shlibpath_var=BEGINLIBPATH
|
| + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
| + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| + postinstall_cmds='base_file=`basename \$file`~
|
| + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
|
| + dldir=$destdir/`dirname \$dlpath`~
|
| + test -d \$dldir || mkdir -p \$dldir~
|
| + $install_prog $dir/$dlname \$dldir/$dlname~
|
| + chmod a+x \$dldir/$dlname~
|
| + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
|
| + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
|
| + fi'
|
| + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
|
| + dlpath=$dir/\$dldll~
|
| + $RM \$dlpath'
|
| ;;
|
|
|
| osf3* | osf4* | osf5*)
|
| version_type=osf
|
| need_lib_prefix=no
|
| need_version=no
|
| - 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'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
|
| - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
|
| + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| ;;
|
|
|
| rdos*)
|
| @@ -12200,8 +12654,8 @@ solaris*)
|
| 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'
|
| + 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=yes
|
| hardcode_into_libs=yes
|
| @@ -12211,11 +12665,11 @@ solaris*)
|
|
|
| sunos4*)
|
| version_type=sunos
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
| finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes
|
| - if test "$with_gnu_ld" = yes; then
|
| + if test yes = "$with_gnu_ld"; then
|
| need_lib_prefix=no
|
| fi
|
| need_version=yes
|
| @@ -12223,8 +12677,8 @@ sunos4*)
|
|
|
| sysv4 | sysv4.3*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - 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'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| case $host_vendor in
|
| sni)
|
| @@ -12245,24 +12699,24 @@ sysv4 | sysv4.3*)
|
| ;;
|
|
|
| sysv4*MP*)
|
| - if test -d /usr/nec ;then
|
| + if test -d /usr/nec; then
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - 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'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| fi
|
| ;;
|
|
|
| sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
|
| - version_type=freebsd-elf
|
| + version_type=sco
|
| need_lib_prefix=no
|
| need_version=no
|
| - 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'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes
|
| hardcode_into_libs=yes
|
| - if test "$with_gnu_ld" = yes; then
|
| + if test yes = "$with_gnu_ld"; then
|
| sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
|
| else
|
| sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
|
| @@ -12280,7 +12734,7 @@ tpf*)
|
| 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}'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| hardcode_into_libs=yes
|
| @@ -12288,8 +12742,8 @@ tpf*)
|
|
|
| uts4*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - 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'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| ;;
|
|
|
| @@ -12299,20 +12753,35 @@ uts4*)
|
| esac
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
|
| $as_echo "$dynamic_linker" >&6; }
|
| -test "$dynamic_linker" = no && can_build_shared=no
|
| +test no = "$dynamic_linker" && can_build_shared=no
|
|
|
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
|
| fi
|
|
|
| -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
|
| fi
|
| -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
|
| fi
|
|
|
| +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
|
| +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
|
| +
|
| +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
|
| +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
|
| +
|
| +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
|
| +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
|
| +
|
| +
|
| +
|
| +
|
| +
|
| +
|
|
|
|
|
|
|
| @@ -12409,15 +12878,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
|
| hardcode_action=
|
| if test -n "$hardcode_libdir_flag_spec" ||
|
| test -n "$runpath_var" ||
|
| - test "X$hardcode_automatic" = "Xyes" ; then
|
| + test yes = "$hardcode_automatic"; then
|
|
|
| # We can hardcode non-existent directories.
|
| - if test "$hardcode_direct" != no &&
|
| + if test no != "$hardcode_direct" &&
|
| # If the only mechanism to avoid hardcoding is shlibpath_var, we
|
| # have to relink, otherwise we might link with an installed library
|
| # when we should be linking with a yet-to-be-installed one
|
| - ## 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
|
| # Linking always hardcodes the temporary library directory.
|
| hardcode_action=relink
|
| else
|
| @@ -12432,12 +12901,12 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
|
| $as_echo "$hardcode_action" >&6; }
|
|
|
| -if test "$hardcode_action" = relink ||
|
| - test "$inherit_rpath" = yes; then
|
| +if test relink = "$hardcode_action" ||
|
| + test yes = "$inherit_rpath"; then
|
| # Fast installation is not supported
|
| enable_fast_install=no
|
| -elif test "$shlibpath_overrides_runpath" = yes ||
|
| - test "$enable_shared" = no; then
|
| +elif test yes = "$shlibpath_overrides_runpath" ||
|
| + test no = "$enable_shared"; then
|
| # Fast installation is not necessary
|
| enable_fast_install=needless
|
| fi
|
| @@ -12447,7 +12916,7 @@ fi
|
|
|
|
|
|
|
| - if test "x$enable_dlopen" != xyes; then
|
| + if test yes != "$enable_dlopen"; then
|
| enable_dlopen=unknown
|
| enable_dlopen_self=unknown
|
| enable_dlopen_self_static=unknown
|
| @@ -12457,23 +12926,23 @@ else
|
|
|
| case $host_os in
|
| beos*)
|
| - lt_cv_dlopen="load_add_on"
|
| + lt_cv_dlopen=load_add_on
|
| lt_cv_dlopen_libs=
|
| lt_cv_dlopen_self=yes
|
| ;;
|
|
|
| mingw* | pw32* | cegcc*)
|
| - lt_cv_dlopen="LoadLibrary"
|
| + lt_cv_dlopen=LoadLibrary
|
| lt_cv_dlopen_libs=
|
| ;;
|
|
|
| cygwin*)
|
| - lt_cv_dlopen="dlopen"
|
| + lt_cv_dlopen=dlopen
|
| lt_cv_dlopen_libs=
|
| ;;
|
|
|
| darwin*)
|
| - # if libdl is installed we need to link against it
|
| + # if libdl is installed we need to link against it
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
| $as_echo_n "checking for dlopen in -ldl... " >&6; }
|
| if ${ac_cv_lib_dl_dlopen+:} false; then :
|
| @@ -12511,10 +12980,10 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
| $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
| if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
|
| - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
| + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
|
| else
|
|
|
| - lt_cv_dlopen="dyld"
|
| + lt_cv_dlopen=dyld
|
| lt_cv_dlopen_libs=
|
| lt_cv_dlopen_self=yes
|
|
|
| @@ -12522,10 +12991,18 @@ fi
|
|
|
| ;;
|
|
|
| + 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
|
| + ;;
|
| +
|
| *)
|
| ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
|
| if test "x$ac_cv_func_shl_load" = xyes; then :
|
| - lt_cv_dlopen="shl_load"
|
| + lt_cv_dlopen=shl_load
|
| else
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
|
| $as_echo_n "checking for shl_load in -ldld... " >&6; }
|
| @@ -12564,11 +13041,11 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
|
| $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
|
| if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
|
| - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
|
| + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
|
| else
|
| ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
|
| if test "x$ac_cv_func_dlopen" = xyes; then :
|
| - lt_cv_dlopen="dlopen"
|
| + lt_cv_dlopen=dlopen
|
| else
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
| $as_echo_n "checking for dlopen in -ldl... " >&6; }
|
| @@ -12607,7 +13084,7 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
| $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
| if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
|
| - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
|
| + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
|
| else
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
|
| $as_echo_n "checking for dlopen in -lsvld... " >&6; }
|
| @@ -12646,7 +13123,7 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
|
| $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
|
| if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
|
| - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
|
| + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
|
| else
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
|
| $as_echo_n "checking for dld_link in -ldld... " >&6; }
|
| @@ -12685,7 +13162,7 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
|
| $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
|
| if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
|
| - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
|
| + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
|
| fi
|
|
|
|
|
| @@ -12706,21 +13183,21 @@ fi
|
| ;;
|
| esac
|
|
|
| - if test "x$lt_cv_dlopen" != xno; then
|
| - enable_dlopen=yes
|
| - else
|
| + if test no = "$lt_cv_dlopen"; then
|
| enable_dlopen=no
|
| + else
|
| + enable_dlopen=yes
|
| fi
|
|
|
| case $lt_cv_dlopen in
|
| dlopen)
|
| - 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"
|
|
|
| - save_LDFLAGS="$LDFLAGS"
|
| + save_LDFLAGS=$LDFLAGS
|
| wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
|
|
|
| - save_LIBS="$LIBS"
|
| + save_LIBS=$LIBS
|
| LIBS="$lt_cv_dlopen_libs $LIBS"
|
|
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
|
| @@ -12728,7 +13205,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
|
| if ${lt_cv_dlopen_self+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| - if test "$cross_compiling" = yes; then :
|
| + if test yes = "$cross_compiling"; then :
|
| lt_cv_dlopen_self=cross
|
| else
|
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
| @@ -12775,9 +13252,9 @@ else
|
| # endif
|
| #endif
|
|
|
| -/* When -fvisbility=hidden is used, assume the code has been annotated
|
| +/* When -fvisibility=hidden is used, assume the code has been annotated
|
| correspondingly for the symbols needed. */
|
| -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
| +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
| int fnord () __attribute__((visibility("default")));
|
| #endif
|
|
|
| @@ -12807,7 +13284,7 @@ _LT_EOF
|
| (eval $ac_link) 2>&5
|
| ac_status=$?
|
| $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - 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
|
| (./conftest; exit; ) >&5 2>/dev/null
|
| lt_status=$?
|
| case x$lt_status in
|
| @@ -12827,14 +13304,14 @@ fi
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
|
| $as_echo "$lt_cv_dlopen_self" >&6; }
|
|
|
| - if test "x$lt_cv_dlopen_self" = xyes; then
|
| + if test yes = "$lt_cv_dlopen_self"; then
|
| wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
|
| $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
|
| if ${lt_cv_dlopen_self_static+:} false; then :
|
| $as_echo_n "(cached) " >&6
|
| else
|
| - if test "$cross_compiling" = yes; then :
|
| + if test yes = "$cross_compiling"; then :
|
| lt_cv_dlopen_self_static=cross
|
| else
|
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
| @@ -12881,9 +13358,9 @@ else
|
| # endif
|
| #endif
|
|
|
| -/* When -fvisbility=hidden is used, assume the code has been annotated
|
| +/* When -fvisibility=hidden is used, assume the code has been annotated
|
| correspondingly for the symbols needed. */
|
| -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
| +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
| int fnord () __attribute__((visibility("default")));
|
| #endif
|
|
|
| @@ -12913,7 +13390,7 @@ _LT_EOF
|
| (eval $ac_link) 2>&5
|
| ac_status=$?
|
| $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
| - 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
|
| (./conftest; exit; ) >&5 2>/dev/null
|
| lt_status=$?
|
| case x$lt_status in
|
| @@ -12934,9 +13411,9 @@ fi
|
| $as_echo "$lt_cv_dlopen_self_static" >&6; }
|
| fi
|
|
|
| - CPPFLAGS="$save_CPPFLAGS"
|
| - LDFLAGS="$save_LDFLAGS"
|
| - LIBS="$save_LIBS"
|
| + CPPFLAGS=$save_CPPFLAGS
|
| + LDFLAGS=$save_LDFLAGS
|
| + LIBS=$save_LIBS
|
| ;;
|
| esac
|
|
|
| @@ -12980,7 +13457,7 @@ else
|
| # FIXME - insert some real tests, host_os isn't really good enough
|
| case $host_os in
|
| darwin*)
|
| - if test -n "$STRIP" ; then
|
| + if test -n "$STRIP"; then
|
| striplib="$STRIP -x"
|
| old_striplib="$STRIP -S"
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
| @@ -13008,7 +13485,7 @@ fi
|
|
|
|
|
|
|
| - # Report which library types will actually be built
|
| + # Report what library types will actually be built
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
|
| $as_echo_n "checking if libtool supports shared libraries... " >&6; }
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
|
| @@ -13016,13 +13493,13 @@ $as_echo "$can_build_shared" >&6; }
|
|
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
|
| $as_echo_n "checking whether to build shared libraries... " >&6; }
|
| - test "$can_build_shared" = "no" && enable_shared=no
|
| + test no = "$can_build_shared" && enable_shared=no
|
|
|
| # On AIX, shared libraries and static libraries use the same namespace, and
|
| # are all built from PIC.
|
| case $host_os in
|
| aix3*)
|
| - test "$enable_shared" = yes && enable_static=no
|
| + test yes = "$enable_shared" && enable_static=no
|
| if test -n "$RANLIB"; then
|
| archive_cmds="$archive_cmds~\$RANLIB \$lib"
|
| postinstall_cmds='$RANLIB $lib'
|
| @@ -13030,8 +13507,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
|
| ;;
|
|
|
| aix[4-9]*)
|
| - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
| - test "$enable_shared" = yes && enable_static=no
|
| + if test ia64 != "$host_cpu"; then
|
| + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
|
| + yes,aix,yes) ;; # shared object as lib.so file only
|
| + yes,svr4,*) ;; # shared object as lib.so archive member only
|
| + yes,*) enable_static=no ;; # shared object in lib.a archive as well
|
| + esac
|
| fi
|
| ;;
|
| esac
|
| @@ -13041,7 +13522,7 @@ $as_echo "$enable_shared" >&6; }
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
|
| $as_echo_n "checking whether to build static libraries... " >&6; }
|
| # Make sure either enable_shared or enable_static is yes.
|
| - test "$enable_shared" = yes || enable_static=yes
|
| + test yes = "$enable_shared" || enable_static=yes
|
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
|
| $as_echo "$enable_static" >&6; }
|
|
|
| @@ -13055,7 +13536,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
| ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
| ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
|
| -CC="$lt_save_CC"
|
| +CC=$lt_save_CC
|
|
|
|
|
|
|
| @@ -15147,6 +15628,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
|
| enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
|
| pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
|
| enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
|
| +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
|
| SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
|
| ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
|
| PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
|
| @@ -15194,10 +15676,13 @@ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
|
| GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
|
| lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
|
| lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
|
| +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
|
| lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
|
| lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
|
| +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
|
| nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
|
| lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
|
| +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
|
| objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
|
| MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
|
| lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
|
| @@ -15262,7 +15747,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
|
| finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
|
| hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
|
| sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
|
| -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
|
| +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
|
| +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
|
| hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
|
| enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
|
| enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
|
| @@ -15314,9 +15800,12 @@ CFLAGS \
|
| compiler \
|
| lt_cv_sys_global_symbol_pipe \
|
| lt_cv_sys_global_symbol_to_cdecl \
|
| +lt_cv_sys_global_symbol_to_import \
|
| lt_cv_sys_global_symbol_to_c_name_address \
|
| lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
|
| +lt_cv_nm_interface \
|
| nm_file_list_spec \
|
| +lt_cv_truncate_bin \
|
| lt_prog_compiler_no_builtin_flag \
|
| lt_prog_compiler_pic \
|
| lt_prog_compiler_wl \
|
| @@ -15351,7 +15840,7 @@ old_striplib \
|
| striplib; do
|
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
| *[\\\\\\\`\\"\\\$]*)
|
| - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
|
| + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
|
| ;;
|
| *)
|
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
| @@ -15378,10 +15867,11 @@ postinstall_cmds \
|
| postuninstall_cmds \
|
| finish_cmds \
|
| sys_lib_search_path_spec \
|
| -sys_lib_dlsearch_path_spec; do
|
| +configure_time_dlsearch_path \
|
| +configure_time_lt_sys_library_path; do
|
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
| *[\\\\\\\`\\"\\\$]*)
|
| - 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
|
| ;;
|
| *)
|
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
| @@ -15390,19 +15880,16 @@ sys_lib_dlsearch_path_spec; do
|
| done
|
|
|
| ac_aux_dir='$ac_aux_dir'
|
| -xsi_shell='$xsi_shell'
|
| -lt_shell_append='$lt_shell_append'
|
|
|
| -# 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
|
| # commands through without removal of \ escapes INIT.
|
| -if test -n "\${ZSH_VERSION+set}" ; then
|
| +if test -n "\${ZSH_VERSION+set}"; then
|
| setopt NO_GLOB_SUBST
|
| fi
|
|
|
|
|
| PACKAGE='$PACKAGE'
|
| VERSION='$VERSION'
|
| - TIMESTAMP='$TIMESTAMP'
|
| RM='$RM'
|
| ofile='$ofile'
|
|
|
| @@ -16152,55 +16639,53 @@ $as_echo X"$file" |
|
| ;;
|
| "libtool":C)
|
|
|
| - # 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
|
| # commands through without removal of \ escapes.
|
| - if test -n "${ZSH_VERSION+set}" ; then
|
| + if test -n "${ZSH_VERSION+set}"; then
|
| setopt NO_GLOB_SUBST
|
| fi
|
|
|
| - cfgfile="${ofile}T"
|
| + cfgfile=${ofile}T
|
| trap "$RM \"$cfgfile\"; exit 1" 1 2 15
|
| $RM "$cfgfile"
|
|
|
| cat <<_LT_EOF >> "$cfgfile"
|
| #! $SHELL
|
| -
|
| -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
|
| -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
|
| +# Generated automatically by $as_me ($PACKAGE) $VERSION
|
| # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
| # NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
| +
|
| +# Provide generalized library-building support services.
|
| +# Written by Gordon Matzigkeit, 1996
|
| +
|
| +# Copyright (C) 2014 Free Software Foundation, Inc.
|
| +# This is free software; see the source for copying conditions. There is NO
|
| +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
| +
|
| +# GNU Libtool is free software; you can redistribute it and/or modify
|
| +# it under the terms of the GNU General Public License as published by
|
| +# the Free Software Foundation; either version 2 of of the License, or
|
| +# (at your option) any later version.
|
| #
|
| -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
| -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
| -# Foundation, Inc.
|
| -# Written by Gordon Matzigkeit, 1996
|
| -#
|
| -# This file is part of GNU Libtool.
|
| -#
|
| -# GNU Libtool is free software; you can redistribute it and/or
|
| -# modify it under the terms of the GNU General Public License as
|
| -# published by the Free Software Foundation; either version 2 of
|
| -# the License, or (at your option) any later version.
|
| -#
|
| -# As a special exception to the GNU General Public License,
|
| -# if you distribute this file as part of a program or library that
|
| -# is built using GNU Libtool, you may include this file under the
|
| -# same distribution terms that you use for the rest of that program.
|
| +# As a special exception to the GNU General Public License, if you
|
| +# distribute this file as part of a program or library that is built
|
| +# using GNU Libtool, you may include this file under the same
|
| +# distribution terms that you use for the rest of that program.
|
| #
|
| -# GNU Libtool is distributed in the hope that it will be useful,
|
| -# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| +# GNU Libtool is distributed in the hope that it will be useful, but
|
| +# WITHOUT ANY WARRANTY; without even the implied warranty of
|
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
| # GNU General Public License for more details.
|
| #
|
| # You should have received a copy of the GNU General Public License
|
| -# along with GNU Libtool; see the file COPYING. If not, a copy
|
| -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
|
| -# obtained by writing to the Free Software Foundation, Inc.,
|
| -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
| +# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
| # The names of the tagged configurations supported by this script.
|
| -available_tags=""
|
| +available_tags=''
|
| +
|
| +# Configured defaults for sys_lib_dlsearch_path munging.
|
| +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
|
|
|
| # ### BEGIN LIBTOOL CONFIG
|
|
|
| @@ -16229,6 +16714,9 @@ pic_mode=$pic_mode
|
| # Whether or not to optimize for fast installation.
|
| fast_install=$enable_fast_install
|
|
|
| +# Shared archive member basename,for filename based shared library versioning on AIX.
|
| +shared_archive_member_spec=$shared_archive_member_spec
|
| +
|
| # Shell to use when invoking shell scripts.
|
| SHELL=$lt_SHELL
|
|
|
| @@ -16340,18 +16828,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
|
| # Transform the output of nm in a proper C declaration.
|
| global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
|
|
|
| +# 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
|
| +
|
| # Transform the output of nm in a C name address pair.
|
| global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
|
|
|
| # Transform the output of nm in a C name address pair when lib prefix is needed.
|
| global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
|
|
|
| +# The name lister interface.
|
| +nm_interface=$lt_lt_cv_nm_interface
|
| +
|
| # Specify filename containing input files for \$NM.
|
| nm_file_list_spec=$lt_nm_file_list_spec
|
|
|
| -# 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.
|
| lt_sysroot=$lt_sysroot
|
|
|
| +# Command to truncate a binary pipe.
|
| +lt_truncate_bin=$lt_lt_cv_truncate_bin
|
| +
|
| # The name of the directory that contains temporary libtool files.
|
| objdir=$objdir
|
|
|
| @@ -16442,8 +16939,11 @@ hardcode_into_libs=$hardcode_into_libs
|
| # Compile-time system search path for libraries.
|
| sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
|
|
|
| -# Run-time system search path for libraries.
|
| -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
|
| +# Detected run-time system search path for libraries.
|
| +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
|
| +
|
| +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
|
| +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
|
|
|
| # Whether dlopen is supported.
|
| dlopen_support=$enable_dlopen
|
| @@ -16536,13 +17036,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
|
| # Whether we need a single "-rpath" flag with a separated argument.
|
| hardcode_libdir_separator=$lt_hardcode_libdir_separator
|
|
|
| -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
|
| +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
|
| # DIR into the resulting binary.
|
| hardcode_direct=$hardcode_direct
|
|
|
| -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
|
| +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
|
| # DIR into the resulting binary and the resulting library dependency is
|
| -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
|
| +# "absolute",i.e impossible to change by setting \$shlibpath_var if the
|
| # library is relocated.
|
| hardcode_direct_absolute=$hardcode_direct_absolute
|
|
|
| @@ -16592,6 +17092,65 @@ hardcode_action=$hardcode_action
|
|
|
| # ### END LIBTOOL CONFIG
|
|
|
| +_LT_EOF
|
| +
|
| + cat <<'_LT_EOF' >> "$cfgfile"
|
| +
|
| +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
|
| +
|
| +# func_munge_path_list VARIABLE PATH
|
| +# -----------------------------------
|
| +# VARIABLE is name of variable containing _space_ separated list of
|
| +# directories to be munged by the contents of PATH, which is string
|
| +# having a format:
|
| +# "DIR[:DIR]:"
|
| +# string "DIR[ DIR]" will be prepended to VARIABLE
|
| +# ":DIR[:DIR]"
|
| +# string "DIR[ DIR]" will be appended to VARIABLE
|
| +# "DIRP[:DIRP]::[DIRA:]DIRA"
|
| +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
|
| +# "DIRA[ DIRA]" will be appended to VARIABLE
|
| +# "DIR[:DIR]"
|
| +# VARIABLE will be replaced by "DIR[ DIR]"
|
| +func_munge_path_list ()
|
| +{
|
| + case x$2 in
|
| + x)
|
| + ;;
|
| + *:)
|
| + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
|
| + ;;
|
| + x:*)
|
| + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
|
| + ;;
|
| + *::*)
|
| + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
|
| + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
|
| + ;;
|
| + *)
|
| + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
|
| + ;;
|
| + esac
|
| +}
|
| +
|
| +
|
| +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
|
| +func_cc_basename ()
|
| +{
|
| + for cc_temp in $*""; do
|
| + case $cc_temp in
|
| + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
| + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
| + \-*) ;;
|
| + *) break;;
|
| + esac
|
| + done
|
| + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
|
| +}
|
| +
|
| +
|
| +# ### END FUNCTIONS SHARED WITH CONFIGURE
|
| +
|
| _LT_EOF
|
|
|
| case $host_os in
|
| @@ -16600,7 +17159,7 @@ _LT_EOF
|
| # AIX sometimes has problems with the GCC collect2 program. For some
|
| # reason, if we set the COLLECT_NAMES environment variable, the problems
|
| # vanish in a puff of smoke.
|
| -if test "X${COLLECT_NAMES+set}" != Xset; then
|
| +if test set != "${COLLECT_NAMES+set}"; then
|
| COLLECT_NAMES=
|
| export COLLECT_NAMES
|
| fi
|
| @@ -16609,7 +17168,7 @@ _LT_EOF
|
| esac
|
|
|
|
|
| -ltmain="$ac_aux_dir/ltmain.sh"
|
| +ltmain=$ac_aux_dir/ltmain.sh
|
|
|
|
|
| # We use sed instead of cat because bash on DJGPP gets confused if
|
| @@ -16619,165 +17178,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
|
| sed '$q' "$ltmain" >> "$cfgfile" \
|
| || (rm -f "$cfgfile"; exit 1)
|
|
|
| - 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
|
| -
|
| -
|
| mv -f "$cfgfile" "$ofile" ||
|
| (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
|
| chmod +x "$ofile"
|
|
|
Chromium Code Reviews
Issue 2865973002:
Check in the libxslt roll script. (Closed)
