Created
October 19, 2015 03:32
-
-
Save himanshugoel2797/de5c3101faa2090a64c2 to your computer and use it in GitHub Desktop.
The minimum work to compile GCC 4.7.0 to target ApertureOS
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Compile libtool and autotools from scratch, don't rely on the package provided by the OS | |
| Configure cmd: ../gcc-4.7.0/configure CFLAGS='-std=c89 -g -O2' --target=i686-elf-apertureos --prefix="/opt/apertureos" --disable-nls --enable-language=c --with-sysroot=$(pwd)/../sysroot --with-native-system-header-dir=/include MAKEINFO=missing --with-newlib --disable-multilib CC=clang CXX=clang++ | |
| make all-gcc | |
| make all-host | |
| make DESTDIR=$(pwd)/../sysroot install-host | |
| autoconf version 2.64 | |
| automake 1.12 | |
| autoreconf version 2.64 | |
| aclocal 1.12 | |
| libtool 2.4.6 | |
| gcc version 4.7.0 | |
| binutils version 2.23 (make sure that libtool is recompiled before this, otherwise ld will fail to compile because the dependency reporting doesn't happen) |
This file has been truncated, but you can view the full file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/config.sub orig/gcc-4.7.0/config.sub | |
| --- ./gcc-4.7.0/config.sub 2015-10-17 17:50:29.865880962 -0400 | |
| +++ orig/gcc-4.7.0/config.sub 2011-11-01 20:56:32.000000000 -0400 | |
| @@ -1352,7 +1352,7 @@ | |
| | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | |
| | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | |
| | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | |
| - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -apertureos* \ | |
| + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | |
| | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) | |
| # Remember, each alternative MUST END IN *, to match a version number. | |
| ;; | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/fixincludes/mkfixinc.sh orig/gcc-4.7.0/fixincludes/mkfixinc.sh | |
| --- ./gcc-4.7.0/fixincludes/mkfixinc.sh 2015-10-18 03:18:58.628614608 -0400 | |
| +++ orig/gcc-4.7.0/fixincludes/mkfixinc.sh 2011-09-22 10:00:17.000000000 -0400 | |
| @@ -11,7 +11,6 @@ | |
| # Check for special fix rules for particular targets | |
| case $machine in | |
| - *-apertureos* | \ | |
| i?86-*-cygwin* | \ | |
| i?86-*-mingw32* | \ | |
| x86_64-*-mingw32* | \ | |
| Only in ./gcc-4.7.0/gcc/config: apertureos.h | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/gcc/config/i386/i386.h orig/gcc-4.7.0/gcc/config/i386/i386.h | |
| --- ./gcc-4.7.0/gcc/config/i386/i386.h 2015-10-18 15:17:29.225687069 -0400 | |
| +++ orig/gcc-4.7.0/gcc/config/i386/i386.h 2011-11-24 17:11:12.000000000 -0500 | |
| @@ -2008,7 +2008,7 @@ | |
| asm (SECTION_OP "\n\t" \ | |
| "call " CRT_MKSTR(__USER_LABEL_PREFIX__) #FUNC "\n" \ | |
| TEXT_SECTION_ASM_OP); | |
| - | |
| + | |
| /* Which processor to tune code generation for. */ | |
| enum processor_type | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/gcc/config.gcc orig/gcc-4.7.0/gcc/config.gcc | |
| --- ./gcc-4.7.0/gcc/config.gcc 2015-10-18 03:10:37.931855908 -0400 | |
| +++ orig/gcc-4.7.0/gcc/config.gcc 2012-03-05 05:43:22.000000000 -0500 | |
| @@ -518,11 +518,6 @@ | |
| # Common parts for widely ported systems. | |
| case ${target} in | |
| -*-*-apertureos*) | |
| - gas=yes | |
| - gnu_ld=yes | |
| - default_use_cxa_atexit=yes | |
| - ;; | |
| *-*-darwin*) | |
| tmake_file="t-darwin ${cpu_type}/t-darwin" | |
| tm_file="${tm_file} darwin.h" | |
| @@ -949,9 +944,6 @@ | |
| tmake_file=bfin/t-bfin-elf | |
| use_collect2=no | |
| ;; | |
| -i[34567]86-*-apertureos*) | |
| - tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h apertureos.h" | |
| - ;; | |
| bfin*-uclinux*) | |
| tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h gnu-user.h linux.h glibc-stdint.h bfin/uclinux.h" | |
| tmake_file=bfin/t-bfin-uclinux | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/gcc/ira-int.h orig/gcc-4.7.0/gcc/ira-int.h | |
| --- ./gcc-4.7.0/gcc/ira-int.h 2015-10-18 14:55:28.338163918 -0400 | |
| +++ orig/gcc-4.7.0/gcc/ira-int.h 2012-01-19 15:46:31.000000000 -0500 | |
| @@ -1138,13 +1138,8 @@ | |
| ira_allocno_object_iter_cond (ira_allocno_object_iterator *i, ira_allocno_t a, | |
| ira_object_t *o) | |
| { | |
| - int n = i->n++; | |
| - if (n < ALLOCNO_NUM_OBJECTS (a)) | |
| - { | |
| - *o = ALLOCNO_OBJECT (a, n); | |
| - return true; | |
| - } | |
| - return false; | |
| + *o = ALLOCNO_OBJECT (a, i->n); | |
| + return i->n++ < ALLOCNO_NUM_OBJECTS (a); | |
| } | |
| /* Loop over all objects associated with allocno A. In each | |
| Only in ./gcc-4.7.0: gmp | |
| Only in ./gcc-4.7.0: gmp-4.3.2 | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libffi/configure orig/gcc-4.7.0/libffi/configure | |
| --- ./gcc-4.7.0/libffi/configure 2015-10-18 20:14:37.066643042 -0400 | |
| +++ orig/gcc-4.7.0/libffi/configure 2012-03-22 03:37:39.000000000 -0400 | |
| @@ -670,17 +670,13 @@ | |
| MAINTAINER_MODE_FALSE | |
| MAINTAINER_MODE_TRUE | |
| CPP | |
| -LT_SYS_LIBRARY_PATH | |
| OTOOL64 | |
| OTOOL | |
| LIPO | |
| NMEDIT | |
| DSYMUTIL | |
| -MANIFEST_TOOL | |
| RANLIB | |
| -ac_ct_AR | |
| AR | |
| -DLLTOOL | |
| OBJDUMP | |
| LN_S | |
| NM | |
| @@ -796,9 +792,7 @@ | |
| enable_static | |
| with_pic | |
| enable_fast_install | |
| -with_aix_soname | |
| with_gnu_ld | |
| -with_sysroot | |
| enable_libtool_lock | |
| enable_maintainer_mode | |
| enable_debug | |
| @@ -811,7 +805,6 @@ | |
| target_alias | |
| CCAS | |
| CCASFLAGS | |
| -LT_SYS_LIBRARY_PATH | |
| CPP | |
| CPPFLAGS' | |
| @@ -1452,14 +1445,9 @@ | |
| Optional Packages: | |
| --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | |
| --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | |
| - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | |
| + --with-pic 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). | |
| Some influential environment variables: | |
| CC C compiler command | |
| @@ -1471,8 +1459,6 @@ | |
| you have headers in a nonstandard directory <include dir> | |
| CCAS assembler compiler command (defaults to CC) | |
| CCASFLAGS assembler compiler flags (defaults to CFLAGS) | |
| - LT_SYS_LIBRARY_PATH | |
| - User-defined run-time library search path. | |
| CPP C preprocessor | |
| Use these variables to override the choices made by `configure' or to help | |
| @@ -4329,8 +4315,8 @@ | |
| -macro_version='2.4.6' | |
| -macro_revision='2.4.6' | |
| +macro_version='2.2.7a' | |
| +macro_revision='1.3134' | |
| @@ -4344,7 +4330,7 @@ | |
| -ltmain=$ac_aux_dir/ltmain.sh | |
| +ltmain="$ac_aux_dir/ltmain.sh" | |
| # Backslashify metacharacters that are still active within | |
| # double-quoted strings. | |
| @@ -4370,7 +4356,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | |
| $as_echo_n "checking how to print strings... " >&6; } | |
| # Test print first, because it will be a builtin if present. | |
| -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | |
| +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | |
| test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| ECHO='print -r --' | |
| elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| @@ -4393,7 +4379,7 @@ | |
| $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 | |
| @@ -4716,19 +4702,19 @@ | |
| # Check whether --with-gnu-ld was given. | |
| if test "${with_gnu_ld+set}" = set; then : | |
| - withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes | |
| + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | |
| else | |
| with_gnu_ld=no | |
| fi | |
| ac_prog=ld | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; 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` ;; | |
| @@ -4742,7 +4728,7 @@ | |
| 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. | |
| @@ -4753,7 +4739,7 @@ | |
| with_gnu_ld=unknown | |
| ;; | |
| esac | |
| -elif test yes = "$with_gnu_ld"; then | |
| +elif test "$with_gnu_ld" = yes; then | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 | |
| $as_echo_n "checking for GNU ld... " >&6; } | |
| else | |
| @@ -4764,32 +4750,32 @@ | |
| $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 no != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != no && break | |
| ;; | |
| *) | |
| - test yes != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != yes && 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; } | |
| @@ -4832,38 +4818,33 @@ | |
| 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 | |
| - # 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'*) | |
| + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in | |
| + */dev/null* | *'Invalid file or object type'*) | |
| lt_cv_path_NM="$tmp_nm -B" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in | |
| */dev/null*) | |
| lt_cv_path_NM="$tmp_nm -p" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but | |
| @@ -4874,15 +4855,15 @@ | |
| 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 no != "$lt_cv_path_NM"; then | |
| - NM=$lt_cv_path_NM | |
| +if test "$lt_cv_path_NM" != "no"; then | |
| + NM="$lt_cv_path_NM" | |
| else | |
| # Didn't find any BSD compatible name lister, look for dumpbin. | |
| if test -n "$DUMPBIN"; then : | |
| @@ -4988,9 +4969,9 @@ | |
| fi | |
| fi | |
| - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in | |
| + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | |
| *COFF*) | |
| - DUMPBIN="$DUMPBIN -symbols -headers" | |
| + DUMPBIN="$DUMPBIN -symbols" | |
| ;; | |
| *) | |
| DUMPBIN=: | |
| @@ -4998,8 +4979,8 @@ | |
| esac | |
| fi | |
| - if test : != "$DUMPBIN"; then | |
| - NM=$DUMPBIN | |
| + if test "$DUMPBIN" != ":"; then | |
| + NM="$DUMPBIN" | |
| fi | |
| fi | |
| test -z "$NM" && NM=nm | |
| @@ -5050,7 +5031,7 @@ | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| i=0 | |
| - teststring=ABCD | |
| + teststring="ABCD" | |
| case $build_os in | |
| msdosdjgpp*) | |
| @@ -5090,7 +5071,7 @@ | |
| lt_cv_sys_max_cmd_len=8192; | |
| ;; | |
| - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) | |
| + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) | |
| # 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` | |
| @@ -5109,11 +5090,6 @@ | |
| lt_cv_sys_max_cmd_len=196608 | |
| ;; | |
| - os2*) | |
| - # The test takes a long time on OS/2. | |
| - lt_cv_sys_max_cmd_len=8192 | |
| - ;; | |
| - | |
| osf*) | |
| # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | |
| # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | |
| @@ -5140,23 +5116,22 @@ | |
| ;; | |
| *) | |
| 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 | |
| + if test -n "$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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | |
| = "X$teststring$teststring"; } >/dev/null 2>&1 && | |
| - test 17 != "$i" # 1/2 MB should be enough | |
| + test $i != 17 # 1/2 MB should be enough | |
| do | |
| i=`expr $i + 1` | |
| teststring=$teststring$teststring | |
| @@ -5174,7 +5149,7 @@ | |
| 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 | |
| @@ -5192,6 +5167,30 @@ | |
| : ${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"}, \ | |
| + = c,a/b,, \ | |
| + && 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 | |
| @@ -5223,80 +5222,6 @@ | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | |
| -if test "${lt_cv_to_host_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| - *-*-cygwin* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | |
| - ;; | |
| - esac | |
| - ;; | |
| - * ) # unhandled hosts (and "normal" native builds) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_host_file_cmd=$lt_cv_to_host_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_host_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | |
| -if test "${lt_cv_to_tool_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - #assume ordinary cross tools, or native build. | |
| -lt_cv_to_tool_file_cmd=func_convert_file_noop | |
| -case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | |
| $as_echo_n "checking for $LD option to reload object files... " >&6; } | |
| if test "${lt_cv_ld_reload_flag+set}" = set; then : | |
| @@ -5313,14 +5238,9 @@ | |
| esac | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| case $host_os in | |
| - cygwin* | mingw* | pw32* | cegcc*) | |
| - if test yes != "$GCC"; then | |
| - reload_cmds=false | |
| - fi | |
| - ;; | |
| darwin*) | |
| - if test yes = "$GCC"; then | |
| - reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' | |
| + if test "$GCC" = yes; then | |
| + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | |
| else | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| fi | |
| @@ -5448,13 +5368,13 @@ | |
| # 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 | |
| -# 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. | |
| +# 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. | |
| case $host_os in | |
| aix[4-9]*) | |
| @@ -5481,12 +5401,12 @@ | |
| # 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. | |
| - if ( file / ) >/dev/null 2>&1; then | |
| + # 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 | |
| lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | |
| lt_cv_file_magic_cmd='func_win32_libid' | |
| else | |
| - # Keep this pattern in sync with the one in func_win32_libid. | |
| - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | |
| + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| fi | |
| ;; | |
| @@ -5517,6 +5437,10 @@ | |
| fi | |
| ;; | |
| +gnu*) | |
| + lt_cv_deplibs_check_method=pass_all | |
| + ;; | |
| + | |
| haiku*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -5554,8 +5478,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -# This must be glibc/ELF. | |
| -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-gnu) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -5577,8 +5501,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -openbsd* | bitrig*) | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| +openbsd*) | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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)$' | |
| @@ -5631,29 +5555,11 @@ | |
| tpf*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -os2*) | |
| - lt_cv_deplibs_check_method=pass_all | |
| - ;; | |
| esac | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | |
| $as_echo "$lt_cv_deplibs_check_method" >&6; } | |
| - | |
| -file_magic_glob= | |
| -want_nocaseglob=no | |
| -if test "$build" = "$host"; then | |
| - case $host_os in | |
| - mingw* | pw32*) | |
| - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | |
| - want_nocaseglob=yes | |
| - else | |
| - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | |
| - fi | |
| - ;; | |
| - esac | |
| -fi | |
| - | |
| file_magic_cmd=$lt_cv_file_magic_cmd | |
| deplibs_check_method=$lt_cv_deplibs_check_method | |
| test -z "$deplibs_check_method" && deplibs_check_method=unknown | |
| @@ -5669,163 +5575,9 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| if test -n "$ac_tool_prefix"; then | |
| - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | |
| -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$DLLTOOL"; then | |
| - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -DLLTOOL=$ac_cv_prog_DLLTOOL | |
| -if test -n "$DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | |
| -$as_echo "$DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_DLLTOOL"; then | |
| - ac_ct_DLLTOOL=$DLLTOOL | |
| - # Extract the first word of "dlltool", so it can be a program name with args. | |
| -set dummy dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_DLLTOOL"; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | |
| -if test -n "$ac_ct_DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | |
| -$as_echo "$ac_ct_DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_DLLTOOL" = x; then | |
| - DLLTOOL="false" | |
| - else | |
| - case $cross_compiling:$ac_tool_warned in | |
| -yes:) | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | |
| -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
| -ac_tool_warned=yes ;; | |
| -esac | |
| - DLLTOOL=$ac_ct_DLLTOOL | |
| - fi | |
| -else | |
| - DLLTOOL="$ac_cv_prog_DLLTOOL" | |
| -fi | |
| - | |
| -test -z "$DLLTOOL" && DLLTOOL=dlltool | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | |
| -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | |
| -if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_sharedlib_from_linklib_cmd='unknown' | |
| - | |
| -case $host_os in | |
| -cygwin* | mingw* | pw32* | cegcc*) | |
| - # 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 | |
| - ;; | |
| - *) | |
| - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | |
| - ;; | |
| - esac | |
| - ;; | |
| -*) | |
| - # fallback: assume linklib IS sharedlib | |
| - lt_cv_sharedlib_from_linklib_cmd=$ECHO | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | |
| -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | |
| -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | |
| -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in ar | |
| - do | |
| - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | |
| +set dummy ${ac_tool_prefix}ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_AR+set}" = set; then : | |
| @@ -5841,7 +5593,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | |
| + ac_cv_prog_AR="${ac_tool_prefix}ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -5861,15 +5613,11 @@ | |
| fi | |
| - test -n "$AR" && break | |
| - done | |
| fi | |
| -if test -z "$AR"; then | |
| +if test -z "$ac_cv_prog_AR"; then | |
| ac_ct_AR=$AR | |
| - for ac_prog in ar | |
| -do | |
| - # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_prog; ac_word=$2 | |
| + # Extract the first word of "ar", so it can be a program name with args. | |
| +set dummy ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | |
| @@ -5885,7 +5633,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_AR="$ac_prog" | |
| + ac_cv_prog_ac_ct_AR="ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -5904,10 +5652,6 @@ | |
| $as_echo "no" >&6; } | |
| fi | |
| - | |
| - test -n "$ac_ct_AR" && break | |
| -done | |
| - | |
| if test "x$ac_ct_AR" = x; then | |
| AR="false" | |
| else | |
| @@ -5919,72 +5663,16 @@ | |
| esac | |
| AR=$ac_ct_AR | |
| fi | |
| -fi | |
| - | |
| -: ${AR=ar} | |
| -: ${AR_FLAGS=cru} | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | |
| -$as_echo_n "checking for archiver @FILE support... " >&6; } | |
| -if test "${lt_cv_ar_at_file+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| else | |
| - lt_cv_ar_at_file=no | |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| -/* end confdefs.h. */ | |
| + AR="$ac_cv_prog_AR" | |
| +fi | |
| -int | |
| -main () | |
| -{ | |
| +test -z "$AR" && AR=ar | |
| +test -z "$AR_FLAGS" && AR_FLAGS=cru | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -if ac_fn_c_try_compile "$LINENO"; then : | |
| - echo conftest.$ac_objext > conftest.lst | |
| - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | |
| - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - 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 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - if test 0 -ne "$ac_status"; then | |
| - lt_cv_ar_at_file=@ | |
| - fi | |
| - fi | |
| - rm -f conftest.* libconftest.a | |
| -fi | |
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -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 no = "$lt_cv_ar_at_file"; then | |
| - archiver_list_spec= | |
| -else | |
| - archiver_list_spec=$lt_cv_ar_at_file | |
| -fi | |
| @@ -6197,14 +5885,14 @@ | |
| if test -n "$RANLIB"; then | |
| case $host_os in | |
| - bitrig* | openbsd*) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | |
| + openbsd*) | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | |
| ;; | |
| *) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | |
| ;; | |
| esac | |
| - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" | |
| + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | |
| fi | |
| case $host_os in | |
| @@ -6287,7 +5975,7 @@ | |
| symcode='[ABCDGISTW]' | |
| ;; | |
| hpux*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| symcode='[ABCDEGRST]' | |
| fi | |
| ;; | |
| @@ -6320,44 +6008,14 @@ | |
| 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"\ | |
| -$lt_cdecl_hook\ | |
| -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ | |
| -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" | |
| +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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"\ | |
| -$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'" | |
| +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'" | |
| # Handle CRLF in mingw tool chain | |
| opt_cr= | |
| @@ -6375,29 +6033,24 @@ | |
| # 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, | |
| - # D for any global variable and I for any imported variable. | |
| + # Fake it for dumpbin and say T for any non-static function | |
| + # and D for any global 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=\"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))}"\ | |
| +" {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))}"\ | |
| " ' prfx=^$ac_symprfx" | |
| else | |
| lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | |
| fi | |
| - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | |
| # Check to see that the pipe works correctly. | |
| pipe_works=no | |
| @@ -6439,18 +6092,6 @@ | |
| if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | |
| 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 can't be const, because runtime | |
| - relocations are performed -- see ld's documentation on pseudo-relocs. */ | |
| -# define LT_DLSYM_CONST | |
| -#elif defined __osf__ | |
| -/* This system does not cope well with relocations in const data. */ | |
| -# define LT_DLSYM_CONST | |
| -#else | |
| -# define LT_DLSYM_CONST const | |
| -#endif | |
| - | |
| #ifdef __cplusplus | |
| extern "C" { | |
| #endif | |
| @@ -6462,7 +6103,7 @@ | |
| cat <<_LT_EOF >> conftest.$ac_ext | |
| /* The mapping between symbol names and symbols. */ | |
| -LT_DLSYM_CONST struct { | |
| +const struct { | |
| const char *name; | |
| void *address; | |
| } | |
| @@ -6470,7 +6111,7 @@ | |
| { | |
| { "@PROGRAM@", (void *) 0 }, | |
| _LT_EOF | |
| - $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| cat <<\_LT_EOF >> conftest.$ac_ext | |
| {0, (void *) 0} | |
| }; | |
| @@ -6488,19 +6129,19 @@ | |
| _LT_EOF | |
| # Now try linking the two files. | |
| mv conftest.$ac_objext conftstm.$ac_objext | |
| - lt_globsym_save_LIBS=$LIBS | |
| - lt_globsym_save_CFLAGS=$CFLAGS | |
| - LIBS=conftstm.$ac_objext | |
| + lt_save_LIBS="$LIBS" | |
| + lt_save_CFLAGS="$CFLAGS" | |
| + 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 | |
| - CFLAGS=$lt_globsym_save_CFLAGS | |
| + LIBS="$lt_save_LIBS" | |
| + CFLAGS="$lt_save_CFLAGS" | |
| else | |
| echo "cannot find nm_test_func in $nlist" >&5 | |
| fi | |
| @@ -6517,7 +6158,7 @@ | |
| rm -rf conftest* conftst* | |
| # Do not use the global_symbol_pipe unless it works. | |
| - if test yes = "$pipe_works"; then | |
| + if test "$pipe_works" = yes; then | |
| break | |
| else | |
| lt_cv_sys_global_symbol_pipe= | |
| @@ -6537,14 +6178,6 @@ | |
| $as_echo "ok" >&6; } | |
| fi | |
| -# Response file support. | |
| -if test "$lt_cv_nm_interface" = "MS dumpbin"; then | |
| - nm_file_list_spec='@' | |
| -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | |
| - nm_file_list_spec='@' | |
| -fi | |
| - | |
| - | |
| @@ -6567,149 +6200,18 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | |
| -$as_echo_n "checking for sysroot... " >&6; } | |
| - | |
| -# Check whether --with-sysroot was given. | |
| -if test "${with_sysroot+set}" = set; then : | |
| - withval=$with_sysroot; | |
| -else | |
| - with_sysroot=no | |
| -fi | |
| - | |
| - | |
| -lt_sysroot= | |
| -case $with_sysroot in #( | |
| - yes) | |
| - if test yes = "$GCC"; then | |
| - lt_sysroot=`$CC --print-sysroot 2>/dev/null` | |
| - fi | |
| - ;; #( | |
| - /*) | |
| - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | |
| - ;; #( | |
| - no|'') | |
| - ;; #( | |
| - *) | |
| - { $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 | |
| - | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | |
| -$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 test "${ac_cv_path_lt_DD+set}" = set; 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" | |
| - { test -f "$ac_path_lt_DD" && $as_test_x "$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 test "${lt_cv_truncate_bin+set}" = set; 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 no = "$enable_libtool_lock" || enable_libtool_lock=yes | |
| +test "x$enable_libtool_lock" != xno && 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 what ABI is being produced by ac_compile, and set mode | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6718,25 +6220,24 @@ | |
| 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| 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 yes = "$lt_cv_prog_gnu_ld"; then | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| case `/usr/bin/file conftest.$ac_objext` in | |
| *32-bit*) | |
| LD="${LD-ld} -melf32bsmip" | |
| @@ -6747,68 +6248,27 @@ | |
| *64-bit*) | |
| LD="${LD-ld} -melf64bmip" | |
| ;; | |
| - esac | |
| - else | |
| - case `/usr/bin/file conftest.$ac_objext` in | |
| - *32-bit*) | |
| - LD="${LD-ld} -32" | |
| - ;; | |
| - *N32*) | |
| - LD="${LD-ld} -n32" | |
| - ;; | |
| - *64-bit*) | |
| - LD="${LD-ld} -64" | |
| - ;; | |
| - esac | |
| - fi | |
| - fi | |
| - 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" | |
| + esac | |
| + else | |
| + case `/usr/bin/file conftest.$ac_objext` in | |
| + *32-bit*) | |
| + LD="${LD-ld} -32" | |
| + ;; | |
| + *N32*) | |
| + LD="${LD-ld} -n32" | |
| + ;; | |
| + *64-bit*) | |
| + LD="${LD-ld} -64" | |
| + ;; | |
| + esac | |
| + fi | |
| fi | |
| rm -rf conftest* | |
| ;; | |
| -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ | |
| +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | |
| s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | |
| - # 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. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6822,19 +6282,9 @@ | |
| LD="${LD-ld} -m elf_i386_fbsd" | |
| ;; | |
| x86_64-*linux*) | |
| - case `/usr/bin/file conftest.o` in | |
| - *x86-64*) | |
| - LD="${LD-ld} -m elf32_x86_64" | |
| - ;; | |
| - *) | |
| - LD="${LD-ld} -m elf_i386" | |
| - ;; | |
| - esac | |
| + LD="${LD-ld} -m elf_i386" | |
| ;; | |
| - powerpc64le-*linux*) | |
| - LD="${LD-ld} -m elf32lppclinux" | |
| - ;; | |
| - powerpc64-*linux*) | |
| + ppc64-*linux*|powerpc64-*linux*) | |
| LD="${LD-ld} -m elf32ppclinux" | |
| ;; | |
| s390x-*linux*) | |
| @@ -6853,10 +6303,7 @@ | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_x86_64" | |
| ;; | |
| - powerpcle-*linux*) | |
| - LD="${LD-ld} -m elf64lppc" | |
| - ;; | |
| - powerpc-*linux*) | |
| + ppc*-*linux*|powerpc*-*linux*) | |
| LD="${LD-ld} -m elf64ppc" | |
| ;; | |
| s390*-*linux*|s390*-*tpf*) | |
| @@ -6874,7 +6321,7 @@ | |
| *-*-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; } | |
| @@ -6914,14 +6361,13 @@ | |
| 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 yes != "$lt_cv_cc_needs_belf"; then | |
| + if test x"$lt_cv_cc_needs_belf" != x"yes"; 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| +sparc*-*solaris*) | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6931,20 +6377,7 @@ | |
| case `/usr/bin/file conftest.o` in | |
| *64-bit*) | |
| case $lt_cv_prog_gnu_ld in | |
| - yes*) | |
| - case $host in | |
| - i?86-*-solaris*|x86_64-*-solaris*) | |
| - LD="${LD-ld} -m elf_x86_64" | |
| - ;; | |
| - sparc*-*-solaris*) | |
| - LD="${LD-ld} -m elf64_sparc" | |
| - ;; | |
| - 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 | |
| - fi | |
| - ;; | |
| + yes*) LD="${LD-ld} -m elf64_sparc" ;; | |
| *) | |
| if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | |
| LD="${LD-ld} -64" | |
| @@ -6958,124 +6391,7 @@ | |
| ;; | |
| esac | |
| -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. | |
| -set dummy ${ac_tool_prefix}mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$MANIFEST_TOOL"; then | |
| - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | |
| -if test -n "$MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | |
| -$as_echo "$MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | |
| - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | |
| - # Extract the first word of "mt", so it can be a program name with args. | |
| -set dummy mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | |
| -if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | |
| -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_MANIFEST_TOOL" = x; then | |
| - MANIFEST_TOOL=":" | |
| - else | |
| - case $cross_compiling:$ac_tool_warned in | |
| -yes:) | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | |
| -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
| -ac_tool_warned=yes ;; | |
| -esac | |
| - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | |
| - fi | |
| -else | |
| - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | |
| -fi | |
| - | |
| -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | |
| -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | |
| -if test "${lt_cv_path_mainfest_tool+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_path_mainfest_tool=no | |
| - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | |
| - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | |
| - cat conftest.err >&5 | |
| - if $GREP 'Manifest Tool' conftest.out > /dev/null; then | |
| - lt_cv_path_mainfest_tool=yes | |
| - fi | |
| - rm -f conftest* | |
| -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 yes != "$lt_cv_path_mainfest_tool"; then | |
| - MANIFEST_TOOL=: | |
| -fi | |
| - | |
| - | |
| - | |
| - | |
| +need_locks="$enable_libtool_lock" | |
| case $host_os in | |
| @@ -7572,7 +6888,7 @@ | |
| $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 | |
| @@ -7584,13 +6900,7 @@ | |
| $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | |
| -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | |
| _lt_result=$? | |
| - # If there is a non-empty error log, and "single_module" | |
| - # appears in it, assume the flag caused a linker warning | |
| - if test -s conftest.err && $GREP single_module conftest.err; then | |
| - 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 0 = "$_lt_result"; then | |
| + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | |
| lt_cv_apple_cc_single_mod=yes | |
| else | |
| cat conftest.err >&5 | |
| @@ -7601,7 +6911,6 @@ | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 | |
| $as_echo "$lt_cv_apple_cc_single_mod" >&6; } | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 | |
| $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } | |
| if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : | |
| @@ -7629,12 +6938,11 @@ | |
| 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 | |
| $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 | |
| $as_echo_n "checking for -force_load linker flag... " >&6; } | |
| if test "${lt_cv_ld_force_load+set}" = set; then : | |
| @@ -7648,17 +6956,13 @@ | |
| $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | |
| echo "$AR cru libconftest.a conftest.o" >&5 | |
| $AR cru libconftest.a conftest.o 2>&5 | |
| - echo "$RANLIB libconftest.a" >&5 | |
| - $RANLIB libconftest.a 2>&5 | |
| cat > conftest.c << _LT_EOF | |
| int main() { return 0;} | |
| _LT_EOF | |
| echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 | |
| $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | |
| _lt_result=$? | |
| - if test -s conftest.err && $GREP force_load conftest.err; then | |
| - cat conftest.err >&5 | |
| - elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then | |
| + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | |
| lt_cv_ld_force_load=yes | |
| else | |
| cat conftest.err >&5 | |
| @@ -7671,32 +6975,32 @@ | |
| $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 yes = "$lt_cv_apple_cc_single_mod"; then | |
| + if test "$lt_cv_apple_cc_single_mod" = "yes"; then | |
| _lt_dar_single_mod='$single_module' | |
| fi | |
| - if test yes = "$lt_cv_ld_exported_symbols_list"; then | |
| - _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' | |
| + if test "$lt_cv_ld_exported_symbols_list" = "yes"; 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 no = "$lt_cv_ld_force_load"; then | |
| + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then | |
| _lt_dsymutil='~$DSYMUTIL $lib || :' | |
| else | |
| _lt_dsymutil= | |
| @@ -7704,41 +7008,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 | |
| -} | |
| - | |
| ac_ext=c | |
| ac_cpp='$CPP $CPPFLAGS' | |
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| @@ -8043,14 +7312,14 @@ | |
| *) | |
| 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 | |
| @@ -8074,14 +7343,14 @@ | |
| *) | |
| 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 | |
| @@ -8099,27 +7368,14 @@ | |
| # Check whether --with-pic was given. | |
| if test "${with_pic+set}" = set; then : | |
| - withval=$with_pic; lt_p=${PACKAGE-default} | |
| - case $withval in | |
| - yes|no) pic_mode=$withval ;; | |
| - *) | |
| - pic_mode=default | |
| - # Look at the argument we got. We use all the common list separators. | |
| - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, | |
| - for lt_pkg in $withval; do | |
| - IFS=$lt_save_ifs | |
| - if test "X$lt_pkg" = "X$lt_p"; then | |
| - pic_mode=yes | |
| - fi | |
| - done | |
| - IFS=$lt_save_ifs | |
| - ;; | |
| - esac | |
| + withval=$with_pic; pic_mode="$withval" | |
| else | |
| pic_mode=default | |
| fi | |
| +test -z "$pic_mode" && pic_mode=default | |
| + | |
| @@ -8135,14 +7391,14 @@ | |
| *) | |
| 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 | |
| @@ -8156,63 +7412,11 @@ | |
| - 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 test "${lt_cv_with_aix_soname+set}" = set; 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' | |
| @@ -8242,10 +7446,6 @@ | |
| - | |
| - | |
| - | |
| - | |
| test -z "$LN_S" && LN_S="ln -s" | |
| @@ -8261,7 +7461,7 @@ | |
| -if test -n "${ZSH_VERSION+set}"; then | |
| +if test -n "${ZSH_VERSION+set}" ; then | |
| setopt NO_GLOB_SUBST | |
| fi | |
| @@ -8300,7 +7500,7 @@ | |
| # 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 set != "${COLLECT_NAMES+set}"; then | |
| + if test "X${COLLECT_NAMES+set}" != Xset; then | |
| COLLECT_NAMES= | |
| export COLLECT_NAMES | |
| fi | |
| @@ -8311,14 +7511,14 @@ | |
| 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 | |
| @@ -8327,8 +7527,15 @@ | |
| test -z "$LD" && LD=ld | |
| test -z "$ac_objext" && ac_objext=o | |
| -func_cc_basename $compiler | |
| -cc_basename=$func_cc_basename_result | |
| +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-%%"` | |
| # Only perform the check for file, if the check method requires it | |
| @@ -8343,22 +7550,22 @@ | |
| 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 | |
| : | |
| @@ -8381,13 +7588,13 @@ | |
| 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; } | |
| @@ -8409,22 +7616,22 @@ | |
| 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 | |
| : | |
| @@ -8447,13 +7654,13 @@ | |
| 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; } | |
| @@ -8474,7 +7681,7 @@ | |
| # 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' | |
| @@ -8536,7 +7743,7 @@ | |
| lt_prog_compiler_no_builtin_flag= | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; then | |
| case $cc_basename in | |
| nvcc*) | |
| lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; | |
| @@ -8552,7 +7759,7 @@ | |
| 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" ## exclude from sc_useless_quotes_in_assignment | |
| + lt_compiler_flag="-fno-rtti -fno-exceptions" | |
| # 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 | |
| @@ -8582,7 +7789,7 @@ | |
| { $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 yes = "$lt_cv_prog_compiler_rtti_exceptions"; then | |
| +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | |
| lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" | |
| else | |
| : | |
| @@ -8599,19 +7806,20 @@ | |
| lt_prog_compiler_pic= | |
| lt_prog_compiler_static= | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; then | |
| lt_prog_compiler_wl='-Wl,' | |
| lt_prog_compiler_static='-static' | |
| case $host_os in | |
| aix*) | |
| # All AIX code is PIC. | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static='-Bstatic' | |
| fi | |
| - lt_prog_compiler_pic='-fPIC' | |
| ;; | |
| amigaos*) | |
| @@ -8622,8 +7830,8 @@ | |
| ;; | |
| 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 | |
| @@ -8639,11 +7847,6 @@ | |
| # 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*) | |
| @@ -8704,9 +7907,7 @@ | |
| case $cc_basename in | |
| nvcc*) # Cuda Compiler Driver 2.2 | |
| lt_prog_compiler_wl='-Xlinker ' | |
| - if test -n "$lt_prog_compiler_pic"; then | |
| - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" | |
| - fi | |
| + lt_prog_compiler_pic='-Xcompiler -fPIC' | |
| ;; | |
| esac | |
| else | |
| @@ -8714,7 +7915,7 @@ | |
| case $host_os in | |
| aix*) | |
| lt_prog_compiler_wl='-Wl,' | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static='-Bstatic' | |
| else | |
| @@ -8722,29 +7923,10 @@ | |
| 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*) | |
| @@ -8760,7 +7942,7 @@ | |
| ;; | |
| 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*) | |
| @@ -8769,9 +7951,9 @@ | |
| lt_prog_compiler_static='-non_shared' | |
| ;; | |
| - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| + linux* | k*bsd*-gnu | kopensolaris*-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' | |
| @@ -8790,18 +7972,6 @@ | |
| lt_prog_compiler_pic='--shared' | |
| lt_prog_compiler_static='--static' | |
| ;; | |
| - nagfor*) | |
| - # NAG Fortran compiler | |
| - lt_prog_compiler_wl='-Wl,-Wl,,' | |
| - 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) | |
| @@ -8822,33 +7992,18 @@ | |
| ;; | |
| *) | |
| case `$CC -V 2>&1 | sed 5q` in | |
| - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) | |
| + *Sun\ F* | *Sun*Fortran*) | |
| # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| lt_prog_compiler_wl='' | |
| ;; | |
| - *Sun\ F* | *Sun*Fortran*) | |
| - lt_prog_compiler_pic='-KPIC' | |
| - lt_prog_compiler_static='-Bstatic' | |
| - lt_prog_compiler_wl='-Qoption ld ' | |
| - ;; | |
| *Sun\ C*) | |
| # Sun C 5.9 | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| lt_prog_compiler_wl='-Wl,' | |
| ;; | |
| - *Intel*\ [CF]*Compiler*) | |
| - lt_prog_compiler_wl='-Wl,' | |
| - lt_prog_compiler_pic='-fPIC' | |
| - lt_prog_compiler_static='-static' | |
| - ;; | |
| - *Portland\ Group*) | |
| - lt_prog_compiler_wl='-Wl,' | |
| - lt_prog_compiler_pic='-fpic' | |
| - lt_prog_compiler_static='-Bstatic' | |
| - ;; | |
| esac | |
| ;; | |
| esac | |
| @@ -8879,7 +8034,7 @@ | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| case $cc_basename in | |
| - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | |
| + f77* | f90* | f95*) | |
| lt_prog_compiler_wl='-Qoption ld ';; | |
| *) | |
| lt_prog_compiler_wl='-Wl,';; | |
| @@ -8899,7 +8054,7 @@ | |
| ;; | |
| 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 | |
| @@ -8928,7 +8083,7 @@ | |
| fi | |
| case $host_os in | |
| - # For platforms that do not support PIC, -DPIC is meaningless: | |
| + # For platforms which do not support PIC, -DPIC is meaningless: | |
| *djgpp*) | |
| lt_prog_compiler_pic= | |
| ;; | |
| @@ -8936,17 +8091,13 @@ | |
| lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | |
| ;; | |
| esac | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | |
| +$as_echo "$lt_prog_compiler_pic" >&6; } | |
| + | |
| + | |
| + | |
| + | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| -if test "${lt_cv_prog_compiler_pic+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | |
| -$as_echo "$lt_cv_prog_compiler_pic" >&6; } | |
| -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| @@ -8960,7 +8111,7 @@ | |
| 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" ## exclude from sc_useless_quotes_in_assignment | |
| + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" | |
| # 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 | |
| @@ -8990,7 +8141,7 @@ | |
| { $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 yes = "$lt_cv_prog_compiler_pic_works"; then | |
| +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then | |
| case $lt_prog_compiler_pic in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; | |
| @@ -9007,11 +8158,6 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| # | |
| # Check to make sure the static flag actually works. | |
| # | |
| @@ -9022,7 +8168,7 @@ | |
| $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 | |
| @@ -9041,13 +8187,13 @@ | |
| 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 yes = "$lt_cv_prog_compiler_static_works"; then | |
| +if test x"$lt_cv_prog_compiler_static_works" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static= | |
| @@ -9167,8 +8313,8 @@ | |
| -hard_links=nottested | |
| -if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then | |
| +hard_links="nottested" | |
| +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; 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; } | |
| @@ -9180,9 +8326,9 @@ | |
| 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 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;} | |
| + 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;} | |
| need_locks=warn | |
| fi | |
| else | |
| @@ -9210,6 +8356,7 @@ | |
| hardcode_direct=no | |
| hardcode_direct_absolute=no | |
| hardcode_libdir_flag_spec= | |
| + hardcode_libdir_flag_spec_ld= | |
| hardcode_libdir_separator= | |
| hardcode_minus_L=no | |
| hardcode_shlibpath_var=unsupported | |
| @@ -9225,9 +8372,9 @@ | |
| # 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 | |
| @@ -9242,7 +8389,7 @@ | |
| # 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 yes != "$GCC"; then | |
| + if test "$GCC" != yes; then | |
| with_gnu_ld=no | |
| fi | |
| ;; | |
| @@ -9250,7 +8397,7 @@ | |
| # we just hope/assume this is gcc and not c89 (= MSVC++) | |
| with_gnu_ld=yes | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| with_gnu_ld=no | |
| ;; | |
| esac | |
| @@ -9260,7 +8407,7 @@ | |
| # 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| case $host_os in | |
| aix*) | |
| # The AIX port of GNU ld has always aspired to compatibility | |
| @@ -9282,24 +8429,24 @@ | |
| esac | |
| fi | |
| - if test yes = "$lt_use_gnu_ld_interface"; then | |
| + if test "$lt_use_gnu_ld_interface" = yes; 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 | $SED -e 's/(^)\+)\s\+//' 2>&1` in | |
| + case `$LD -v 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 ... | |
| @@ -9312,7 +8459,7 @@ | |
| case $host_os in | |
| aix[3-9]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| - if test ia64 != "$host_cpu"; then | |
| + if test "$host_cpu" != ia64; then | |
| ld_shlibs=no | |
| cat <<_LT_EOF 1>&2 | |
| @@ -9331,7 +8478,7 @@ | |
| 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) | |
| @@ -9347,7 +8494,7 @@ | |
| 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 | |
| @@ -9357,97 +8504,68 @@ | |
| # _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 | |
| - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | |
| - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | |
| + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| 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, 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' | |
| + 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' | |
| 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 linux-dietlibc = "$host_os"; then | |
| + if test "$host_os" = linux-dietlibc; 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 no = "$tmp_diet" | |
| + && test "$tmp_diet" = no | |
| then | |
| - tmp_addflag=' $pic_flag' | |
| + tmp_addflag= | |
| 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' ;; | |
| @@ -9458,47 +8576,43 @@ | |
| 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 yes = "$supports_anon_versioning"; then | |
| + if test "x$supports_anon_versioning" = xyes; 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' | |
| - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | |
| - if test yes = "$supports_anon_versioning"; then | |
| + hardcode_libdir_flag_spec= | |
| + hardcode_libdir_flag_spec_ld='-rpath $libdir' | |
| + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | |
| + if test "x$supports_anon_versioning" = xyes; 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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | |
| fi | |
| ;; | |
| esac | |
| @@ -9512,8 +8626,8 @@ | |
| 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 $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' | |
| fi | |
| ;; | |
| @@ -9531,8 +8645,8 @@ | |
| _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 $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 | |
| @@ -9544,7 +8658,7 @@ | |
| ld_shlibs=no | |
| cat <<_LT_EOF 1>&2 | |
| -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot | |
| +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not | |
| *** 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 | |
| @@ -9559,9 +8673,9 @@ | |
| # 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 | |
| @@ -9578,15 +8692,15 @@ | |
| *) | |
| 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 $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 | |
| ;; | |
| esac | |
| - if test no = "$ld_shlibs"; then | |
| + if test "$ld_shlibs" = no; then | |
| runpath_var= | |
| hardcode_libdir_flag_spec= | |
| export_dynamic_flag_spec= | |
| @@ -9602,7 +8716,7 @@ | |
| # Note: this linker hardcodes the directories in LIBPATH if there | |
| # are no directories specified by -L. | |
| hardcode_minus_L=yes | |
| - if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then | |
| + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then | |
| # Neither direct hardcoding nor static linking is supported with a | |
| # broken collect2. | |
| hardcode_direct=unsupported | |
| @@ -9610,57 +8724,34 @@ | |
| ;; | |
| aix[4-9]*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 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. | |
| + # -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". | |
| 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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | |
| else | |
| - 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' | |
| + 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' | |
| 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 | |
| - # 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 | |
| + # need to do runtime linking. | |
| case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then | |
| + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); 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 | |
| @@ -9679,21 +8770,13 @@ | |
| hardcode_direct_absolute=yes | |
| hardcode_libdir_separator=':' | |
| link_all_deplibs=yes | |
| - 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 | |
| + file_list_spec='${wl}-f,' | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; 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 | |
| @@ -9712,48 +8795,35 @@ | |
| ;; | |
| esac | |
| shared_flag='-shared' | |
| - if test yes = "$aix_use_runtimelinking"; then | |
| - shared_flag="$shared_flag "'$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| + shared_flag="$shared_flag "'${wl}-G' | |
| fi | |
| - # 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 ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 yes = "$aix_use_runtimelinking"; then | |
| - shared_flag='$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; 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,yes = "$with_aix_soname,$aix_use_runtimelinking"; then | |
| + if test "$aix_use_runtimelinking" = yes; 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 set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath_+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| /* end confdefs.h. */ | |
| int | |
| @@ -9766,47 +8836,34 @@ | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath_"; then | |
| - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| 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 | |
| - fi | |
| - | |
| -fi | |
| - | |
| - aix_libpath=$lt_cv_aix_libpath_ | |
| -fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 -n "$allow_undefined_flag"; 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 "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | |
| else | |
| - if test ia64 = "$host_cpu"; then | |
| - hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' | |
| + if test "$host_cpu" = ia64; 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 set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath_+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| /* end confdefs.h. */ | |
| int | |
| @@ -9819,57 +8876,38 @@ | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath_"; then | |
| - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| 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 | |
| - fi | |
| - | |
| -fi | |
| - | |
| - aix_libpath=$lt_cv_aix_libpath_ | |
| -fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 yes = "$with_gnu_ld"; then | |
| + no_undefined_flag=' ${wl}-bernotok' | |
| + allow_undefined_flag=' ${wl}-berok' | |
| + if test "$with_gnu_ld" = yes; 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 | |
| - 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' | |
| + # 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' | |
| fi | |
| fi | |
| ;; | |
| @@ -9878,7 +8916,7 @@ | |
| 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) | |
| @@ -9898,65 +8936,20 @@ | |
| # Microsoft Visual C++. | |
| # hardcode_libdir_flag_spec is actually meaningless, as there is | |
| # no search path for DLLs. | |
| - case $cc_basename in | |
| - cl*) | |
| - # Native MSVC | |
| - hardcode_libdir_flag_spec=' ' | |
| - allow_undefined_flag=unsupported | |
| - always_export_symbols=yes | |
| - file_list_spec='@' | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - shrext_cmds=.dll | |
| - # FIXME: Setting linknames here is a bad hack. | |
| - 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 | |
| - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | |
| - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| - # 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' | |
| - ;; | |
| - *) | |
| - # Assume MSVC wrapper | |
| - hardcode_libdir_flag_spec=' ' | |
| - allow_undefined_flag=unsupported | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - 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. | |
| - old_archive_from_new_cmds='true' | |
| - # FIXME: Should let the user specify the lib program. | |
| - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| - enable_shared_with_static_runtimes=yes | |
| - ;; | |
| - esac | |
| + hardcode_libdir_flag_spec=' ' | |
| + allow_undefined_flag=unsupported | |
| + # Tell ltmain to make .lib files, not .a files. | |
| + libext=lib | |
| + # Tell ltmain to make .dll files, not .so files. | |
| + 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. | |
| + old_archive_from_new_cmds='true' | |
| + # FIXME: Should let the user specify the lib program. | |
| + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| + fix_srcfile_path='`cygpath -w "$srcfile"`' | |
| + enable_shared_with_static_runtimes=yes | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -9966,24 +8959,23 @@ | |
| hardcode_direct=no | |
| hardcode_automatic=yes | |
| hardcode_shlibpath_var=unsupported | |
| - 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\"`' | |
| - | |
| + 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\"`' | |
| 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*|nagfor*) _lt_dar_can_shared=yes ;; | |
| + ifort*) _lt_dar_can_shared=yes ;; | |
| *) _lt_dar_can_shared=$GCC ;; | |
| esac | |
| - if test yes = "$_lt_dar_can_shared"; then | |
| + if test "$_lt_dar_can_shared" = "yes"; 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 | |
| @@ -10018,40 +9010,41 @@ | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| freebsd* | dragonfly*) | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| hardcode_libdir_flag_spec='-R$libdir' | |
| hardcode_direct=yes | |
| hardcode_shlibpath_var=no | |
| ;; | |
| hpux9*) | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $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 "x$output_objdir/$soname" = "x$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 $output_objdir/$soname = $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 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' | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; then | |
| + archive_cmds='$CC -shared -fPIC ${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 no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | |
| + hardcode_libdir_flag_spec_ld='+b $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 | |
| @@ -10059,25 +9052,25 @@ | |
| ;; | |
| hpux11*) | |
| - if test yes,no = "$GCC,$with_gnu_ld"; then | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; 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 -fPIC ${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 -fPIC ${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' | |
| ;; | |
| *) | |
| @@ -10089,7 +9082,7 @@ | |
| $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 | |
| @@ -10108,14 +9101,14 @@ | |
| 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 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' | |
| +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' | |
| else | |
| archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | |
| fi | |
| @@ -10123,8 +9116,8 @@ | |
| ;; | |
| esac | |
| fi | |
| - if test no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | |
| hardcode_libdir_separator=: | |
| case $host_cpu in | |
| @@ -10135,7 +9128,7 @@ | |
| *) | |
| 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. | |
| @@ -10146,58 +9139,35 @@ | |
| ;; | |
| irix5* | irix6* | nonstopux*) | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds='$CC -shared $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. | |
| - # This should be the same for all languages, so no per-tag cache variable. | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | |
| -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | |
| -if test "${lt_cv_irix_exported_symbol+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - save_LDFLAGS=$LDFLAGS | |
| - LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" | |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| + 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; } | |
| +int foo(void) {} | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_cv_irix_exported_symbol=yes | |
| -else | |
| - lt_cv_irix_exported_symbol=no | |
| + archive_expsym_cmds='$CC -shared $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 | |
| rm -f core conftest.err conftest.$ac_objext \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| - 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 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 | |
| + LDFLAGS="$save_LDFLAGS" | |
| 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 | |
| ;; | |
| - 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 | |
| @@ -10212,7 +9182,7 @@ | |
| 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 | |
| ;; | |
| @@ -10220,19 +9190,27 @@ | |
| *nto* | *qnx*) | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| 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__`"; then | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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 | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - hardcode_libdir_flag_spec='$wl-rpath,$libdir' | |
| + 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 | |
| fi | |
| else | |
| ld_shlibs=no | |
| @@ -10243,53 +9221,33 @@ | |
| 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 | |
| + 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' | |
| ;; | |
| osf3*) | |
| - 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' | |
| + 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' | |
| 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 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' | |
| + if test "$GCC" = yes; then | |
| + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | |
| + archive_cmds='$CC -shared${allow_undefined_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' | |
| @@ -10300,24 +9258,24 @@ | |
| solaris*) | |
| no_undefined_flag=' -z defs' | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + wlarc='${wl}' | |
| + archive_cmds='$CC -shared ${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 ${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 | |
| @@ -10327,11 +9285,11 @@ | |
| 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 yes = "$GCC"; then | |
| - whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' | |
| + if test "$GCC" = yes; 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 | |
| @@ -10341,10 +9299,10 @@ | |
| ;; | |
| sunos4*) | |
| - if test sequent = "$host_vendor"; then | |
| + if test "x$host_vendor" = xsequent; 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 | |
| @@ -10393,43 +9351,43 @@ | |
| ;; | |
| 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 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' | |
| + 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' | |
| 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 CANNOT use -z defs as we might desire, because we do not | |
| + # Note: We can NOT 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 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' | |
| + 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' | |
| 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 | |
| ;; | |
| @@ -10444,10 +9402,10 @@ | |
| ;; | |
| esac | |
| - if test sni = "$host_vendor"; then | |
| + if test x$host_vendor = xsni; then | |
| case $host in | |
| sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | |
| - export_dynamic_flag_spec='$wl-Blargedynsym' | |
| + export_dynamic_flag_spec='${wl}-Blargedynsym' | |
| ;; | |
| esac | |
| fi | |
| @@ -10455,7 +9413,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 | |
| $as_echo "$ld_shlibs" >&6; } | |
| -test no = "$ld_shlibs" && can_build_shared=no | |
| +test "$ld_shlibs" = no && can_build_shared=no | |
| with_gnu_ld=$with_gnu_ld | |
| @@ -10481,7 +9439,7 @@ | |
| # Assume -lc should be added | |
| archive_cmds_need_lc=yes | |
| - if test yes,yes = "$GCC,$enable_shared"; then | |
| + if test "$enable_shared" = yes && test "$GCC" = yes; then | |
| case $archive_cmds in | |
| *'~'*) | |
| # FIXME: we may have to deal with multi-command sequences. | |
| @@ -10693,17 +9651,22 @@ | |
| + | |
| + | |
| + | |
| + | |
| + | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | |
| $as_echo_n "checking dynamic linker characteristics... " >&6; } | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; 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 | |
| @@ -10719,35 +9682,28 @@ | |
| ;; | |
| 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` | |
| - # ...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 | |
| + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` | |
| 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" | |
| - elif test -n "$lt_multi_os_dir"; then | |
| + 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 | |
| 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--; | |
| } | |
| @@ -10761,7 +9717,7 @@ | |
| # 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 | |
| @@ -10770,7 +9726,7 @@ | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| -shrext_cmds=.so | |
| +shrext_cmds=".so" | |
| postinstall_cmds= | |
| postuninstall_cmds= | |
| finish_cmds= | |
| @@ -10787,108 +9743,56 @@ | |
| # 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' | |
| + version_type=linux | |
| + 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]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| hardcode_into_libs=yes | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 | |
| - # 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 | |
| + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct | |
| # soname into executable. Probably we can add versioning support to | |
| # collect2, so additional links can be useful in future. | |
| - aix,yes) # traditional libtool | |
| - dynamic_linker='AIX unversionable lib.so' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| # 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' | |
| - ;; | |
| - aix,no) # traditional AIX only | |
| - dynamic_linker='AIX lib.a(lib.so.V)' | |
| + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | |
| + else | |
| # 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' | |
| - ;; | |
| - 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 | |
| + library_names_spec='${libname}${release}.a $libname.a' | |
| + soname_spec='${libname}${release}${shared_ext}$major' | |
| + fi | |
| shlibpath_var=LIBPATH | |
| fi | |
| ;; | |
| @@ -10898,27 +9802,27 @@ | |
| 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%'\''`; $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%'\''`; 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' | |
| ;; | |
| esac | |
| ;; | |
| beos*) | |
| - library_names_spec='$libname$shared_ext' | |
| + library_names_spec='${libname}${shared_ext}' | |
| dynamic_linker="$host_os ld.so" | |
| shlibpath_var=LIBRARY_PATH | |
| ;; | |
| bsdi[45]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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" | |
| @@ -10930,17 +9834,16 @@ | |
| cygwin* | mingw* | pw32* | cegcc*) | |
| version_type=windows | |
| - shrext_cmds=.dll | |
| + shrext_cmds=".dll" | |
| need_version=no | |
| need_lib_prefix=no | |
| - case $GCC,$cc_basename in | |
| - yes,*) | |
| - # gcc | |
| + case $GCC,$host_os in | |
| + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | |
| 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~ | |
| @@ -10956,84 +9859,26 @@ | |
| 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' | |
| - ;; | |
| - esac | |
| - dynamic_linker='Win32 ld.exe' | |
| - ;; | |
| - | |
| - *,cl*) | |
| - # Native MSVC | |
| - libname_spec='$name' | |
| - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' | |
| - library_names_spec='$libname.dll.lib' | |
| - | |
| - case $build_os in | |
| - mingw*) | |
| - sys_lib_search_path_spec= | |
| - lt_save_ifs=$IFS | |
| - IFS=';' | |
| - for lt_path in $LIB | |
| - do | |
| - IFS=$lt_save_ifs | |
| - # Let DOS variable expansion print the short 8.3 style file name. | |
| - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | |
| - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | |
| - done | |
| - IFS=$lt_save_ifs | |
| - # Convert to MSYS style. | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | |
| - ;; | |
| - cygwin*) | |
| - # Convert to unix form, then to dos form, then back to unix form | |
| - # but this time dos style (no spaces!) so that the unix form looks | |
| - # like /cygdrive/c/PROGRA~1:/cygdr... | |
| - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | |
| - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | |
| - 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 | |
| - 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'` | |
| - else | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| - fi | |
| - # FIXME: find the short name or the path components, as spaces are | |
| - # common. (e.g. "Program Files" -> "PROGRA~1") | |
| + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | |
| ;; | |
| 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'\''`~ | |
| - dldir=$destdir/`dirname \$dlpath`~ | |
| - test -d \$dldir || mkdir -p \$dldir~ | |
| - $install_prog $dir/$dlname \$dldir/$dlname' | |
| - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| - dlpath=$dir/\$dldll~ | |
| - $RM \$dlpath' | |
| - shlibpath_overrides_runpath=yes | |
| - dynamic_linker='Win32 link.exe' | |
| ;; | |
| *) | |
| - # Assume MSVC wrapper | |
| - library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' | |
| - dynamic_linker='Win32 ld.exe' | |
| + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | |
| ;; | |
| esac | |
| + dynamic_linker='Win32 ld.exe' | |
| # FIXME: first we should search . and the directory the executable is in | |
| shlibpath_var=PATH | |
| ;; | |
| @@ -11043,8 +9888,8 @@ | |
| 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`' | |
| @@ -11054,11 +9899,11 @@ | |
| ;; | |
| dgux*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| @@ -11076,13 +9921,12 @@ | |
| version_type=freebsd-$objformat | |
| case $version_type in | |
| freebsd-elf*) | |
| - 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} $libname${shared_ext}' | |
| 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 | |
| @@ -11107,16 +9951,26 @@ | |
| esac | |
| ;; | |
| +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 | |
| + hardcode_into_libs=yes | |
| + ;; | |
| + | |
| haiku*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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=no | |
| - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | |
| + shlibpath_overrides_runpath=yes | |
| + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -11133,15 +9987,14 @@ | |
| 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 32 = "$HPUX_IA64_MODE"; 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 "X$HPUX_IA64_MODE" = X32; 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' | |
| @@ -11149,8 +10002,8 @@ | |
| 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 | |
| ;; | |
| @@ -11159,8 +10012,8 @@ | |
| 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, ... | |
| @@ -11170,11 +10023,11 @@ | |
| ;; | |
| interix[3-9]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -11185,16 +10038,16 @@ | |
| case $host_os in | |
| nonstopux*) version_type=nonstopux ;; | |
| *) | |
| - if test yes = "$lt_cv_prog_gnu_ld"; then | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| + version_type=linux | |
| else | |
| version_type=irix | |
| fi ;; | |
| 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= | |
| @@ -11213,8 +10066,8 @@ | |
| 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 | |
| ;; | |
| @@ -11223,33 +10076,13 @@ | |
| 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 | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-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' | |
| + 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 | |
| @@ -11293,12 +10126,7 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # 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. | |
| + # Append ld.so.conf contents 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" | |
| @@ -11318,12 +10146,12 @@ | |
| 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 | |
| @@ -11332,8 +10160,8 @@ | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -11342,68 +10170,58 @@ | |
| 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* | bitrig*) | |
| +openbsd*) | |
| version_type=sunos | |
| - sys_lib_dlsearch_path_spec=/usr/lib | |
| + sys_lib_dlsearch_path_spec="/usr/lib" | |
| need_lib_prefix=no | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| - need_version=no | |
| - else | |
| - need_version=yes | |
| - fi | |
| - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' | |
| + # 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 | |
| - shlibpath_overrides_runpath=yes | |
| + 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 | |
| + else | |
| + shlibpath_overrides_runpath=yes | |
| + fi | |
| ;; | |
| os2*) | |
| libname_spec='$name' | |
| - version_type=windows | |
| - shrext_cmds=.dll | |
| - need_version=no | |
| + shrext_cmds=".dll" | |
| need_lib_prefix=no | |
| - # 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' | |
| + library_names_spec='$libname${shared_ext} $libname.a' | |
| dynamic_linker='OS/2 ld.exe' | |
| - 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' | |
| + shlibpath_var=LIBPATH | |
| ;; | |
| 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*) | |
| @@ -11411,11 +10229,11 @@ | |
| ;; | |
| solaris*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -11425,20 +10243,20 @@ | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| need_lib_prefix=no | |
| fi | |
| need_version=yes | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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) | |
| @@ -11459,24 +10277,24 @@ | |
| ;; | |
| sysv4*MP*) | |
| - 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' | |
| + if test -d /usr/nec ;then | |
| + version_type=linux | |
| + 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=sco | |
| + version_type=freebsd-elf | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; 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' | |
| @@ -11491,19 +10309,19 @@ | |
| tpf*) | |
| # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -11513,35 +10331,20 @@ | |
| esac | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 | |
| $as_echo "$dynamic_linker" >&6; } | |
| -test no = "$dynamic_linker" && can_build_shared=no | |
| +test "$dynamic_linker" = no && can_build_shared=no | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then | |
| - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| fi | |
| - | |
| -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then | |
| - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = 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 | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| @@ -11638,15 +10441,15 @@ | |
| hardcode_action= | |
| if test -n "$hardcode_libdir_flag_spec" || | |
| test -n "$runpath_var" || | |
| - test yes = "$hardcode_automatic"; then | |
| + test "X$hardcode_automatic" = "Xyes" ; then | |
| # We can hardcode non-existent directories. | |
| - if test no != "$hardcode_direct" && | |
| + if test "$hardcode_direct" != no && | |
| # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && | |
| - test no != "$hardcode_minus_L"; then | |
| + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && | |
| + test "$hardcode_minus_L" != no; then | |
| # Linking always hardcodes the temporary library directory. | |
| hardcode_action=relink | |
| else | |
| @@ -11661,12 +10464,12 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 | |
| $as_echo "$hardcode_action" >&6; } | |
| -if test relink = "$hardcode_action" || | |
| - test yes = "$inherit_rpath"; then | |
| +if test "$hardcode_action" = relink || | |
| + test "$inherit_rpath" = yes; then | |
| # Fast installation is not supported | |
| enable_fast_install=no | |
| -elif test yes = "$shlibpath_overrides_runpath" || | |
| - test no = "$enable_shared"; then | |
| +elif test "$shlibpath_overrides_runpath" = yes || | |
| + test "$enable_shared" = no; then | |
| # Fast installation is not necessary | |
| enable_fast_install=needless | |
| fi | |
| @@ -11676,7 +10479,7 @@ | |
| - if test yes != "$enable_dlopen"; then | |
| + if test "x$enable_dlopen" != xyes; then | |
| enable_dlopen=unknown | |
| enable_dlopen_self=unknown | |
| enable_dlopen_self_static=unknown | |
| @@ -11686,23 +10489,23 @@ | |
| 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 test "${ac_cv_lib_dl_dlopen+set}" = set; then : | |
| @@ -11740,10 +10543,10 @@ | |
| { $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" = x""yes; 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 | |
| @@ -11751,18 +10554,10 @@ | |
| ;; | |
| - 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" = x""yes; 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; } | |
| @@ -11801,11 +10596,11 @@ | |
| { $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" = x""yes; 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" = x""yes; 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; } | |
| @@ -11844,7 +10639,7 @@ | |
| { $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" = x""yes; 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; } | |
| @@ -11883,7 +10678,7 @@ | |
| { $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" = x""yes; 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; } | |
| @@ -11922,7 +10717,7 @@ | |
| { $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" = x""yes; then : | |
| - lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld | |
| + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" | |
| fi | |
| @@ -11943,21 +10738,21 @@ | |
| ;; | |
| esac | |
| - if test no = "$lt_cv_dlopen"; then | |
| - enable_dlopen=no | |
| - else | |
| + if test "x$lt_cv_dlopen" != xno; then | |
| enable_dlopen=yes | |
| + else | |
| + enable_dlopen=no | |
| fi | |
| case $lt_cv_dlopen in | |
| dlopen) | |
| - save_CPPFLAGS=$CPPFLAGS | |
| - test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" | |
| + save_CPPFLAGS="$CPPFLAGS" | |
| + test "x$ac_cv_header_dlfcn_h" = xyes && 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 | |
| @@ -11965,13 +10760,13 @@ | |
| if test "${lt_cv_dlopen_self+set}" = set; then : | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| - if test yes = "$cross_compiling"; then : | |
| + if test "$cross_compiling" = yes; then : | |
| lt_cv_dlopen_self=cross | |
| else | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<_LT_EOF | |
| -#line $LINENO "configure" | |
| +#line 10769 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -12012,13 +10807,13 @@ | |
| # endif | |
| #endif | |
| -/* When -fvisibility=hidden is used, assume the code has been annotated | |
| +/* When -fvisbility=hidden is used, assume the code has been annotated | |
| correspondingly for the symbols needed. */ | |
| -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| -int fnord () __attribute__((visibility("default"))); | |
| +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| +void fnord () __attribute__((visibility("default"))); | |
| #endif | |
| -int fnord () { return 42; } | |
| +void fnord () { int i=42; } | |
| int main () | |
| { | |
| void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | |
| @@ -12044,7 +10839,7 @@ | |
| (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 | |
| @@ -12064,20 +10859,20 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 | |
| $as_echo "$lt_cv_dlopen_self" >&6; } | |
| - if test yes = "$lt_cv_dlopen_self"; then | |
| + if test "x$lt_cv_dlopen_self" = xyes; 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 test "${lt_cv_dlopen_self_static+set}" = set; then : | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| - if test yes = "$cross_compiling"; then : | |
| + if test "$cross_compiling" = yes; then : | |
| lt_cv_dlopen_self_static=cross | |
| else | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<_LT_EOF | |
| -#line $LINENO "configure" | |
| +#line 10875 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -12118,13 +10913,13 @@ | |
| # endif | |
| #endif | |
| -/* When -fvisibility=hidden is used, assume the code has been annotated | |
| +/* When -fvisbility=hidden is used, assume the code has been annotated | |
| correspondingly for the symbols needed. */ | |
| -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| -int fnord () __attribute__((visibility("default"))); | |
| +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| +void fnord () __attribute__((visibility("default"))); | |
| #endif | |
| -int fnord () { return 42; } | |
| +void fnord () { int i=42; } | |
| int main () | |
| { | |
| void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | |
| @@ -12150,7 +10945,7 @@ | |
| (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 | |
| @@ -12171,9 +10966,9 @@ | |
| $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 | |
| @@ -12217,7 +11012,7 @@ | |
| # 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 | |
| @@ -12245,7 +11040,7 @@ | |
| - # Report what library types will actually be built | |
| + # Report which 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 | |
| @@ -12253,13 +11048,13 @@ | |
| { $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 no = "$can_build_shared" && enable_shared=no | |
| + test "$can_build_shared" = "no" && 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 yes = "$enable_shared" && enable_static=no | |
| + test "$enable_shared" = yes && enable_static=no | |
| if test -n "$RANLIB"; then | |
| archive_cmds="$archive_cmds~\$RANLIB \$lib" | |
| postinstall_cmds='$RANLIB $lib' | |
| @@ -12267,12 +11062,8 @@ | |
| ;; | |
| aix[4-9]*) | |
| - 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 | |
| + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| + test "$enable_shared" = yes && enable_static=no | |
| fi | |
| ;; | |
| esac | |
| @@ -12282,7 +11073,7 @@ | |
| { $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 yes = "$enable_shared" || enable_static=yes | |
| + test "$enable_shared" = yes || enable_static=yes | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 | |
| $as_echo "$enable_static" >&6; } | |
| @@ -12296,9 +11087,7 @@ | |
| 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" | |
| @@ -14725,10 +13514,8 @@ | |
| 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"`' | |
| host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' | |
| host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' | |
| host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' | |
| @@ -14749,20 +13536,13 @@ | |
| lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | |
| lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | |
| lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | |
| -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | |
| -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | |
| reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | |
| reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | |
| OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | |
| deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | |
| file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | |
| -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | |
| -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | |
| -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | |
| -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | |
| AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | |
| AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | |
| -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | |
| STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | |
| RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | |
| old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | |
| @@ -14775,22 +13555,16 @@ | |
| 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"`' | |
| -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | |
| +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | |
| lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | |
| need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | |
| -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | |
| DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | |
| NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | |
| LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | |
| @@ -14814,6 +13588,7 @@ | |
| allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' | |
| no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' | |
| +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' | |
| @@ -14822,12 +13597,12 @@ | |
| hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | |
| inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | |
| link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | |
| +fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | |
| always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | |
| export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | |
| exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | |
| include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | |
| prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | |
| -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | |
| file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | |
| variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | |
| need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | |
| @@ -14846,8 +13621,7 @@ | |
| 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"`' | |
| -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"`' | |
| +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $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"`' | |
| @@ -14870,7 +13644,6 @@ | |
| # Quote evaled strings. | |
| for var in SHELL \ | |
| ECHO \ | |
| -PATH_SEPARATOR \ | |
| SED \ | |
| GREP \ | |
| EGREP \ | |
| @@ -14884,13 +13657,8 @@ | |
| OBJDUMP \ | |
| deplibs_check_method \ | |
| file_magic_cmd \ | |
| -file_magic_glob \ | |
| -want_nocaseglob \ | |
| -DLLTOOL \ | |
| -sharedlib_from_linklib_cmd \ | |
| AR \ | |
| AR_FLAGS \ | |
| -archiver_list_spec \ | |
| STRIP \ | |
| RANLIB \ | |
| CC \ | |
| @@ -14898,19 +13666,14 @@ | |
| 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 \ | |
| +lt_prog_compiler_pic \ | |
| lt_prog_compiler_static \ | |
| lt_cv_prog_compiler_c_o \ | |
| need_locks \ | |
| -MANIFEST_TOOL \ | |
| DSYMUTIL \ | |
| NMEDIT \ | |
| LIPO \ | |
| @@ -14924,7 +13687,9 @@ | |
| allow_undefined_flag \ | |
| no_undefined_flag \ | |
| hardcode_libdir_flag_spec \ | |
| +hardcode_libdir_flag_spec_ld \ | |
| hardcode_libdir_separator \ | |
| +fix_srcfile_path \ | |
| exclude_expsyms \ | |
| include_expsyms \ | |
| file_list_spec \ | |
| @@ -14938,7 +13703,7 @@ | |
| striplib; do | |
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | |
| *[\\\\\\\`\\"\\\$]*) | |
| - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes | |
| + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | |
| ;; | |
| *) | |
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | |
| @@ -14960,16 +13725,14 @@ | |
| module_expsym_cmds \ | |
| export_symbols_cmds \ | |
| prelink_cmds \ | |
| -postlink_cmds \ | |
| postinstall_cmds \ | |
| postuninstall_cmds \ | |
| finish_cmds \ | |
| sys_lib_search_path_spec \ | |
| -configure_time_dlsearch_path \ | |
| -configure_time_lt_sys_library_path; do | |
| +sys_lib_dlsearch_path_spec; do | |
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | |
| *[\\\\\\\`\\"\\\$]*) | |
| - 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=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | |
| ;; | |
| *) | |
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | |
| @@ -14978,16 +13741,19 @@ | |
| 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 that allow our | |
| +# See if we are running on zsh, and set the options which 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' | |
| @@ -15736,53 +14502,54 @@ | |
| ;; | |
| "libtool":C) | |
| - # See if we are running on zsh, and set the options that allow our | |
| + # See if we are running on zsh, and set the options which 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 | |
| -# Generated automatically by $as_me ($PACKAGE) $VERSION | |
| + | |
| +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. | |
| +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $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. | |
| # | |
| -# 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. | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | |
| +# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | |
| +# Written by Gordon Matzigkeit, 1996 | |
| +# | |
| +# This file is part of GNU Libtool. | |
| # | |
| -# 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 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. | |
| +# | |
| +# 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 this program. If not, see <http://www.gnu.org/licenses/>. | |
| +# 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. | |
| # The names of the tagged configurations supported by this script. | |
| -available_tags='' | |
| - | |
| -# Configured defaults for sys_lib_dlsearch_path munging. | |
| -: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} | |
| +available_tags="" | |
| # ### BEGIN LIBTOOL CONFIG | |
| @@ -15802,18 +14569,12 @@ | |
| # 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 | |
| # An echo program that protects backslashes. | |
| ECHO=$lt_ECHO | |
| -# The PATH separator for the build system. | |
| -PATH_SEPARATOR=$lt_PATH_SEPARATOR | |
| - | |
| # The host system. | |
| host_alias=$host_alias | |
| host=$host | |
| @@ -15863,42 +14624,19 @@ | |
| # turn newlines into spaces. | |
| NL2SP=$lt_lt_NL2SP | |
| -# convert \$build file names to \$host format. | |
| -to_host_file_cmd=$lt_cv_to_host_file_cmd | |
| - | |
| -# convert \$build files to toolchain format. | |
| -to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
| - | |
| # An object symbol dumper. | |
| OBJDUMP=$lt_OBJDUMP | |
| # Method to check whether dependent libraries are shared objects. | |
| deplibs_check_method=$lt_deplibs_check_method | |
| -# Command to use when deplibs_check_method = "file_magic". | |
| +# Command to use when deplibs_check_method == "file_magic". | |
| file_magic_cmd=$lt_file_magic_cmd | |
| -# How to find potential files when deplibs_check_method = "file_magic". | |
| -file_magic_glob=$lt_file_magic_glob | |
| - | |
| -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | |
| -want_nocaseglob=$lt_want_nocaseglob | |
| - | |
| -# DLL creation program. | |
| -DLLTOOL=$lt_DLLTOOL | |
| - | |
| -# Command to associate shared and link libraries. | |
| -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | |
| - | |
| # The archiver. | |
| AR=$lt_AR | |
| - | |
| -# Flags to create an archive. | |
| AR_FLAGS=$lt_AR_FLAGS | |
| -# How to feed a file listing to the archiver. | |
| -archiver_list_spec=$lt_archiver_list_spec | |
| - | |
| # A symbol stripping program. | |
| STRIP=$lt_STRIP | |
| @@ -15922,27 +14660,12 @@ | |
| # 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 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 | |
| @@ -15952,9 +14675,6 @@ | |
| # Must we lock files when doing compilation? | |
| need_locks=$lt_need_locks | |
| -# Manifest tool. | |
| -MANIFEST_TOOL=$lt_MANIFEST_TOOL | |
| - | |
| # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | |
| DSYMUTIL=$lt_DSYMUTIL | |
| @@ -16033,11 +14753,8 @@ | |
| # Compile-time system search path for libraries. | |
| sys_lib_search_path_spec=$lt_sys_lib_search_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 | |
| +# Run-time system search path for libraries. | |
| +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Whether dlopen is supported. | |
| dlopen_support=$enable_dlopen | |
| @@ -16072,12 +14789,12 @@ | |
| # Compiler flag to turn off builtin functions. | |
| no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | |
| -# Additional compiler flags for building library objects. | |
| -pic_flag=$lt_lt_prog_compiler_pic | |
| - | |
| # How to pass a linker flag through the compiler. | |
| wl=$lt_lt_prog_compiler_wl | |
| +# Additional compiler flags for building library objects. | |
| +pic_flag=$lt_lt_prog_compiler_pic | |
| + | |
| # Compiler flag to prevent dynamic linking. | |
| link_static_flag=$lt_lt_prog_compiler_static | |
| @@ -16127,16 +14844,20 @@ | |
| # This must work even if \$libdir does not exist | |
| hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec | |
| +# If ld is used when linking, flag to hardcode \$libdir into a binary | |
| +# during linking. This must work even if \$libdir does not exist. | |
| +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld | |
| + | |
| # 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 | |
| @@ -16160,6 +14881,9 @@ | |
| # Whether libtool must link a program against all its dependency libraries. | |
| link_all_deplibs=$link_all_deplibs | |
| +# Fix the shell variable \$srcfile for the compiler. | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| + | |
| # Set to "yes" if exported symbols are required. | |
| always_export_symbols=$always_export_symbols | |
| @@ -16175,9 +14899,6 @@ | |
| # Commands necessary for linking programs (against libraries) with templates. | |
| prelink_cmds=$lt_prelink_cmds | |
| -# Commands necessary for finishing linking programs. | |
| -postlink_cmds=$lt_postlink_cmds | |
| - | |
| # Specify filename containing input files. | |
| file_list_spec=$lt_file_list_spec | |
| @@ -16188,72 +14909,13 @@ | |
| _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 | |
| aix3*) | |
| cat <<\_LT_EOF >> "$cfgfile" | |
| # 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 set != "${COLLECT_NAMES+set}"; then | |
| +if test "X${COLLECT_NAMES+set}" != Xset; then | |
| COLLECT_NAMES= | |
| export COLLECT_NAMES | |
| fi | |
| @@ -16262,17 +14924,217 @@ | |
| 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 | |
| # if finds mixed CR/LF and LF-only lines. Since sed operates in | |
| # text mode, it properly converts lines to CR/LF. This bash problem | |
| # is reportedly fixed, but why not run on old versions too? | |
| - sed '$q' "$ltmain" >> "$cfgfile" \ | |
| - || (rm -f "$cfgfile"; exit 1) | |
| + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | |
| + || (rm -f "$cfgfile"; exit 1) | |
| + | |
| + case $xsi_shell in | |
| + yes) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_dirname file append nondir_replacement | |
| +# Compute the dirname of FILE. If nonempty, add APPEND to the result, | |
| +# otherwise set result to NONDIR_REPLACEMENT. | |
| +func_dirname () | |
| +{ | |
| + case ${1} in | |
| + */*) func_dirname_result="${1%/*}${2}" ;; | |
| + * ) func_dirname_result="${3}" ;; | |
| + esac | |
| +} | |
| + | |
| +# func_basename file | |
| +func_basename () | |
| +{ | |
| + func_basename_result="${1##*/}" | |
| +} | |
| + | |
| +# func_dirname_and_basename file append nondir_replacement | |
| +# perform func_basename and func_dirname in a single function | |
| +# call: | |
| +# dirname: Compute the dirname of FILE. If nonempty, | |
| +# add APPEND to the result, otherwise set result | |
| +# to NONDIR_REPLACEMENT. | |
| +# value returned in "$func_dirname_result" | |
| +# basename: Compute filename of FILE. | |
| +# value retuned in "$func_basename_result" | |
| +# Implementation must be kept synchronized with func_dirname | |
| +# and func_basename. For efficiency, we do not delegate to | |
| +# those functions but instead duplicate the functionality here. | |
| +func_dirname_and_basename () | |
| +{ | |
| + case ${1} in | |
| + */*) func_dirname_result="${1%/*}${2}" ;; | |
| + * ) func_dirname_result="${3}" ;; | |
| + esac | |
| + func_basename_result="${1##*/}" | |
| +} | |
| + | |
| +# func_stripname prefix suffix name | |
| +# strip PREFIX and SUFFIX off of NAME. | |
| +# PREFIX and SUFFIX must not contain globbing or regex special | |
| +# characters, hashes, percent signs, but SUFFIX may contain a leading | |
| +# dot (in which case that matches only a dot). | |
| +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}"} | |
| +} | |
| + | |
| +# func_opt_split | |
| +func_opt_split () | |
| +{ | |
| + func_opt_split_opt=${1%%=*} | |
| + func_opt_split_arg=${1#*=} | |
| +} | |
| + | |
| +# func_lo2o object | |
| +func_lo2o () | |
| +{ | |
| + case ${1} in | |
| + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | |
| + *) func_lo2o_result=${1} ;; | |
| + esac | |
| +} | |
| + | |
| +# func_xform libobj-or-source | |
| +func_xform () | |
| +{ | |
| + func_xform_result=${1%.*}.lo | |
| +} | |
| + | |
| +# func_arith arithmetic-term... | |
| +func_arith () | |
| +{ | |
| + func_arith_result=$(( $* )) | |
| +} | |
| + | |
| +# func_len string | |
| +# STRING may not start with a hyphen. | |
| +func_len () | |
| +{ | |
| + func_len_result=${#1} | |
| +} | |
| + | |
| +_LT_EOF | |
| + ;; | |
| + *) # Bourne compatible functions. | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_dirname file append nondir_replacement | |
| +# Compute the dirname of FILE. If nonempty, add APPEND to the result, | |
| +# otherwise set result to NONDIR_REPLACEMENT. | |
| +func_dirname () | |
| +{ | |
| + # Extract subdirectory from the argument. | |
| + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | |
| + if test "X$func_dirname_result" = "X${1}"; then | |
| + func_dirname_result="${3}" | |
| + else | |
| + func_dirname_result="$func_dirname_result${2}" | |
| + fi | |
| +} | |
| + | |
| +# func_basename file | |
| +func_basename () | |
| +{ | |
| + func_basename_result=`$ECHO "${1}" | $SED "$basename"` | |
| +} | |
| + | |
| + | |
| +# func_stripname prefix suffix name | |
| +# strip PREFIX and SUFFIX off of NAME. | |
| +# PREFIX and SUFFIX must not contain globbing or regex special | |
| +# characters, hashes, percent signs, but SUFFIX may contain a leading | |
| +# dot (in which case that matches only a dot). | |
| +# func_strip_suffix prefix name | |
| +func_stripname () | |
| +{ | |
| + case ${2} in | |
| + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | |
| + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | |
| + esac | |
| +} | |
| + | |
| +# sed scripts: | |
| +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | |
| +my_sed_long_arg='1s/^-[^=]*=//' | |
| + | |
| +# func_opt_split | |
| +func_opt_split () | |
| +{ | |
| + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | |
| + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | |
| +} | |
| + | |
| +# func_lo2o object | |
| +func_lo2o () | |
| +{ | |
| + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | |
| +} | |
| + | |
| +# func_xform libobj-or-source | |
| +func_xform () | |
| +{ | |
| + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | |
| +} | |
| + | |
| +# func_arith arithmetic-term... | |
| +func_arith () | |
| +{ | |
| + func_arith_result=`expr "$@"` | |
| +} | |
| + | |
| +# func_len string | |
| +# STRING may not start with a hyphen. | |
| +func_len () | |
| +{ | |
| + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | |
| +} | |
| + | |
| +_LT_EOF | |
| +esac | |
| + | |
| +case $lt_shell_append in | |
| + yes) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_append var value | |
| +# Append VALUE to the end of shell variable VAR. | |
| +func_append () | |
| +{ | |
| + eval "$1+=\$2" | |
| +} | |
| +_LT_EOF | |
| + ;; | |
| + *) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_append var value | |
| +# Append VALUE to the end of shell variable VAR. | |
| +func_append () | |
| +{ | |
| + eval "$1=\$$1\$2" | |
| +} | |
| + | |
| +_LT_EOF | |
| + ;; | |
| + esac | |
| + | |
| + | |
| + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | |
| + || (rm -f "$cfgfile"; exit 1) | |
| - mv -f "$cfgfile" "$ofile" || | |
| + mv -f "$cfgfile" "$ofile" || | |
| (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | |
| chmod +x "$ofile" | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libgcc/config.host orig/gcc-4.7.0/libgcc/config.host | |
| --- ./gcc-4.7.0/libgcc/config.host 2015-10-18 04:17:48.540214942 -0400 | |
| +++ orig/gcc-4.7.0/libgcc/config.host 2012-02-20 16:19:55.000000000 -0500 | |
| @@ -507,10 +507,6 @@ | |
| extra_parts="libgcc_stub.a" | |
| md_unwind_header=pa/hpux-unwind.h | |
| ;; | |
| -i[34567]86-*-apertureos*) | |
| - extra_parts="$extra_parts crtbegin.o crtend.o" | |
| - tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic" | |
| - ;; | |
| i[34567]86-*-darwin*) | |
| tmake_file="$tmake_file i386/t-crtpc i386/t-crtfm" | |
| tm_file="$tm_file i386/darwin-lib.h" | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libgcc/crtstuff.c orig/gcc-4.7.0/libgcc/crtstuff.c | |
| --- ./gcc-4.7.0/libgcc/crtstuff.c 2015-10-18 22:20:25.594684952 -0400 | |
| +++ orig/gcc-4.7.0/libgcc/crtstuff.c 2011-12-06 16:35:41.000000000 -0500 | |
| @@ -69,19 +69,15 @@ | |
| # define FORCE_CODE_SECTION_ALIGN | |
| #endif | |
| -#ifdef CRT_CALL_STATIC_FUNCTION | |
| -#undef CRT_CALL_STATIC_FUNCTION | |
| -#endif | |
| - | |
| #ifndef CRT_CALL_STATIC_FUNCTION | |
| # define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC) \ | |
| static void __attribute__((__used__)) \ | |
| -call_##FUNC (void) \ | |
| +call_ ## FUNC (void) \ | |
| { \ | |
| - __asm__ (SECTION_OP); \ | |
| + asm (SECTION_OP); \ | |
| FUNC (); \ | |
| FORCE_CODE_SECTION_ALIGN \ | |
| - __asm__ (TEXT_SECTION_ASM_OP); \ | |
| + asm (TEXT_SECTION_ASM_OP); \ | |
| } | |
| #endif | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libgfortran/configure orig/gcc-4.7.0/libgfortran/configure | |
| --- ./gcc-4.7.0/libgfortran/configure 2015-10-18 20:14:38.541649988 -0400 | |
| +++ orig/gcc-4.7.0/libgfortran/configure 2012-03-22 03:37:39.000000000 -0400 | |
| @@ -619,15 +619,11 @@ | |
| enable_static | |
| enable_shared | |
| lt_host_flags | |
| -LT_SYS_LIBRARY_PATH | |
| OTOOL64 | |
| OTOOL | |
| LIPO | |
| NMEDIT | |
| DSYMUTIL | |
| -MANIFEST_TOOL | |
| -ac_ct_AR | |
| -DLLTOOL | |
| OBJDUMP | |
| LN_S | |
| NM | |
| @@ -769,9 +765,7 @@ | |
| enable_static | |
| with_pic | |
| enable_fast_install | |
| -with_aix_soname | |
| with_gnu_ld | |
| -with_sysroot | |
| enable_libtool_lock | |
| enable_largefile | |
| enable_libquadmath_support | |
| @@ -786,7 +780,6 @@ | |
| LIBS | |
| CPPFLAGS | |
| CPP | |
| -LT_SYS_LIBRARY_PATH | |
| FC | |
| FCFLAGS' | |
| @@ -1432,14 +1425,9 @@ | |
| --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | |
| --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | |
| --with-build-libsubdir=DIR Directory where to find libraries for build system | |
| - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | |
| + --with-pic 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-system-libunwind use installed libunwind | |
| Some influential environment variables: | |
| @@ -1451,8 +1439,6 @@ | |
| CPPFLAGS C/C++/Objective 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. | |
| FC Fortran compiler command | |
| FCFLAGS Fortran compiler flags | |
| @@ -6249,8 +6235,8 @@ | |
| -macro_version='2.4.6' | |
| -macro_revision='2.4.6' | |
| +macro_version='2.2.7a' | |
| +macro_revision='1.3134' | |
| @@ -6264,7 +6250,7 @@ | |
| -ltmain=$ac_aux_dir/ltmain.sh | |
| +ltmain="$ac_aux_dir/ltmain.sh" | |
| # Backslashify metacharacters that are still active within | |
| # double-quoted strings. | |
| @@ -6290,7 +6276,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | |
| $as_echo_n "checking how to print strings... " >&6; } | |
| # Test print first, because it will be a builtin if present. | |
| -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | |
| +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | |
| test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| ECHO='print -r --' | |
| elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| @@ -6313,7 +6299,7 @@ | |
| $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 | |
| @@ -6506,19 +6492,19 @@ | |
| # Check whether --with-gnu-ld was given. | |
| if test "${with_gnu_ld+set}" = set; then : | |
| - withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes | |
| + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | |
| else | |
| with_gnu_ld=no | |
| fi | |
| ac_prog=ld | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; 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` ;; | |
| @@ -6532,7 +6518,7 @@ | |
| 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. | |
| @@ -6543,7 +6529,7 @@ | |
| with_gnu_ld=unknown | |
| ;; | |
| esac | |
| -elif test yes = "$with_gnu_ld"; then | |
| +elif test "$with_gnu_ld" = yes; then | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 | |
| $as_echo_n "checking for GNU ld... " >&6; } | |
| else | |
| @@ -6554,32 +6540,32 @@ | |
| $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 no != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != no && break | |
| ;; | |
| *) | |
| - test yes != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != yes && 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; } | |
| @@ -6622,38 +6608,33 @@ | |
| 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 | |
| - # 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'*) | |
| + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in | |
| + */dev/null* | *'Invalid file or object type'*) | |
| lt_cv_path_NM="$tmp_nm -B" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in | |
| */dev/null*) | |
| lt_cv_path_NM="$tmp_nm -p" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but | |
| @@ -6664,15 +6645,15 @@ | |
| 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 no != "$lt_cv_path_NM"; then | |
| - NM=$lt_cv_path_NM | |
| +if test "$lt_cv_path_NM" != "no"; then | |
| + NM="$lt_cv_path_NM" | |
| else | |
| # Didn't find any BSD compatible name lister, look for dumpbin. | |
| if test -n "$DUMPBIN"; then : | |
| @@ -6778,9 +6759,9 @@ | |
| fi | |
| fi | |
| - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in | |
| + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | |
| *COFF*) | |
| - DUMPBIN="$DUMPBIN -symbols -headers" | |
| + DUMPBIN="$DUMPBIN -symbols" | |
| ;; | |
| *) | |
| DUMPBIN=: | |
| @@ -6788,8 +6769,8 @@ | |
| esac | |
| fi | |
| - if test : != "$DUMPBIN"; then | |
| - NM=$DUMPBIN | |
| + if test "$DUMPBIN" != ":"; then | |
| + NM="$DUMPBIN" | |
| fi | |
| fi | |
| test -z "$NM" && NM=nm | |
| @@ -6840,7 +6821,7 @@ | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| i=0 | |
| - teststring=ABCD | |
| + teststring="ABCD" | |
| case $build_os in | |
| msdosdjgpp*) | |
| @@ -6880,7 +6861,7 @@ | |
| lt_cv_sys_max_cmd_len=8192; | |
| ;; | |
| - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) | |
| + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) | |
| # 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` | |
| @@ -6899,11 +6880,6 @@ | |
| lt_cv_sys_max_cmd_len=196608 | |
| ;; | |
| - os2*) | |
| - # The test takes a long time on OS/2. | |
| - lt_cv_sys_max_cmd_len=8192 | |
| - ;; | |
| - | |
| osf*) | |
| # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | |
| # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | |
| @@ -6930,23 +6906,22 @@ | |
| ;; | |
| *) | |
| 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 | |
| + if test -n "$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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | |
| = "X$teststring$teststring"; } >/dev/null 2>&1 && | |
| - test 17 != "$i" # 1/2 MB should be enough | |
| + test $i != 17 # 1/2 MB should be enough | |
| do | |
| i=`expr $i + 1` | |
| teststring=$teststring$teststring | |
| @@ -6964,7 +6939,7 @@ | |
| 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 | |
| @@ -6982,6 +6957,30 @@ | |
| : ${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"}, \ | |
| + = c,a/b,, \ | |
| + && 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 | |
| @@ -7013,80 +7012,6 @@ | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | |
| -if test "${lt_cv_to_host_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| - *-*-cygwin* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | |
| - ;; | |
| - esac | |
| - ;; | |
| - * ) # unhandled hosts (and "normal" native builds) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_host_file_cmd=$lt_cv_to_host_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_host_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | |
| -if test "${lt_cv_to_tool_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - #assume ordinary cross tools, or native build. | |
| -lt_cv_to_tool_file_cmd=func_convert_file_noop | |
| -case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | |
| $as_echo_n "checking for $LD option to reload object files... " >&6; } | |
| if test "${lt_cv_ld_reload_flag+set}" = set; then : | |
| @@ -7103,14 +7028,9 @@ | |
| esac | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| case $host_os in | |
| - cygwin* | mingw* | pw32* | cegcc*) | |
| - if test yes != "$GCC"; then | |
| - reload_cmds=false | |
| - fi | |
| - ;; | |
| darwin*) | |
| - if test yes = "$GCC"; then | |
| - reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' | |
| + if test "$GCC" = yes; then | |
| + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | |
| else | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| fi | |
| @@ -7238,13 +7158,13 @@ | |
| # 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 | |
| -# 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. | |
| +# 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. | |
| case $host_os in | |
| aix[4-9]*) | |
| @@ -7271,12 +7191,12 @@ | |
| # 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. | |
| - if ( file / ) >/dev/null 2>&1; then | |
| + # 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 | |
| lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | |
| lt_cv_file_magic_cmd='func_win32_libid' | |
| else | |
| - # Keep this pattern in sync with the one in func_win32_libid. | |
| - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | |
| + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| fi | |
| ;; | |
| @@ -7307,6 +7227,10 @@ | |
| fi | |
| ;; | |
| +gnu*) | |
| + lt_cv_deplibs_check_method=pass_all | |
| + ;; | |
| + | |
| haiku*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -7344,8 +7268,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -# This must be glibc/ELF. | |
| -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-gnu) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -7367,8 +7291,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -openbsd* | bitrig*) | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| +openbsd*) | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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)$' | |
| @@ -7421,29 +7345,11 @@ | |
| tpf*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -os2*) | |
| - lt_cv_deplibs_check_method=pass_all | |
| - ;; | |
| esac | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | |
| $as_echo "$lt_cv_deplibs_check_method" >&6; } | |
| - | |
| -file_magic_glob= | |
| -want_nocaseglob=no | |
| -if test "$build" = "$host"; then | |
| - case $host_os in | |
| - mingw* | pw32*) | |
| - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | |
| - want_nocaseglob=yes | |
| - else | |
| - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | |
| - fi | |
| - ;; | |
| - esac | |
| -fi | |
| - | |
| file_magic_cmd=$lt_cv_file_magic_cmd | |
| deplibs_check_method=$lt_cv_deplibs_check_method | |
| test -z "$deplibs_check_method" && deplibs_check_method=unknown | |
| @@ -7459,162 +7365,9 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -if test -n "$ac_tool_prefix"; then | |
| - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | |
| -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$DLLTOOL"; then | |
| - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -DLLTOOL=$ac_cv_prog_DLLTOOL | |
| -if test -n "$DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | |
| -$as_echo "$DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_DLLTOOL"; then | |
| - ac_ct_DLLTOOL=$DLLTOOL | |
| - # Extract the first word of "dlltool", so it can be a program name with args. | |
| -set dummy dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_DLLTOOL"; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | |
| -if test -n "$ac_ct_DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | |
| -$as_echo "$ac_ct_DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_DLLTOOL" = x; then | |
| - DLLTOOL="false" | |
| - else | |
| - case $cross_compiling:$ac_tool_warned in | |
| -yes:) | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | |
| -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
| -ac_tool_warned=yes ;; | |
| -esac | |
| - DLLTOOL=$ac_ct_DLLTOOL | |
| - fi | |
| -else | |
| - DLLTOOL="$ac_cv_prog_DLLTOOL" | |
| -fi | |
| - | |
| -test -z "$DLLTOOL" && DLLTOOL=dlltool | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | |
| -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | |
| -if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_sharedlib_from_linklib_cmd='unknown' | |
| - | |
| -case $host_os in | |
| -cygwin* | mingw* | pw32* | cegcc*) | |
| - # 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 | |
| - ;; | |
| - *) | |
| - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | |
| - ;; | |
| - esac | |
| - ;; | |
| -*) | |
| - # fallback: assume linklib IS sharedlib | |
| - lt_cv_sharedlib_from_linklib_cmd=$ECHO | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | |
| -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | |
| -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | |
| -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in ar | |
| - do | |
| - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | |
| +set dummy ${ac_tool_prefix}ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_AR+set}" = set; then : | |
| @@ -7630,7 +7383,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | |
| + ac_cv_prog_AR="${ac_tool_prefix}ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -7650,15 +7403,11 @@ | |
| fi | |
| - test -n "$AR" && break | |
| - done | |
| fi | |
| -if test -z "$AR"; then | |
| +if test -z "$ac_cv_prog_AR"; then | |
| ac_ct_AR=$AR | |
| - for ac_prog in ar | |
| -do | |
| - # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_prog; ac_word=$2 | |
| + # Extract the first word of "ar", so it can be a program name with args. | |
| +set dummy ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | |
| @@ -7674,7 +7423,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_AR="$ac_prog" | |
| + ac_cv_prog_ac_ct_AR="ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -7693,10 +7442,6 @@ | |
| $as_echo "no" >&6; } | |
| fi | |
| - | |
| - test -n "$ac_ct_AR" && break | |
| -done | |
| - | |
| if test "x$ac_ct_AR" = x; then | |
| AR="false" | |
| else | |
| @@ -7708,14 +7453,12 @@ | |
| esac | |
| AR=$ac_ct_AR | |
| fi | |
| +else | |
| + AR="$ac_cv_prog_AR" | |
| fi | |
| -: ${AR=ar} | |
| -: ${AR_FLAGS=cru} | |
| - | |
| - | |
| - | |
| - | |
| +test -z "$AR" && AR=ar | |
| +test -z "$AR_FLAGS" && AR_FLAGS=cru | |
| @@ -7723,60 +7466,6 @@ | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | |
| -$as_echo_n "checking for archiver @FILE support... " >&6; } | |
| -if test "${lt_cv_ar_at_file+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_ar_at_file=no | |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| -/* end confdefs.h. */ | |
| - | |
| -int | |
| -main () | |
| -{ | |
| - | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -if ac_fn_c_try_compile "$LINENO"; then : | |
| - echo conftest.$ac_objext > conftest.lst | |
| - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | |
| - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - 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 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - if test 0 -ne "$ac_status"; then | |
| - lt_cv_ar_at_file=@ | |
| - fi | |
| - fi | |
| - rm -f conftest.* libconftest.a | |
| - | |
| -fi | |
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| - | |
| -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 no = "$lt_cv_ar_at_file"; then | |
| - archiver_list_spec= | |
| -else | |
| - archiver_list_spec=$lt_cv_ar_at_file | |
| -fi | |
| - | |
| - | |
| - | |
| @@ -7986,14 +7675,14 @@ | |
| if test -n "$RANLIB"; then | |
| case $host_os in | |
| - bitrig* | openbsd*) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | |
| + openbsd*) | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | |
| ;; | |
| *) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | |
| ;; | |
| esac | |
| - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" | |
| + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | |
| fi | |
| case $host_os in | |
| @@ -8076,7 +7765,7 @@ | |
| symcode='[ABCDGISTW]' | |
| ;; | |
| hpux*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| symcode='[ABCDEGRST]' | |
| fi | |
| ;; | |
| @@ -8109,44 +7798,14 @@ | |
| 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"\ | |
| -$lt_cdecl_hook\ | |
| -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ | |
| -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" | |
| +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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"\ | |
| -$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'" | |
| +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'" | |
| # Handle CRLF in mingw tool chain | |
| opt_cr= | |
| @@ -8164,29 +7823,24 @@ | |
| # 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, | |
| - # D for any global variable and I for any imported variable. | |
| + # Fake it for dumpbin and say T for any non-static function | |
| + # and D for any global 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=\"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))}"\ | |
| +" {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))}"\ | |
| " ' prfx=^$ac_symprfx" | |
| else | |
| lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | |
| fi | |
| - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | |
| # Check to see that the pipe works correctly. | |
| pipe_works=no | |
| @@ -8228,18 +7882,6 @@ | |
| if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | |
| 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 can't be const, because runtime | |
| - relocations are performed -- see ld's documentation on pseudo-relocs. */ | |
| -# define LT_DLSYM_CONST | |
| -#elif defined __osf__ | |
| -/* This system does not cope well with relocations in const data. */ | |
| -# define LT_DLSYM_CONST | |
| -#else | |
| -# define LT_DLSYM_CONST const | |
| -#endif | |
| - | |
| #ifdef __cplusplus | |
| extern "C" { | |
| #endif | |
| @@ -8251,7 +7893,7 @@ | |
| cat <<_LT_EOF >> conftest.$ac_ext | |
| /* The mapping between symbol names and symbols. */ | |
| -LT_DLSYM_CONST struct { | |
| +const struct { | |
| const char *name; | |
| void *address; | |
| } | |
| @@ -8259,7 +7901,7 @@ | |
| { | |
| { "@PROGRAM@", (void *) 0 }, | |
| _LT_EOF | |
| - $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| cat <<\_LT_EOF >> conftest.$ac_ext | |
| {0, (void *) 0} | |
| }; | |
| @@ -8277,19 +7919,19 @@ | |
| _LT_EOF | |
| # Now try linking the two files. | |
| mv conftest.$ac_objext conftstm.$ac_objext | |
| - lt_globsym_save_LIBS=$LIBS | |
| - lt_globsym_save_CFLAGS=$CFLAGS | |
| - LIBS=conftstm.$ac_objext | |
| + lt_save_LIBS="$LIBS" | |
| + lt_save_CFLAGS="$CFLAGS" | |
| + 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 | |
| - CFLAGS=$lt_globsym_save_CFLAGS | |
| + LIBS="$lt_save_LIBS" | |
| + CFLAGS="$lt_save_CFLAGS" | |
| else | |
| echo "cannot find nm_test_func in $nlist" >&5 | |
| fi | |
| @@ -8306,7 +7948,7 @@ | |
| rm -rf conftest* conftst* | |
| # Do not use the global_symbol_pipe unless it works. | |
| - if test yes = "$pipe_works"; then | |
| + if test "$pipe_works" = yes; then | |
| break | |
| else | |
| lt_cv_sys_global_symbol_pipe= | |
| @@ -8326,145 +7968,11 @@ | |
| $as_echo "ok" >&6; } | |
| fi | |
| -# Response file support. | |
| -if test "$lt_cv_nm_interface" = "MS dumpbin"; then | |
| - nm_file_list_spec='@' | |
| -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | |
| - nm_file_list_spec='@' | |
| -fi | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | |
| -$as_echo_n "checking for sysroot... " >&6; } | |
| - | |
| -# Check whether --with-sysroot was given. | |
| -if test "${with_sysroot+set}" = set; then : | |
| - withval=$with_sysroot; | |
| -else | |
| - with_sysroot=no | |
| -fi | |
| - | |
| - | |
| -lt_sysroot= | |
| -case $with_sysroot in #( | |
| - yes) | |
| - if test yes = "$GCC"; then | |
| - lt_sysroot=`$CC --print-sysroot 2>/dev/null` | |
| - fi | |
| - ;; #( | |
| - /*) | |
| - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | |
| - ;; #( | |
| - no|'') | |
| - ;; #( | |
| - *) | |
| - { $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 | |
| - | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | |
| -$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 test "${ac_cv_path_lt_DD+set}" = set; 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" | |
| - { test -f "$ac_path_lt_DD" && $as_test_x "$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 test "${lt_cv_truncate_bin+set}" = set; 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; } | |
| @@ -8472,33 +7980,27 @@ | |
| -# 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 no = "$enable_libtool_lock" || enable_libtool_lock=yes | |
| +test "x$enable_libtool_lock" != xno && 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 what ABI is being produced by ac_compile, and set mode | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -8507,25 +8009,24 @@ | |
| 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| 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 yes = "$lt_cv_prog_gnu_ld"; then | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| case `/usr/bin/file conftest.$ac_objext` in | |
| *32-bit*) | |
| LD="${LD-ld} -melf32bsmip" | |
| @@ -8554,50 +8055,9 @@ | |
| 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*| \ | |
| +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | |
| s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | |
| - # 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. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -8611,19 +8071,9 @@ | |
| LD="${LD-ld} -m elf_i386_fbsd" | |
| ;; | |
| x86_64-*linux*) | |
| - case `/usr/bin/file conftest.o` in | |
| - *x86-64*) | |
| - LD="${LD-ld} -m elf32_x86_64" | |
| - ;; | |
| - *) | |
| - LD="${LD-ld} -m elf_i386" | |
| - ;; | |
| - esac | |
| - ;; | |
| - powerpc64le-*linux*) | |
| - LD="${LD-ld} -m elf32lppclinux" | |
| + LD="${LD-ld} -m elf_i386" | |
| ;; | |
| - powerpc64-*linux*) | |
| + ppc64-*linux*|powerpc64-*linux*) | |
| LD="${LD-ld} -m elf32ppclinux" | |
| ;; | |
| s390x-*linux*) | |
| @@ -8642,10 +8092,7 @@ | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_x86_64" | |
| ;; | |
| - powerpcle-*linux*) | |
| - LD="${LD-ld} -m elf64lppc" | |
| - ;; | |
| - powerpc-*linux*) | |
| + ppc*-*linux*|powerpc*-*linux*) | |
| LD="${LD-ld} -m elf64ppc" | |
| ;; | |
| s390*-*linux*|s390*-*tpf*) | |
| @@ -8663,7 +8110,7 @@ | |
| *-*-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; } | |
| @@ -8706,14 +8153,13 @@ | |
| 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 yes != "$lt_cv_cc_needs_belf"; then | |
| + if test x"$lt_cv_cc_needs_belf" != x"yes"; 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| +sparc*-*solaris*) | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -8723,20 +8169,7 @@ | |
| case `/usr/bin/file conftest.o` in | |
| *64-bit*) | |
| case $lt_cv_prog_gnu_ld in | |
| - yes*) | |
| - case $host in | |
| - i?86-*-solaris*|x86_64-*-solaris*) | |
| - LD="${LD-ld} -m elf_x86_64" | |
| - ;; | |
| - sparc*-*-solaris*) | |
| - LD="${LD-ld} -m elf64_sparc" | |
| - ;; | |
| - 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 | |
| - fi | |
| - ;; | |
| + yes*) LD="${LD-ld} -m elf64_sparc" ;; | |
| *) | |
| if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | |
| LD="${LD-ld} -64" | |
| @@ -8750,124 +8183,7 @@ | |
| ;; | |
| esac | |
| -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. | |
| -set dummy ${ac_tool_prefix}mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$MANIFEST_TOOL"; then | |
| - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | |
| -if test -n "$MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | |
| -$as_echo "$MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | |
| - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | |
| - # Extract the first word of "mt", so it can be a program name with args. | |
| -set dummy mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | |
| -if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | |
| -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_MANIFEST_TOOL" = x; then | |
| - MANIFEST_TOOL=":" | |
| - else | |
| - case $cross_compiling:$ac_tool_warned in | |
| -yes:) | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | |
| -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
| -ac_tool_warned=yes ;; | |
| -esac | |
| - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | |
| - fi | |
| -else | |
| - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | |
| -fi | |
| - | |
| -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | |
| -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | |
| -if test "${lt_cv_path_mainfest_tool+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_path_mainfest_tool=no | |
| - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | |
| - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | |
| - cat conftest.err >&5 | |
| - if $GREP 'Manifest Tool' conftest.out > /dev/null; then | |
| - lt_cv_path_mainfest_tool=yes | |
| - fi | |
| - rm -f conftest* | |
| -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 yes != "$lt_cv_path_mainfest_tool"; then | |
| - MANIFEST_TOOL=: | |
| -fi | |
| - | |
| - | |
| - | |
| - | |
| +need_locks="$enable_libtool_lock" | |
| case $host_os in | |
| @@ -9364,7 +8680,7 @@ | |
| $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 | |
| @@ -9376,13 +8692,7 @@ | |
| $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | |
| -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | |
| _lt_result=$? | |
| - # If there is a non-empty error log, and "single_module" | |
| - # appears in it, assume the flag caused a linker warning | |
| - if test -s conftest.err && $GREP single_module conftest.err; then | |
| - 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 0 = "$_lt_result"; then | |
| + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | |
| lt_cv_apple_cc_single_mod=yes | |
| else | |
| cat conftest.err >&5 | |
| @@ -9393,7 +8703,6 @@ | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 | |
| $as_echo "$lt_cv_apple_cc_single_mod" >&6; } | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 | |
| $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } | |
| if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : | |
| @@ -9424,12 +8733,11 @@ | |
| 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 | |
| $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 | |
| $as_echo_n "checking for -force_load linker flag... " >&6; } | |
| if test "${lt_cv_ld_force_load+set}" = set; then : | |
| @@ -9443,17 +8751,13 @@ | |
| $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | |
| echo "$AR cru libconftest.a conftest.o" >&5 | |
| $AR cru libconftest.a conftest.o 2>&5 | |
| - echo "$RANLIB libconftest.a" >&5 | |
| - $RANLIB libconftest.a 2>&5 | |
| cat > conftest.c << _LT_EOF | |
| int main() { return 0;} | |
| _LT_EOF | |
| echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 | |
| $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | |
| _lt_result=$? | |
| - if test -s conftest.err && $GREP force_load conftest.err; then | |
| - cat conftest.err >&5 | |
| - elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then | |
| + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | |
| lt_cv_ld_force_load=yes | |
| else | |
| cat conftest.err >&5 | |
| @@ -9466,32 +8770,32 @@ | |
| $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 yes = "$lt_cv_apple_cc_single_mod"; then | |
| + if test "$lt_cv_apple_cc_single_mod" = "yes"; then | |
| _lt_dar_single_mod='$single_module' | |
| fi | |
| - if test yes = "$lt_cv_ld_exported_symbols_list"; then | |
| - _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' | |
| + if test "$lt_cv_ld_exported_symbols_list" = "yes"; 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 no = "$lt_cv_ld_force_load"; then | |
| + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then | |
| _lt_dsymutil='~$DSYMUTIL $lib || :' | |
| else | |
| _lt_dsymutil= | |
| @@ -9499,41 +8803,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 | |
| @@ -9568,14 +8837,14 @@ | |
| *) | |
| 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 | |
| @@ -9599,14 +8868,14 @@ | |
| *) | |
| 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 | |
| @@ -9624,27 +8893,14 @@ | |
| # Check whether --with-pic was given. | |
| if test "${with_pic+set}" = set; then : | |
| - withval=$with_pic; lt_p=${PACKAGE-default} | |
| - case $withval in | |
| - yes|no) pic_mode=$withval ;; | |
| - *) | |
| - pic_mode=default | |
| - # Look at the argument we got. We use all the common list separators. | |
| - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, | |
| - for lt_pkg in $withval; do | |
| - IFS=$lt_save_ifs | |
| - if test "X$lt_pkg" = "X$lt_p"; then | |
| - pic_mode=yes | |
| - fi | |
| - done | |
| - IFS=$lt_save_ifs | |
| - ;; | |
| - esac | |
| + withval=$with_pic; pic_mode="$withval" | |
| else | |
| pic_mode=default | |
| fi | |
| +test -z "$pic_mode" && pic_mode=default | |
| + | |
| @@ -9660,14 +8916,14 @@ | |
| *) | |
| 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 | |
| @@ -9681,63 +8937,11 @@ | |
| - 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 test "${lt_cv_with_aix_soname+set}" = set; 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' | |
| @@ -9767,10 +8971,6 @@ | |
| - | |
| - | |
| - | |
| - | |
| test -z "$LN_S" && LN_S="ln -s" | |
| @@ -9786,7 +8986,7 @@ | |
| -if test -n "${ZSH_VERSION+set}"; then | |
| +if test -n "${ZSH_VERSION+set}" ; then | |
| setopt NO_GLOB_SUBST | |
| fi | |
| @@ -9825,7 +9025,7 @@ | |
| # 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 set != "${COLLECT_NAMES+set}"; then | |
| + if test "X${COLLECT_NAMES+set}" != Xset; then | |
| COLLECT_NAMES= | |
| export COLLECT_NAMES | |
| fi | |
| @@ -9836,14 +9036,14 @@ | |
| 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 | |
| @@ -9852,8 +9052,15 @@ | |
| test -z "$LD" && LD=ld | |
| test -z "$ac_objext" && ac_objext=o | |
| -func_cc_basename $compiler | |
| -cc_basename=$func_cc_basename_result | |
| +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-%%"` | |
| # Only perform the check for file, if the check method requires it | |
| @@ -9868,22 +9075,22 @@ | |
| 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 | |
| : | |
| @@ -9906,13 +9113,13 @@ | |
| 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; } | |
| @@ -9934,22 +9141,22 @@ | |
| 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 | |
| : | |
| @@ -9972,13 +9179,13 @@ | |
| 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; } | |
| @@ -9999,7 +9206,7 @@ | |
| # 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' | |
| @@ -10061,7 +9268,7 @@ | |
| lt_prog_compiler_no_builtin_flag= | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; then | |
| case $cc_basename in | |
| nvcc*) | |
| lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; | |
| @@ -10077,7 +9284,7 @@ | |
| 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" ## exclude from sc_useless_quotes_in_assignment | |
| + lt_compiler_flag="-fno-rtti -fno-exceptions" | |
| # 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 | |
| @@ -10107,7 +9314,7 @@ | |
| { $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 yes = "$lt_cv_prog_compiler_rtti_exceptions"; then | |
| +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | |
| lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" | |
| else | |
| : | |
| @@ -10124,19 +9331,20 @@ | |
| lt_prog_compiler_pic= | |
| lt_prog_compiler_static= | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; then | |
| lt_prog_compiler_wl='-Wl,' | |
| lt_prog_compiler_static='-static' | |
| case $host_os in | |
| aix*) | |
| # All AIX code is PIC. | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static='-Bstatic' | |
| fi | |
| - lt_prog_compiler_pic='-fPIC' | |
| ;; | |
| amigaos*) | |
| @@ -10147,8 +9355,8 @@ | |
| ;; | |
| 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 | |
| @@ -10164,11 +9372,6 @@ | |
| # 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*) | |
| @@ -10229,9 +9432,7 @@ | |
| case $cc_basename in | |
| nvcc*) # Cuda Compiler Driver 2.2 | |
| lt_prog_compiler_wl='-Xlinker ' | |
| - if test -n "$lt_prog_compiler_pic"; then | |
| - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" | |
| - fi | |
| + lt_prog_compiler_pic='-Xcompiler -fPIC' | |
| ;; | |
| esac | |
| else | |
| @@ -10239,7 +9440,7 @@ | |
| case $host_os in | |
| aix*) | |
| lt_prog_compiler_wl='-Wl,' | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static='-Bstatic' | |
| else | |
| @@ -10247,29 +9448,10 @@ | |
| 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*) | |
| @@ -10285,7 +9467,7 @@ | |
| ;; | |
| 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*) | |
| @@ -10294,9 +9476,9 @@ | |
| lt_prog_compiler_static='-non_shared' | |
| ;; | |
| - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| + linux* | k*bsd*-gnu | kopensolaris*-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' | |
| @@ -10315,18 +9497,6 @@ | |
| lt_prog_compiler_pic='--shared' | |
| lt_prog_compiler_static='--static' | |
| ;; | |
| - nagfor*) | |
| - # NAG Fortran compiler | |
| - lt_prog_compiler_wl='-Wl,-Wl,,' | |
| - 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) | |
| @@ -10347,33 +9517,18 @@ | |
| ;; | |
| *) | |
| case `$CC -V 2>&1 | sed 5q` in | |
| - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) | |
| + *Sun\ F* | *Sun*Fortran*) | |
| # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| lt_prog_compiler_wl='' | |
| ;; | |
| - *Sun\ F* | *Sun*Fortran*) | |
| - lt_prog_compiler_pic='-KPIC' | |
| - lt_prog_compiler_static='-Bstatic' | |
| - lt_prog_compiler_wl='-Qoption ld ' | |
| - ;; | |
| *Sun\ C*) | |
| # Sun C 5.9 | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| lt_prog_compiler_wl='-Wl,' | |
| ;; | |
| - *Intel*\ [CF]*Compiler*) | |
| - lt_prog_compiler_wl='-Wl,' | |
| - lt_prog_compiler_pic='-fPIC' | |
| - lt_prog_compiler_static='-static' | |
| - ;; | |
| - *Portland\ Group*) | |
| - lt_prog_compiler_wl='-Wl,' | |
| - lt_prog_compiler_pic='-fpic' | |
| - lt_prog_compiler_static='-Bstatic' | |
| - ;; | |
| esac | |
| ;; | |
| esac | |
| @@ -10404,7 +9559,7 @@ | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| case $cc_basename in | |
| - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | |
| + f77* | f90* | f95*) | |
| lt_prog_compiler_wl='-Qoption ld ';; | |
| *) | |
| lt_prog_compiler_wl='-Wl,';; | |
| @@ -10424,7 +9579,7 @@ | |
| ;; | |
| 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 | |
| @@ -10453,7 +9608,7 @@ | |
| fi | |
| case $host_os in | |
| - # For platforms that do not support PIC, -DPIC is meaningless: | |
| + # For platforms which do not support PIC, -DPIC is meaningless: | |
| *djgpp*) | |
| lt_prog_compiler_pic= | |
| ;; | |
| @@ -10461,17 +9616,13 @@ | |
| lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | |
| ;; | |
| esac | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | |
| +$as_echo "$lt_prog_compiler_pic" >&6; } | |
| + | |
| + | |
| + | |
| + | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| -if test "${lt_cv_prog_compiler_pic+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | |
| -$as_echo "$lt_cv_prog_compiler_pic" >&6; } | |
| -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| @@ -10485,7 +9636,7 @@ | |
| 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" ## exclude from sc_useless_quotes_in_assignment | |
| + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" | |
| # 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 | |
| @@ -10515,7 +9666,7 @@ | |
| { $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 yes = "$lt_cv_prog_compiler_pic_works"; then | |
| +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then | |
| case $lt_prog_compiler_pic in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; | |
| @@ -10532,11 +9683,6 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| # | |
| # Check to make sure the static flag actually works. | |
| # | |
| @@ -10547,7 +9693,7 @@ | |
| $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 | |
| @@ -10566,13 +9712,13 @@ | |
| 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 yes = "$lt_cv_prog_compiler_static_works"; then | |
| +if test x"$lt_cv_prog_compiler_static_works" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static= | |
| @@ -10692,8 +9838,8 @@ | |
| -hard_links=nottested | |
| -if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then | |
| +hard_links="nottested" | |
| +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; 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; } | |
| @@ -10705,9 +9851,9 @@ | |
| 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 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;} | |
| + 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;} | |
| need_locks=warn | |
| fi | |
| else | |
| @@ -10735,6 +9881,7 @@ | |
| hardcode_direct=no | |
| hardcode_direct_absolute=no | |
| hardcode_libdir_flag_spec= | |
| + hardcode_libdir_flag_spec_ld= | |
| hardcode_libdir_separator= | |
| hardcode_minus_L=no | |
| hardcode_shlibpath_var=unsupported | |
| @@ -10750,9 +9897,9 @@ | |
| # 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 | |
| @@ -10767,7 +9914,7 @@ | |
| # 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 yes != "$GCC"; then | |
| + if test "$GCC" != yes; then | |
| with_gnu_ld=no | |
| fi | |
| ;; | |
| @@ -10775,7 +9922,7 @@ | |
| # we just hope/assume this is gcc and not c89 (= MSVC++) | |
| with_gnu_ld=yes | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| with_gnu_ld=no | |
| ;; | |
| esac | |
| @@ -10785,7 +9932,7 @@ | |
| # 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| case $host_os in | |
| aix*) | |
| # The AIX port of GNU ld has always aspired to compatibility | |
| @@ -10807,24 +9954,24 @@ | |
| esac | |
| fi | |
| - if test yes = "$lt_use_gnu_ld_interface"; then | |
| + if test "$lt_use_gnu_ld_interface" = yes; 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 | $SED -e 's/(^)\+)\s\+//' 2>&1` in | |
| + case `$LD -v 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 ... | |
| @@ -10837,7 +9984,7 @@ | |
| case $host_os in | |
| aix[3-9]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| - if test ia64 != "$host_cpu"; then | |
| + if test "$host_cpu" != ia64; then | |
| ld_shlibs=no | |
| cat <<_LT_EOF 1>&2 | |
| @@ -10856,7 +10003,7 @@ | |
| 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) | |
| @@ -10872,7 +10019,7 @@ | |
| 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 | |
| @@ -10882,97 +10029,68 @@ | |
| # _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 | |
| - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | |
| - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | |
| + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| 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, 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' | |
| + 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' | |
| 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 linux-dietlibc = "$host_os"; then | |
| + if test "$host_os" = linux-dietlibc; 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 no = "$tmp_diet" | |
| + && test "$tmp_diet" = no | |
| then | |
| - tmp_addflag=' $pic_flag' | |
| + tmp_addflag= | |
| 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' ;; | |
| @@ -10983,47 +10101,43 @@ | |
| 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 yes = "$supports_anon_versioning"; then | |
| + if test "x$supports_anon_versioning" = xyes; 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' | |
| - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | |
| - if test yes = "$supports_anon_versioning"; then | |
| + hardcode_libdir_flag_spec= | |
| + hardcode_libdir_flag_spec_ld='-rpath $libdir' | |
| + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | |
| + if test "x$supports_anon_versioning" = xyes; 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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | |
| fi | |
| ;; | |
| esac | |
| @@ -11037,8 +10151,8 @@ | |
| 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 $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' | |
| fi | |
| ;; | |
| @@ -11056,8 +10170,8 @@ | |
| _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 $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 | |
| @@ -11069,7 +10183,7 @@ | |
| ld_shlibs=no | |
| cat <<_LT_EOF 1>&2 | |
| -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot | |
| +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not | |
| *** 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 | |
| @@ -11084,9 +10198,9 @@ | |
| # 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 | |
| @@ -11103,15 +10217,15 @@ | |
| *) | |
| 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 $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 | |
| ;; | |
| esac | |
| - if test no = "$ld_shlibs"; then | |
| + if test "$ld_shlibs" = no; then | |
| runpath_var= | |
| hardcode_libdir_flag_spec= | |
| export_dynamic_flag_spec= | |
| @@ -11127,7 +10241,7 @@ | |
| # Note: this linker hardcodes the directories in LIBPATH if there | |
| # are no directories specified by -L. | |
| hardcode_minus_L=yes | |
| - if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then | |
| + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then | |
| # Neither direct hardcoding nor static linking is supported with a | |
| # broken collect2. | |
| hardcode_direct=unsupported | |
| @@ -11135,57 +10249,34 @@ | |
| ;; | |
| aix[4-9]*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 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. | |
| + # -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". | |
| 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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | |
| else | |
| - 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' | |
| + 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' | |
| 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 | |
| - # 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 | |
| + # need to do runtime linking. | |
| case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then | |
| + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); 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 | |
| @@ -11204,21 +10295,13 @@ | |
| hardcode_direct_absolute=yes | |
| hardcode_libdir_separator=':' | |
| link_all_deplibs=yes | |
| - 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 | |
| + file_list_spec='${wl}-f,' | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; 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 | |
| @@ -11237,48 +10320,35 @@ | |
| ;; | |
| esac | |
| shared_flag='-shared' | |
| - if test yes = "$aix_use_runtimelinking"; then | |
| - shared_flag="$shared_flag "'$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| + shared_flag="$shared_flag "'${wl}-G' | |
| fi | |
| - # 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 ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 yes = "$aix_use_runtimelinking"; then | |
| - shared_flag='$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; 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,yes = "$with_aix_soname,$aix_use_runtimelinking"; then | |
| + if test "$aix_use_runtimelinking" = yes; 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 set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath_+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test x$gcc_no_link = xyes; then | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| @@ -11294,47 +10364,34 @@ | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath_"; then | |
| - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| 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 | |
| - fi | |
| - | |
| -fi | |
| - | |
| - aix_libpath=$lt_cv_aix_libpath_ | |
| -fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 -n "$allow_undefined_flag"; 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 "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | |
| else | |
| - if test ia64 = "$host_cpu"; then | |
| - hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' | |
| + if test "$host_cpu" = ia64; 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 set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath_+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test x$gcc_no_link = xyes; then | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| @@ -11350,57 +10407,38 @@ | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath_"; then | |
| - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| 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 | |
| - fi | |
| - | |
| -fi | |
| - | |
| - aix_libpath=$lt_cv_aix_libpath_ | |
| -fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 yes = "$with_gnu_ld"; then | |
| + no_undefined_flag=' ${wl}-bernotok' | |
| + allow_undefined_flag=' ${wl}-berok' | |
| + if test "$with_gnu_ld" = yes; 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 | |
| - 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' | |
| + # 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' | |
| fi | |
| fi | |
| ;; | |
| @@ -11409,7 +10447,7 @@ | |
| 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) | |
| @@ -11429,65 +10467,20 @@ | |
| # Microsoft Visual C++. | |
| # hardcode_libdir_flag_spec is actually meaningless, as there is | |
| # no search path for DLLs. | |
| - case $cc_basename in | |
| - cl*) | |
| - # Native MSVC | |
| - hardcode_libdir_flag_spec=' ' | |
| - allow_undefined_flag=unsupported | |
| - always_export_symbols=yes | |
| - file_list_spec='@' | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - shrext_cmds=.dll | |
| - # FIXME: Setting linknames here is a bad hack. | |
| - 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 | |
| - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | |
| - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| - # 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' | |
| - ;; | |
| - *) | |
| - # Assume MSVC wrapper | |
| - hardcode_libdir_flag_spec=' ' | |
| - allow_undefined_flag=unsupported | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - 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. | |
| - old_archive_from_new_cmds='true' | |
| - # FIXME: Should let the user specify the lib program. | |
| - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| - enable_shared_with_static_runtimes=yes | |
| - ;; | |
| - esac | |
| + hardcode_libdir_flag_spec=' ' | |
| + allow_undefined_flag=unsupported | |
| + # Tell ltmain to make .lib files, not .a files. | |
| + libext=lib | |
| + # Tell ltmain to make .dll files, not .so files. | |
| + 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. | |
| + old_archive_from_new_cmds='true' | |
| + # FIXME: Should let the user specify the lib program. | |
| + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| + fix_srcfile_path='`cygpath -w "$srcfile"`' | |
| + enable_shared_with_static_runtimes=yes | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -11497,24 +10490,23 @@ | |
| hardcode_direct=no | |
| hardcode_automatic=yes | |
| hardcode_shlibpath_var=unsupported | |
| - 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\"`' | |
| - | |
| + 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\"`' | |
| 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*|nagfor*) _lt_dar_can_shared=yes ;; | |
| + ifort*) _lt_dar_can_shared=yes ;; | |
| *) _lt_dar_can_shared=$GCC ;; | |
| esac | |
| - if test yes = "$_lt_dar_can_shared"; then | |
| + if test "$_lt_dar_can_shared" = "yes"; 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 | |
| @@ -11549,40 +10541,41 @@ | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| freebsd* | dragonfly*) | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| hardcode_libdir_flag_spec='-R$libdir' | |
| hardcode_direct=yes | |
| hardcode_shlibpath_var=no | |
| ;; | |
| hpux9*) | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $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 "x$output_objdir/$soname" = "x$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 $output_objdir/$soname = $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 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' | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; then | |
| + archive_cmds='$CC -shared -fPIC ${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 no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | |
| + hardcode_libdir_flag_spec_ld='+b $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 | |
| @@ -11590,25 +10583,25 @@ | |
| ;; | |
| hpux11*) | |
| - if test yes,no = "$GCC,$with_gnu_ld"; then | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; 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 -fPIC ${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 -fPIC ${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' | |
| ;; | |
| *) | |
| @@ -11620,7 +10613,7 @@ | |
| $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 | |
| @@ -11639,14 +10632,14 @@ | |
| 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 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' | |
| +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' | |
| else | |
| archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | |
| fi | |
| @@ -11654,8 +10647,8 @@ | |
| ;; | |
| esac | |
| fi | |
| - if test no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | |
| hardcode_libdir_separator=: | |
| case $host_cpu in | |
| @@ -11666,7 +10659,7 @@ | |
| *) | |
| 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. | |
| @@ -11677,61 +10670,38 @@ | |
| ;; | |
| irix5* | irix6* | nonstopux*) | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds='$CC -shared $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. | |
| - # This should be the same for all languages, so no per-tag cache variable. | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | |
| -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | |
| -if test "${lt_cv_irix_exported_symbol+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - save_LDFLAGS=$LDFLAGS | |
| - LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" | |
| - if test x$gcc_no_link = xyes; then | |
| + save_LDFLAGS="$LDFLAGS" | |
| + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| /* end confdefs.h. */ | |
| -int foo (void) { return 0; } | |
| +int foo(void) {} | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_cv_irix_exported_symbol=yes | |
| -else | |
| - lt_cv_irix_exported_symbol=no | |
| + archive_expsym_cmds='$CC -shared $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 | |
| rm -f core conftest.err conftest.$ac_objext \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| - 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 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 | |
| + LDFLAGS="$save_LDFLAGS" | |
| 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 | |
| ;; | |
| - 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 | |
| @@ -11746,7 +10716,7 @@ | |
| 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 | |
| ;; | |
| @@ -11754,19 +10724,27 @@ | |
| *nto* | *qnx*) | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| 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__`"; then | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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 | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - hardcode_libdir_flag_spec='$wl-rpath,$libdir' | |
| + 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 | |
| fi | |
| else | |
| ld_shlibs=no | |
| @@ -11777,53 +10755,33 @@ | |
| 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 | |
| + 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' | |
| ;; | |
| osf3*) | |
| - 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' | |
| + 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' | |
| 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 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' | |
| + if test "$GCC" = yes; then | |
| + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | |
| + archive_cmds='$CC -shared${allow_undefined_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' | |
| @@ -11834,24 +10792,24 @@ | |
| solaris*) | |
| no_undefined_flag=' -z defs' | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + wlarc='${wl}' | |
| + archive_cmds='$CC -shared ${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 ${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 | |
| @@ -11861,11 +10819,11 @@ | |
| 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 yes = "$GCC"; then | |
| - whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' | |
| + if test "$GCC" = yes; 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 | |
| @@ -11875,10 +10833,10 @@ | |
| ;; | |
| sunos4*) | |
| - if test sequent = "$host_vendor"; then | |
| + if test "x$host_vendor" = xsequent; 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 | |
| @@ -11927,43 +10885,43 @@ | |
| ;; | |
| 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 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' | |
| + 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' | |
| 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 CANNOT use -z defs as we might desire, because we do not | |
| + # Note: We can NOT 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 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' | |
| + 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' | |
| 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 | |
| ;; | |
| @@ -11978,10 +10936,10 @@ | |
| ;; | |
| esac | |
| - if test sni = "$host_vendor"; then | |
| + if test x$host_vendor = xsni; then | |
| case $host in | |
| sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | |
| - export_dynamic_flag_spec='$wl-Blargedynsym' | |
| + export_dynamic_flag_spec='${wl}-Blargedynsym' | |
| ;; | |
| esac | |
| fi | |
| @@ -11989,7 +10947,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 | |
| $as_echo "$ld_shlibs" >&6; } | |
| -test no = "$ld_shlibs" && can_build_shared=no | |
| +test "$ld_shlibs" = no && can_build_shared=no | |
| with_gnu_ld=$with_gnu_ld | |
| @@ -12015,7 +10973,7 @@ | |
| # Assume -lc should be added | |
| archive_cmds_need_lc=yes | |
| - if test yes,yes = "$GCC,$enable_shared"; then | |
| + if test "$enable_shared" = yes && test "$GCC" = yes; then | |
| case $archive_cmds in | |
| *'~'*) | |
| # FIXME: we may have to deal with multi-command sequences. | |
| @@ -12227,17 +11185,22 @@ | |
| + | |
| + | |
| + | |
| + | |
| + | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | |
| $as_echo_n "checking dynamic linker characteristics... " >&6; } | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; 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 | |
| @@ -12253,35 +11216,28 @@ | |
| ;; | |
| 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` | |
| - # ...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 | |
| + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` | |
| 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" | |
| - elif test -n "$lt_multi_os_dir"; then | |
| + 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 | |
| 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--; | |
| } | |
| @@ -12295,7 +11251,7 @@ | |
| # 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 | |
| @@ -12304,7 +11260,7 @@ | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| -shrext_cmds=.so | |
| +shrext_cmds=".so" | |
| postinstall_cmds= | |
| postuninstall_cmds= | |
| finish_cmds= | |
| @@ -12321,108 +11277,56 @@ | |
| # 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' | |
| + version_type=linux | |
| + 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]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| hardcode_into_libs=yes | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 | |
| - # 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 | |
| + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct | |
| # soname into executable. Probably we can add versioning support to | |
| # collect2, so additional links can be useful in future. | |
| - aix,yes) # traditional libtool | |
| - dynamic_linker='AIX unversionable lib.so' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| # 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' | |
| - ;; | |
| - aix,no) # traditional AIX only | |
| - dynamic_linker='AIX lib.a(lib.so.V)' | |
| + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | |
| + else | |
| # 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' | |
| - ;; | |
| - 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 | |
| + library_names_spec='${libname}${release}.a $libname.a' | |
| + soname_spec='${libname}${release}${shared_ext}$major' | |
| + fi | |
| shlibpath_var=LIBPATH | |
| fi | |
| ;; | |
| @@ -12432,27 +11336,27 @@ | |
| 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%'\''`; $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%'\''`; 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' | |
| ;; | |
| esac | |
| ;; | |
| beos*) | |
| - library_names_spec='$libname$shared_ext' | |
| + library_names_spec='${libname}${shared_ext}' | |
| dynamic_linker="$host_os ld.so" | |
| shlibpath_var=LIBRARY_PATH | |
| ;; | |
| bsdi[45]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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" | |
| @@ -12464,17 +11368,16 @@ | |
| cygwin* | mingw* | pw32* | cegcc*) | |
| version_type=windows | |
| - shrext_cmds=.dll | |
| + shrext_cmds=".dll" | |
| need_version=no | |
| need_lib_prefix=no | |
| - case $GCC,$cc_basename in | |
| - yes,*) | |
| - # gcc | |
| + case $GCC,$host_os in | |
| + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | |
| 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~ | |
| @@ -12490,84 +11393,26 @@ | |
| 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' | |
| - ;; | |
| - esac | |
| - dynamic_linker='Win32 ld.exe' | |
| - ;; | |
| - | |
| - *,cl*) | |
| - # Native MSVC | |
| - libname_spec='$name' | |
| - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' | |
| - library_names_spec='$libname.dll.lib' | |
| - | |
| - case $build_os in | |
| - mingw*) | |
| - sys_lib_search_path_spec= | |
| - lt_save_ifs=$IFS | |
| - IFS=';' | |
| - for lt_path in $LIB | |
| - do | |
| - IFS=$lt_save_ifs | |
| - # Let DOS variable expansion print the short 8.3 style file name. | |
| - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | |
| - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | |
| - done | |
| - IFS=$lt_save_ifs | |
| - # Convert to MSYS style. | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | |
| - ;; | |
| - cygwin*) | |
| - # Convert to unix form, then to dos form, then back to unix form | |
| - # but this time dos style (no spaces!) so that the unix form looks | |
| - # like /cygdrive/c/PROGRA~1:/cygdr... | |
| - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | |
| - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | |
| - 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 | |
| - 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'` | |
| - else | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| - fi | |
| - # FIXME: find the short name or the path components, as spaces are | |
| - # common. (e.g. "Program Files" -> "PROGRA~1") | |
| + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | |
| ;; | |
| 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'\''`~ | |
| - dldir=$destdir/`dirname \$dlpath`~ | |
| - test -d \$dldir || mkdir -p \$dldir~ | |
| - $install_prog $dir/$dlname \$dldir/$dlname' | |
| - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| - dlpath=$dir/\$dldll~ | |
| - $RM \$dlpath' | |
| - shlibpath_overrides_runpath=yes | |
| - dynamic_linker='Win32 link.exe' | |
| ;; | |
| *) | |
| - # Assume MSVC wrapper | |
| - library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' | |
| - dynamic_linker='Win32 ld.exe' | |
| + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | |
| ;; | |
| esac | |
| + dynamic_linker='Win32 ld.exe' | |
| # FIXME: first we should search . and the directory the executable is in | |
| shlibpath_var=PATH | |
| ;; | |
| @@ -12577,8 +11422,8 @@ | |
| 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`' | |
| @@ -12588,11 +11433,11 @@ | |
| ;; | |
| dgux*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| @@ -12610,13 +11455,12 @@ | |
| version_type=freebsd-$objformat | |
| case $version_type in | |
| freebsd-elf*) | |
| - 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} $libname${shared_ext}' | |
| 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 | |
| @@ -12641,16 +11485,26 @@ | |
| esac | |
| ;; | |
| +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 | |
| + hardcode_into_libs=yes | |
| + ;; | |
| + | |
| haiku*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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=no | |
| - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | |
| + shlibpath_overrides_runpath=yes | |
| + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -12667,15 +11521,14 @@ | |
| 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 32 = "$HPUX_IA64_MODE"; 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 "X$HPUX_IA64_MODE" = X32; 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' | |
| @@ -12683,8 +11536,8 @@ | |
| 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 | |
| ;; | |
| @@ -12693,8 +11546,8 @@ | |
| 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, ... | |
| @@ -12704,11 +11557,11 @@ | |
| ;; | |
| interix[3-9]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -12719,16 +11572,16 @@ | |
| case $host_os in | |
| nonstopux*) version_type=nonstopux ;; | |
| *) | |
| - if test yes = "$lt_cv_prog_gnu_ld"; then | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| + version_type=linux | |
| else | |
| version_type=irix | |
| fi ;; | |
| 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= | |
| @@ -12747,8 +11600,8 @@ | |
| 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 | |
| ;; | |
| @@ -12757,33 +11610,13 @@ | |
| 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 | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-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' | |
| + 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 | |
| @@ -12830,12 +11663,7 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # 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. | |
| + # Append ld.so.conf contents 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" | |
| @@ -12855,12 +11683,12 @@ | |
| 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 | |
| @@ -12869,8 +11697,8 @@ | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -12879,68 +11707,58 @@ | |
| 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* | bitrig*) | |
| +openbsd*) | |
| version_type=sunos | |
| - sys_lib_dlsearch_path_spec=/usr/lib | |
| + sys_lib_dlsearch_path_spec="/usr/lib" | |
| need_lib_prefix=no | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| - need_version=no | |
| - else | |
| - need_version=yes | |
| - fi | |
| - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' | |
| + # 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 | |
| - shlibpath_overrides_runpath=yes | |
| + 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 | |
| + else | |
| + shlibpath_overrides_runpath=yes | |
| + fi | |
| ;; | |
| os2*) | |
| libname_spec='$name' | |
| - version_type=windows | |
| - shrext_cmds=.dll | |
| - need_version=no | |
| + shrext_cmds=".dll" | |
| need_lib_prefix=no | |
| - # 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' | |
| + library_names_spec='$libname${shared_ext} $libname.a' | |
| dynamic_linker='OS/2 ld.exe' | |
| - 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' | |
| + shlibpath_var=LIBPATH | |
| ;; | |
| 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*) | |
| @@ -12948,11 +11766,11 @@ | |
| ;; | |
| solaris*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -12962,20 +11780,20 @@ | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| need_lib_prefix=no | |
| fi | |
| need_version=yes | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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) | |
| @@ -12996,24 +11814,24 @@ | |
| ;; | |
| sysv4*MP*) | |
| - 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' | |
| + if test -d /usr/nec ;then | |
| + version_type=linux | |
| + 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=sco | |
| + version_type=freebsd-elf | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; 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' | |
| @@ -13028,19 +11846,19 @@ | |
| tpf*) | |
| # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -13050,35 +11868,20 @@ | |
| esac | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 | |
| $as_echo "$dynamic_linker" >&6; } | |
| -test no = "$dynamic_linker" && can_build_shared=no | |
| +test "$dynamic_linker" = no && can_build_shared=no | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then | |
| - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| fi | |
| - | |
| -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then | |
| - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = 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 | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| @@ -13175,15 +11978,15 @@ | |
| hardcode_action= | |
| if test -n "$hardcode_libdir_flag_spec" || | |
| test -n "$runpath_var" || | |
| - test yes = "$hardcode_automatic"; then | |
| + test "X$hardcode_automatic" = "Xyes" ; then | |
| # We can hardcode non-existent directories. | |
| - if test no != "$hardcode_direct" && | |
| + if test "$hardcode_direct" != no && | |
| # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && | |
| - test no != "$hardcode_minus_L"; then | |
| + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && | |
| + test "$hardcode_minus_L" != no; then | |
| # Linking always hardcodes the temporary library directory. | |
| hardcode_action=relink | |
| else | |
| @@ -13198,12 +12001,12 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 | |
| $as_echo "$hardcode_action" >&6; } | |
| -if test relink = "$hardcode_action" || | |
| - test yes = "$inherit_rpath"; then | |
| +if test "$hardcode_action" = relink || | |
| + test "$inherit_rpath" = yes; then | |
| # Fast installation is not supported | |
| enable_fast_install=no | |
| -elif test yes = "$shlibpath_overrides_runpath" || | |
| - test no = "$enable_shared"; then | |
| +elif test "$shlibpath_overrides_runpath" = yes || | |
| + test "$enable_shared" = no; then | |
| # Fast installation is not necessary | |
| enable_fast_install=needless | |
| fi | |
| @@ -13213,7 +12016,7 @@ | |
| - if test yes != "$enable_dlopen"; then | |
| + if test "x$enable_dlopen" != xyes; then | |
| enable_dlopen=unknown | |
| enable_dlopen_self=unknown | |
| enable_dlopen_self_static=unknown | |
| @@ -13223,23 +12026,23 @@ | |
| 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 test "${ac_cv_lib_dl_dlopen+set}" = set; then : | |
| @@ -13280,10 +12083,10 @@ | |
| { $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" = x""yes; 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 | |
| @@ -13291,18 +12094,10 @@ | |
| ;; | |
| - 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" = x""yes; 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; } | |
| @@ -13344,11 +12139,11 @@ | |
| { $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" = x""yes; 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" = x""yes; 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; } | |
| @@ -13390,7 +12185,7 @@ | |
| { $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" = x""yes; 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; } | |
| @@ -13432,7 +12227,7 @@ | |
| { $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" = x""yes; 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; } | |
| @@ -13474,7 +12269,7 @@ | |
| { $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" = x""yes; then : | |
| - lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld | |
| + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" | |
| fi | |
| @@ -13495,21 +12290,21 @@ | |
| ;; | |
| esac | |
| - if test no = "$lt_cv_dlopen"; then | |
| - enable_dlopen=no | |
| - else | |
| + if test "x$lt_cv_dlopen" != xno; then | |
| enable_dlopen=yes | |
| + else | |
| + enable_dlopen=no | |
| fi | |
| case $lt_cv_dlopen in | |
| dlopen) | |
| - save_CPPFLAGS=$CPPFLAGS | |
| - test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" | |
| + save_CPPFLAGS="$CPPFLAGS" | |
| + test "x$ac_cv_header_dlfcn_h" = xyes && 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 | |
| @@ -13517,13 +12312,13 @@ | |
| if test "${lt_cv_dlopen_self+set}" = set; then : | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| - if test yes = "$cross_compiling"; then : | |
| + if test "$cross_compiling" = yes; then : | |
| lt_cv_dlopen_self=cross | |
| else | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<_LT_EOF | |
| -#line $LINENO "configure" | |
| +#line 12321 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -13564,13 +12359,13 @@ | |
| # endif | |
| #endif | |
| -/* When -fvisibility=hidden is used, assume the code has been annotated | |
| +/* When -fvisbility=hidden is used, assume the code has been annotated | |
| correspondingly for the symbols needed. */ | |
| -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| -int fnord () __attribute__((visibility("default"))); | |
| +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| +void fnord () __attribute__((visibility("default"))); | |
| #endif | |
| -int fnord () { return 42; } | |
| +void fnord () { int i=42; } | |
| int main () | |
| { | |
| void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | |
| @@ -13596,7 +12391,7 @@ | |
| (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 | |
| @@ -13616,20 +12411,20 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 | |
| $as_echo "$lt_cv_dlopen_self" >&6; } | |
| - if test yes = "$lt_cv_dlopen_self"; then | |
| + if test "x$lt_cv_dlopen_self" = xyes; 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 test "${lt_cv_dlopen_self_static+set}" = set; then : | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| - if test yes = "$cross_compiling"; then : | |
| + if test "$cross_compiling" = yes; then : | |
| lt_cv_dlopen_self_static=cross | |
| else | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<_LT_EOF | |
| -#line $LINENO "configure" | |
| +#line 12427 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -13670,13 +12465,13 @@ | |
| # endif | |
| #endif | |
| -/* When -fvisibility=hidden is used, assume the code has been annotated | |
| +/* When -fvisbility=hidden is used, assume the code has been annotated | |
| correspondingly for the symbols needed. */ | |
| -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| -int fnord () __attribute__((visibility("default"))); | |
| +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| +void fnord () __attribute__((visibility("default"))); | |
| #endif | |
| -int fnord () { return 42; } | |
| +void fnord () { int i=42; } | |
| int main () | |
| { | |
| void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | |
| @@ -13702,7 +12497,7 @@ | |
| (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 | |
| @@ -13723,9 +12518,9 @@ | |
| $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 | |
| @@ -13769,7 +12564,7 @@ | |
| # 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 | |
| @@ -13797,7 +12592,7 @@ | |
| - # Report what library types will actually be built | |
| + # Report which 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 | |
| @@ -13805,13 +12600,13 @@ | |
| { $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 no = "$can_build_shared" && enable_shared=no | |
| + test "$can_build_shared" = "no" && 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 yes = "$enable_shared" && enable_static=no | |
| + test "$enable_shared" = yes && enable_static=no | |
| if test -n "$RANLIB"; then | |
| archive_cmds="$archive_cmds~\$RANLIB \$lib" | |
| postinstall_cmds='$RANLIB $lib' | |
| @@ -13819,12 +12614,8 @@ | |
| ;; | |
| aix[4-9]*) | |
| - 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 | |
| + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| + test "$enable_shared" = yes && enable_static=no | |
| fi | |
| ;; | |
| esac | |
| @@ -13834,7 +12625,7 @@ | |
| { $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 yes = "$enable_shared" || enable_static=yes | |
| + test "$enable_shared" = yes || enable_static=yes | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 | |
| $as_echo "$enable_static" >&6; } | |
| @@ -13848,9 +12639,7 @@ | |
| 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" | |
| @@ -14107,23 +12896,13 @@ | |
| ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| - | |
| -func_stripname_cnf () | |
| -{ | |
| - case $2 in | |
| - .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;; | |
| - *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;; | |
| - esac | |
| -} # func_stripname_cnf | |
| - | |
| - | |
| ac_ext=${ac_fc_srcext-f} | |
| ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' | |
| ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' | |
| ac_compiler_gnu=$ac_cv_fc_compiler_gnu | |
| -if test -z "$FC" || test no = "$FC"; then | |
| +if test -z "$FC" || test "X$FC" = "Xno"; then | |
| _lt_disable_FC=yes | |
| fi | |
| @@ -14135,6 +12914,7 @@ | |
| hardcode_direct_FC=no | |
| hardcode_direct_absolute_FC=no | |
| hardcode_libdir_flag_spec_FC= | |
| +hardcode_libdir_flag_spec_ld_FC= | |
| hardcode_libdir_separator_FC= | |
| hardcode_minus_L_FC=no | |
| hardcode_automatic_FC=no | |
| @@ -14160,7 +12940,7 @@ | |
| # the FC compiler isn't working. Some variables (like enable_shared) | |
| # are currently assumed to apply to all compilers on this platform, | |
| # and will be corrupted by setting them based on a non-working compiler. | |
| -if test yes != "$_lt_disable_FC"; then | |
| +if test "$_lt_disable_FC" != yes; then | |
| # Code to be used in simple compile tests | |
| lt_simple_compile_test_code="\ | |
| subroutine t | |
| @@ -14206,17 +12986,22 @@ | |
| # Allow CC to be a program name with arguments. | |
| - lt_save_CC=$CC | |
| + lt_save_CC="$CC" | |
| lt_save_GCC=$GCC | |
| - lt_save_CFLAGS=$CFLAGS | |
| CC=${FC-"f95"} | |
| - CFLAGS=$FCFLAGS | |
| compiler=$CC | |
| GCC=$ac_cv_fc_compiler_gnu | |
| compiler_FC=$CC | |
| - func_cc_basename $compiler | |
| -cc_basename=$func_cc_basename_result | |
| + 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-%%"` | |
| if test -n "$compiler"; then | |
| @@ -14227,25 +13012,21 @@ | |
| { $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 no = "$can_build_shared" && enable_shared=no | |
| + test "$can_build_shared" = "no" && 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 yes = "$enable_shared" && enable_static=no | |
| + test "$enable_shared" = yes && enable_static=no | |
| if test -n "$RANLIB"; then | |
| archive_cmds="$archive_cmds~\$RANLIB \$lib" | |
| postinstall_cmds='$RANLIB $lib' | |
| fi | |
| ;; | |
| aix[4-9]*) | |
| - 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 | |
| + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| + test "$enable_shared" = yes && enable_static=no | |
| fi | |
| ;; | |
| esac | |
| @@ -14255,12 +13036,12 @@ | |
| { $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 yes = "$enable_shared" || enable_static=yes | |
| + test "$enable_shared" = yes || enable_static=yes | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 | |
| $as_echo "$enable_static" >&6; } | |
| - GCC_FC=$ac_cv_fc_compiler_gnu | |
| - LD_FC=$LD | |
| + GCC_FC="$ac_cv_fc_compiler_gnu" | |
| + LD_FC="$LD" | |
| ## CAVEAT EMPTOR: | |
| ## There is no encapsulation within the following macros, do not change | |
| @@ -14282,14 +13063,6 @@ | |
| end | |
| _LT_EOF | |
| - | |
| -_lt_libdeps_save_CFLAGS=$CFLAGS | |
| -case "$CC $CFLAGS " in #( | |
| -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | |
| -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | |
| -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | |
| -esac | |
| - | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| ac_status=$? | |
| @@ -14303,38 +13076,29 @@ | |
| pre_test_object_deps_done=no | |
| for p in `eval "$output_verbose_link_cmd"`; do | |
| - case $prev$p in | |
| + case $p in | |
| -L* | -R* | -l*) | |
| # Some compilers place space between "-{L,R}" and the path. | |
| # Remove the space. | |
| - if test x-L = "$p" || | |
| - test x-R = "$p"; then | |
| + if test $p = "-L" || | |
| + test $p = "-R"; then | |
| prev=$p | |
| continue | |
| + else | |
| + prev= | |
| fi | |
| - # Expand the sysroot to ease extracting the directories later. | |
| - if test -z "$prev"; then | |
| - case $p in | |
| - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | |
| - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | |
| - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | |
| - esac | |
| - fi | |
| - case $p in | |
| - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | |
| - esac | |
| - if test no = "$pre_test_object_deps_done"; then | |
| - case $prev in | |
| - -L | -R) | |
| + if test "$pre_test_object_deps_done" = no; then | |
| + case $p in | |
| + -L* | -R*) | |
| # Internal compiler library paths should come after those | |
| # provided the user. The postdeps already come after the | |
| # user supplied libs so there is no need to process them. | |
| if test -z "$compiler_lib_search_path_FC"; then | |
| - compiler_lib_search_path_FC=$prev$p | |
| + compiler_lib_search_path_FC="${prev}${p}" | |
| else | |
| - compiler_lib_search_path_FC="${compiler_lib_search_path_FC} $prev$p" | |
| + compiler_lib_search_path_FC="${compiler_lib_search_path_FC} ${prev}${p}" | |
| fi | |
| ;; | |
| # The "-l" case would never come before the object being | |
| @@ -14342,15 +13106,13 @@ | |
| esac | |
| else | |
| if test -z "$postdeps_FC"; then | |
| - postdeps_FC=$prev$p | |
| + postdeps_FC="${prev}${p}" | |
| else | |
| - postdeps_FC="${postdeps_FC} $prev$p" | |
| + postdeps_FC="${postdeps_FC} ${prev}${p}" | |
| fi | |
| fi | |
| - prev= | |
| ;; | |
| - *.lto.$objext) ;; # Ignore GCC LTO objects | |
| *.$objext) | |
| # This assumes that the test object file only shows up | |
| # once in the compiler output. | |
| @@ -14359,15 +13121,15 @@ | |
| continue | |
| fi | |
| - if test no = "$pre_test_object_deps_done"; then | |
| + if test "$pre_test_object_deps_done" = no; then | |
| if test -z "$predep_objects_FC"; then | |
| - predep_objects_FC=$p | |
| + predep_objects_FC="$p" | |
| else | |
| predep_objects_FC="$predep_objects_FC $p" | |
| fi | |
| else | |
| if test -z "$postdep_objects_FC"; then | |
| - postdep_objects_FC=$p | |
| + postdep_objects_FC="$p" | |
| else | |
| postdep_objects_FC="$postdep_objects_FC $p" | |
| fi | |
| @@ -14386,7 +13148,6 @@ | |
| fi | |
| $RM -f confest.$objext | |
| -CFLAGS=$_lt_libdeps_save_CFLAGS | |
| # PORTME: override above test on systems where it is broken | |
| @@ -14396,7 +13157,7 @@ | |
| esac | |
| compiler_lib_search_dirs_FC= | |
| if test -n "${compiler_lib_search_path_FC}"; then | |
| - compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | $SED -e 's! -L! !g' -e 's!^ !!'` | |
| + compiler_lib_search_dirs_FC=`echo " ${compiler_lib_search_path_FC}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` | |
| fi | |
| @@ -14433,19 +13194,20 @@ | |
| lt_prog_compiler_pic_FC= | |
| lt_prog_compiler_static_FC= | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; then | |
| lt_prog_compiler_wl_FC='-Wl,' | |
| lt_prog_compiler_static_FC='-static' | |
| case $host_os in | |
| aix*) | |
| # All AIX code is PIC. | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static_FC='-Bstatic' | |
| fi | |
| - lt_prog_compiler_pic_FC='-fPIC' | |
| ;; | |
| amigaos*) | |
| @@ -14456,8 +13218,8 @@ | |
| ;; | |
| 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_FC='-m68020 -resident32 -malways-restore-a4' | |
| ;; | |
| esac | |
| @@ -14473,11 +13235,6 @@ | |
| # Although the cygwin gcc ignores -fPIC, still need this for old-style | |
| # (--disable-auto-import) libraries | |
| lt_prog_compiler_pic_FC='-DDLL_EXPORT' | |
| - case $host_os in | |
| - os2*) | |
| - lt_prog_compiler_static_FC='$wl-static' | |
| - ;; | |
| - esac | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -14538,9 +13295,7 @@ | |
| case $cc_basename in | |
| nvcc*) # Cuda Compiler Driver 2.2 | |
| lt_prog_compiler_wl_FC='-Xlinker ' | |
| - if test -n "$lt_prog_compiler_pic_FC"; then | |
| - lt_prog_compiler_pic_FC="-Xcompiler $lt_prog_compiler_pic_FC" | |
| - fi | |
| + lt_prog_compiler_pic_FC='-Xcompiler -fPIC' | |
| ;; | |
| esac | |
| else | |
| @@ -14548,7 +13303,7 @@ | |
| case $host_os in | |
| aix*) | |
| lt_prog_compiler_wl_FC='-Wl,' | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static_FC='-Bstatic' | |
| else | |
| @@ -14556,29 +13311,10 @@ | |
| fi | |
| ;; | |
| - darwin* | rhapsody*) | |
| - # PIC is the default on this platform | |
| - # Common symbols not allowed in MH_DYLIB files | |
| - lt_prog_compiler_pic_FC='-fno-common' | |
| - case $cc_basename in | |
| - nagfor*) | |
| - # NAG Fortran compiler | |
| - lt_prog_compiler_wl_FC='-Wl,-Wl,,' | |
| - lt_prog_compiler_pic_FC='-PIC' | |
| - lt_prog_compiler_static_FC='-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_FC='-DDLL_EXPORT' | |
| - case $host_os in | |
| - os2*) | |
| - lt_prog_compiler_static_FC='$wl-static' | |
| - ;; | |
| - esac | |
| ;; | |
| hpux9* | hpux10* | hpux11*) | |
| @@ -14594,7 +13330,7 @@ | |
| ;; | |
| esac | |
| # Is there a better lt_prog_compiler_static that works with the bundled CC? | |
| - lt_prog_compiler_static_FC='$wl-a ${wl}archive' | |
| + lt_prog_compiler_static_FC='${wl}-a ${wl}archive' | |
| ;; | |
| irix5* | irix6* | nonstopux*) | |
| @@ -14603,9 +13339,9 @@ | |
| lt_prog_compiler_static_FC='-non_shared' | |
| ;; | |
| - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| + linux* | k*bsd*-gnu | kopensolaris*-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_FC='-Wl,' | |
| lt_prog_compiler_pic_FC='-KPIC' | |
| @@ -14624,18 +13360,6 @@ | |
| lt_prog_compiler_pic_FC='--shared' | |
| lt_prog_compiler_static_FC='--static' | |
| ;; | |
| - nagfor*) | |
| - # NAG Fortran compiler | |
| - lt_prog_compiler_wl_FC='-Wl,-Wl,,' | |
| - lt_prog_compiler_pic_FC='-PIC' | |
| - lt_prog_compiler_static_FC='-Bstatic' | |
| - ;; | |
| - tcc*) | |
| - # Fabrice Bellard et al's Tiny C Compiler | |
| - lt_prog_compiler_wl_FC='-Wl,' | |
| - lt_prog_compiler_pic_FC='-fPIC' | |
| - lt_prog_compiler_static_FC='-static' | |
| - ;; | |
| pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | |
| # Portland Group compilers (*not* the Pentium gcc compiler, | |
| # which looks to be a dead project) | |
| @@ -14656,33 +13380,18 @@ | |
| ;; | |
| *) | |
| case `$CC -V 2>&1 | sed 5q` in | |
| - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) | |
| + *Sun\ F* | *Sun*Fortran*) | |
| # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| lt_prog_compiler_pic_FC='-KPIC' | |
| lt_prog_compiler_static_FC='-Bstatic' | |
| lt_prog_compiler_wl_FC='' | |
| ;; | |
| - *Sun\ F* | *Sun*Fortran*) | |
| - lt_prog_compiler_pic_FC='-KPIC' | |
| - lt_prog_compiler_static_FC='-Bstatic' | |
| - lt_prog_compiler_wl_FC='-Qoption ld ' | |
| - ;; | |
| *Sun\ C*) | |
| # Sun C 5.9 | |
| lt_prog_compiler_pic_FC='-KPIC' | |
| lt_prog_compiler_static_FC='-Bstatic' | |
| lt_prog_compiler_wl_FC='-Wl,' | |
| ;; | |
| - *Intel*\ [CF]*Compiler*) | |
| - lt_prog_compiler_wl_FC='-Wl,' | |
| - lt_prog_compiler_pic_FC='-fPIC' | |
| - lt_prog_compiler_static_FC='-static' | |
| - ;; | |
| - *Portland\ Group*) | |
| - lt_prog_compiler_wl_FC='-Wl,' | |
| - lt_prog_compiler_pic_FC='-fpic' | |
| - lt_prog_compiler_static_FC='-Bstatic' | |
| - ;; | |
| esac | |
| ;; | |
| esac | |
| @@ -14713,7 +13422,7 @@ | |
| lt_prog_compiler_pic_FC='-KPIC' | |
| lt_prog_compiler_static_FC='-Bstatic' | |
| case $cc_basename in | |
| - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | |
| + f77* | f90* | f95*) | |
| lt_prog_compiler_wl_FC='-Qoption ld ';; | |
| *) | |
| lt_prog_compiler_wl_FC='-Wl,';; | |
| @@ -14733,7 +13442,7 @@ | |
| ;; | |
| sysv4*MP*) | |
| - if test -d /usr/nec; then | |
| + if test -d /usr/nec ;then | |
| lt_prog_compiler_pic_FC='-Kconform_pic' | |
| lt_prog_compiler_static_FC='-Bstatic' | |
| fi | |
| @@ -14762,7 +13471,7 @@ | |
| fi | |
| case $host_os in | |
| - # For platforms that do not support PIC, -DPIC is meaningless: | |
| + # For platforms which do not support PIC, -DPIC is meaningless: | |
| *djgpp*) | |
| lt_prog_compiler_pic_FC= | |
| ;; | |
| @@ -14770,17 +13479,10 @@ | |
| lt_prog_compiler_pic_FC="$lt_prog_compiler_pic_FC" | |
| ;; | |
| esac | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_FC" >&5 | |
| +$as_echo "$lt_prog_compiler_pic_FC" >&6; } | |
| + | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| -if test "${lt_cv_prog_compiler_pic_FC+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_prog_compiler_pic_FC=$lt_prog_compiler_pic_FC | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_FC" >&5 | |
| -$as_echo "$lt_cv_prog_compiler_pic_FC" >&6; } | |
| -lt_prog_compiler_pic_FC=$lt_cv_prog_compiler_pic_FC | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| @@ -14794,7 +13496,7 @@ | |
| lt_cv_prog_compiler_pic_works_FC=no | |
| ac_outfile=conftest.$ac_objext | |
| echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| - lt_compiler_flag="$lt_prog_compiler_pic_FC" ## exclude from sc_useless_quotes_in_assignment | |
| + lt_compiler_flag="$lt_prog_compiler_pic_FC" | |
| # 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 | |
| @@ -14824,7 +13526,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_FC" >&5 | |
| $as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; } | |
| -if test yes = "$lt_cv_prog_compiler_pic_works_FC"; then | |
| +if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then | |
| case $lt_prog_compiler_pic_FC in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic_FC=" $lt_prog_compiler_pic_FC" ;; | |
| @@ -14838,8 +13540,6 @@ | |
| - | |
| - | |
| # | |
| # Check to make sure the static flag actually works. | |
| # | |
| @@ -14850,7 +13550,7 @@ | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| lt_cv_prog_compiler_static_works_FC=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 | |
| @@ -14869,13 +13569,13 @@ | |
| 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_FC" >&5 | |
| $as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; } | |
| -if test yes = "$lt_cv_prog_compiler_static_works_FC"; then | |
| +if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static_FC= | |
| @@ -14989,8 +13689,8 @@ | |
| -hard_links=nottested | |
| -if test no = "$lt_cv_prog_compiler_c_o_FC" && test no != "$need_locks"; then | |
| +hard_links="nottested" | |
| +if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; 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; } | |
| @@ -15002,9 +13702,9 @@ | |
| 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 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;} | |
| + 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;} | |
| need_locks=warn | |
| fi | |
| else | |
| @@ -15029,6 +13729,7 @@ | |
| hardcode_direct_FC=no | |
| hardcode_direct_absolute_FC=no | |
| hardcode_libdir_flag_spec_FC= | |
| + hardcode_libdir_flag_spec_ld_FC= | |
| hardcode_libdir_separator_FC= | |
| hardcode_minus_L_FC=no | |
| hardcode_shlibpath_var_FC=unsupported | |
| @@ -15044,9 +13745,9 @@ | |
| # included in the symbol list | |
| include_expsyms_FC= | |
| # 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_FC='_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 | |
| @@ -15061,7 +13762,7 @@ | |
| # 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 yes != "$GCC"; then | |
| + if test "$GCC" != yes; then | |
| with_gnu_ld=no | |
| fi | |
| ;; | |
| @@ -15069,7 +13770,7 @@ | |
| # we just hope/assume this is gcc and not c89 (= MSVC++) | |
| with_gnu_ld=yes | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| with_gnu_ld=no | |
| ;; | |
| esac | |
| @@ -15079,7 +13780,7 @@ | |
| # 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| case $host_os in | |
| aix*) | |
| # The AIX port of GNU ld has always aspired to compatibility | |
| @@ -15101,24 +13802,24 @@ | |
| esac | |
| fi | |
| - if test yes = "$lt_use_gnu_ld_interface"; then | |
| + if test "$lt_use_gnu_ld_interface" = yes; 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_FC='$wl-rpath $wl$libdir' | |
| - export_dynamic_flag_spec_FC='$wl--export-dynamic' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir' | |
| + export_dynamic_flag_spec_FC='${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_FC=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' | |
| + whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | |
| else | |
| whole_archive_flag_spec_FC= | |
| fi | |
| supports_anon_versioning=no | |
| - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in | |
| + case `$LD -v 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 ... | |
| @@ -15131,7 +13832,7 @@ | |
| case $host_os in | |
| aix[3-9]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| - if test ia64 != "$host_cpu"; then | |
| + if test "$host_cpu" != ia64; then | |
| ld_shlibs_FC=no | |
| cat <<_LT_EOF 1>&2 | |
| @@ -15150,7 +13851,7 @@ | |
| case $host_cpu in | |
| powerpc) | |
| # see comment about AmigaOS4 .so support | |
| - archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| archive_expsym_cmds_FC='' | |
| ;; | |
| m68k) | |
| @@ -15166,7 +13867,7 @@ | |
| allow_undefined_flag_FC=unsupported | |
| # Joseph Beckenbach <jrb3@best.com> says some releases of gcc | |
| # support --undefined. This deserves some investigation. FIXME | |
| - archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| + archive_cmds_FC='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| else | |
| ld_shlibs_FC=no | |
| fi | |
| @@ -15176,97 +13877,68 @@ | |
| # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless, | |
| # as there is no search path for DLLs. | |
| hardcode_libdir_flag_spec_FC='-L$libdir' | |
| - export_dynamic_flag_spec_FC='$wl--export-all-symbols' | |
| + export_dynamic_flag_spec_FC='${wl}--export-all-symbols' | |
| allow_undefined_flag_FC=unsupported | |
| always_export_symbols_FC=no | |
| enable_shared_with_static_runtimes_FC=yes | |
| - export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | |
| - exclude_expsyms_FC='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | |
| + export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | |
| - archive_cmds_FC='$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_FC='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' | |
| + archive_cmds_FC='$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_FC='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' | |
| else | |
| ld_shlibs_FC=no | |
| fi | |
| ;; | |
| haiku*) | |
| - archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| link_all_deplibs_FC=yes | |
| ;; | |
| - os2*) | |
| - hardcode_libdir_flag_spec_FC='-L$libdir' | |
| - hardcode_minus_L_FC=yes | |
| - allow_undefined_flag_FC=unsupported | |
| - shrext_cmds=.dll | |
| - archive_cmds_FC='$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_FC='$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_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' | |
| - enable_shared_with_static_runtimes_FC=yes | |
| - ;; | |
| - | |
| interix[3-9]*) | |
| hardcode_direct_FC=no | |
| hardcode_shlibpath_var_FC=no | |
| - hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir' | |
| - export_dynamic_flag_spec_FC='$wl-E' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir' | |
| + export_dynamic_flag_spec_FC='${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_FC='$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_FC='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_FC='$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_FC='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 linux-dietlibc = "$host_os"; then | |
| + if test "$host_os" = linux-dietlibc; 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 no = "$tmp_diet" | |
| + && test "$tmp_diet" = no | |
| then | |
| - tmp_addflag=' $pic_flag' | |
| + tmp_addflag= | |
| tmp_sharedflag='-shared' | |
| case $cc_basename,$host_cpu in | |
| pgcc*) # Portland Group C compiler | |
| - whole_archive_flag_spec_FC='$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_FC='${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_FC='$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_FC='${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' ;; | |
| @@ -15277,47 +13949,43 @@ | |
| lf95*) # Lahey Fortran 8.1 | |
| whole_archive_flag_spec_FC= | |
| 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_FC='$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_FC='${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_FC=yes | |
| ;; | |
| esac | |
| case `$CC -V 2>&1 | sed 5q` in | |
| *Sun\ C*) # Sun C 5.9 | |
| - whole_archive_flag_spec_FC='$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_FC='${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_FC=yes | |
| tmp_sharedflag='-G' ;; | |
| *Sun\ F*) # Sun Fortran 8.3 | |
| tmp_sharedflag='-G' ;; | |
| esac | |
| - archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| + archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| - if test yes = "$supports_anon_versioning"; then | |
| + if test "x$supports_anon_versioning" = xyes; then | |
| archive_expsym_cmds_FC='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_FC='-rdynamic' | |
| - ;; | |
| xlf* | bgf* | bgxlf* | mpixlf*) | |
| # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | |
| whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive' | |
| - hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir' | |
| - archive_cmds_FC='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | |
| - if test yes = "$supports_anon_versioning"; then | |
| + hardcode_libdir_flag_spec_FC= | |
| + hardcode_libdir_flag_spec_ld_FC='-rpath $libdir' | |
| + archive_cmds_FC='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | |
| + if test "x$supports_anon_versioning" = xyes; then | |
| archive_expsym_cmds_FC='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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | |
| fi | |
| ;; | |
| esac | |
| @@ -15331,8 +13999,8 @@ | |
| archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
| wlarc= | |
| else | |
| - archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| - archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' | |
| + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | |
| fi | |
| ;; | |
| @@ -15350,8 +14018,8 @@ | |
| _LT_EOF | |
| elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | |
| - archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| - archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' | |
| + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | |
| else | |
| ld_shlibs_FC=no | |
| fi | |
| @@ -15363,7 +14031,7 @@ | |
| ld_shlibs_FC=no | |
| cat <<_LT_EOF 1>&2 | |
| -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot | |
| +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not | |
| *** 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 | |
| @@ -15378,9 +14046,9 @@ | |
| # 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_FC='$wl-rpath $wl$libdir' | |
| - archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| - archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir' | |
| + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | |
| else | |
| ld_shlibs_FC=no | |
| fi | |
| @@ -15397,15 +14065,15 @@ | |
| *) | |
| if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | |
| - archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| - archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' | |
| + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | |
| else | |
| ld_shlibs_FC=no | |
| fi | |
| ;; | |
| esac | |
| - if test no = "$ld_shlibs_FC"; then | |
| + if test "$ld_shlibs_FC" = no; then | |
| runpath_var= | |
| hardcode_libdir_flag_spec_FC= | |
| export_dynamic_flag_spec_FC= | |
| @@ -15421,7 +14089,7 @@ | |
| # Note: this linker hardcodes the directories in LIBPATH if there | |
| # are no directories specified by -L. | |
| hardcode_minus_L_FC=yes | |
| - if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then | |
| + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then | |
| # Neither direct hardcoding nor static linking is supported with a | |
| # broken collect2. | |
| hardcode_direct_FC=unsupported | |
| @@ -15429,57 +14097,34 @@ | |
| ;; | |
| aix[4-9]*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 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. | |
| + # -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". | |
| if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | |
| - export_symbols_cmds_FC='$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' | |
| + export_symbols_cmds_FC='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | |
| else | |
| - export_symbols_cmds_FC='`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' | |
| + export_symbols_cmds_FC='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | 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 | |
| - # 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 | |
| + # need to do runtime linking. | |
| case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then | |
| + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); 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 | |
| @@ -15498,21 +14143,13 @@ | |
| hardcode_direct_absolute_FC=yes | |
| hardcode_libdir_separator_FC=':' | |
| link_all_deplibs_FC=yes | |
| - file_list_spec_FC='$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_FC=no | |
| - hardcode_direct_absolute_FC=no | |
| - ;; | |
| - esac | |
| + file_list_spec_FC='${wl}-f,' | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; 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 | |
| @@ -15531,48 +14168,35 @@ | |
| ;; | |
| esac | |
| shared_flag='-shared' | |
| - if test yes = "$aix_use_runtimelinking"; then | |
| - shared_flag="$shared_flag "'$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| + shared_flag="$shared_flag "'${wl}-G' | |
| fi | |
| - # 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 ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 yes = "$aix_use_runtimelinking"; then | |
| - shared_flag='$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; 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_FC='$wl-bexpall' | |
| + export_dynamic_flag_spec_FC='${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_FC=yes | |
| - if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| # Warning - without using the other runtime loading flags (-brtl), | |
| # -berok will link without error, but may produce a broken library. | |
| allow_undefined_flag_FC='-berok' | |
| # Determine the default libpath from the value encoded in an | |
| # empty executable. | |
| - if test set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath__FC+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test x$gcc_no_link = xyes; then | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat > conftest.$ac_ext <<_ACEOF | |
| @@ -15582,47 +14206,34 @@ | |
| _ACEOF | |
| if ac_fn_fc_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath__FC"; then | |
| - lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| fi | |
| rm -f core conftest.err conftest.$ac_objext \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| - if test -z "$lt_cv_aix_libpath__FC"; then | |
| - lt_cv_aix_libpath__FC=/usr/lib:/lib | |
| - fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| -fi | |
| - | |
| - aix_libpath=$lt_cv_aix_libpath__FC | |
| -fi | |
| - | |
| - hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath" | |
| - archive_expsym_cmds_FC='$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 | |
| + hardcode_libdir_flag_spec_FC='${wl}-blibpath:$libdir:'"$aix_libpath" | |
| + archive_expsym_cmds_FC='$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" | |
| else | |
| - if test ia64 = "$host_cpu"; then | |
| - hardcode_libdir_flag_spec_FC='$wl-R $libdir:/usr/lib:/lib' | |
| + if test "$host_cpu" = ia64; then | |
| + hardcode_libdir_flag_spec_FC='${wl}-R $libdir:/usr/lib:/lib' | |
| allow_undefined_flag_FC="-z nodefs" | |
| - archive_expsym_cmds_FC="\$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_FC="\$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 set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath__FC+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test x$gcc_no_link = xyes; then | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat > conftest.$ac_ext <<_ACEOF | |
| @@ -15632,57 +14243,38 @@ | |
| _ACEOF | |
| if ac_fn_fc_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath__FC=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath__FC"; then | |
| - lt_cv_aix_libpath__FC=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| fi | |
| rm -f core conftest.err conftest.$ac_objext \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| - if test -z "$lt_cv_aix_libpath__FC"; then | |
| - lt_cv_aix_libpath__FC=/usr/lib:/lib | |
| - fi | |
| - | |
| -fi | |
| - | |
| - aix_libpath=$lt_cv_aix_libpath__FC | |
| -fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| - hardcode_libdir_flag_spec_FC='$wl-blibpath:$libdir:'"$aix_libpath" | |
| + hardcode_libdir_flag_spec_FC='${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_FC=' $wl-bernotok' | |
| - allow_undefined_flag_FC=' $wl-berok' | |
| - if test yes = "$with_gnu_ld"; then | |
| + no_undefined_flag_FC=' ${wl}-bernotok' | |
| + allow_undefined_flag_FC=' ${wl}-berok' | |
| + if test "$with_gnu_ld" = yes; then | |
| # We only use this code for GNU lds that support --whole-archive. | |
| - whole_archive_flag_spec_FC='$wl--whole-archive$convenience $wl--no-whole-archive' | |
| + whole_archive_flag_spec_FC='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | |
| else | |
| # Exported symbols can be pulled into shared objects from archives | |
| whole_archive_flag_spec_FC='$convenience' | |
| fi | |
| archive_cmds_need_lc_FC=yes | |
| - archive_expsym_cmds_FC='$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_FC="$archive_expsym_cmds_FC"'~$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_FC="$archive_expsym_cmds_FC"'~$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_FC="$archive_expsym_cmds_FC"'~$MV $output_objdir/$realname.d/$soname $output_objdir' | |
| - fi | |
| - archive_expsym_cmds_FC="$archive_expsym_cmds_FC"'~$RM -r $output_objdir/$realname.d' | |
| + # This is similar to how AIX traditionally builds its shared libraries. | |
| + archive_expsym_cmds_FC="\$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' | |
| fi | |
| fi | |
| ;; | |
| @@ -15691,7 +14283,7 @@ | |
| case $host_cpu in | |
| powerpc) | |
| # see comment about AmigaOS4 .so support | |
| - archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' | |
| + archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| archive_expsym_cmds_FC='' | |
| ;; | |
| m68k) | |
| @@ -15706,70 +14298,25 @@ | |
| export_dynamic_flag_spec_FC=-rdynamic | |
| ;; | |
| - cygwin* | mingw* | pw32* | cegcc*) | |
| - # When not using gcc, we currently assume that we are using | |
| - # Microsoft Visual C++. | |
| - # hardcode_libdir_flag_spec is actually meaningless, as there is | |
| - # no search path for DLLs. | |
| - case $cc_basename in | |
| - cl*) | |
| - # Native MSVC | |
| - hardcode_libdir_flag_spec_FC=' ' | |
| - allow_undefined_flag_FC=unsupported | |
| - always_export_symbols_FC=yes | |
| - file_list_spec_FC='@' | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - shrext_cmds=.dll | |
| - # FIXME: Setting linknames here is a bad hack. | |
| - archive_cmds_FC='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' | |
| - archive_expsym_cmds_FC='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, FC)='true' | |
| - enable_shared_with_static_runtimes_FC=yes | |
| - exclude_expsyms_FC='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | |
| - export_symbols_cmds_FC='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| - # Don't use ranlib | |
| - old_postinstall_cmds_FC='chmod 644 $oldlib' | |
| - postlink_cmds_FC='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' | |
| - ;; | |
| - *) | |
| - # Assume MSVC wrapper | |
| - hardcode_libdir_flag_spec_FC=' ' | |
| - allow_undefined_flag_FC=unsupported | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - shrext_cmds=.dll | |
| - # FIXME: Setting linknames here is a bad hack. | |
| - archive_cmds_FC='$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. | |
| - old_archive_from_new_cmds_FC='true' | |
| - # FIXME: Should let the user specify the lib program. | |
| - old_archive_cmds_FC='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| - enable_shared_with_static_runtimes_FC=yes | |
| - ;; | |
| - esac | |
| + cygwin* | mingw* | pw32* | cegcc*) | |
| + # When not using gcc, we currently assume that we are using | |
| + # Microsoft Visual C++. | |
| + # hardcode_libdir_flag_spec is actually meaningless, as there is | |
| + # no search path for DLLs. | |
| + hardcode_libdir_flag_spec_FC=' ' | |
| + allow_undefined_flag_FC=unsupported | |
| + # Tell ltmain to make .lib files, not .a files. | |
| + libext=lib | |
| + # Tell ltmain to make .dll files, not .so files. | |
| + shrext_cmds=".dll" | |
| + # FIXME: Setting linknames here is a bad hack. | |
| + archive_cmds_FC='$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. | |
| + old_archive_from_new_cmds_FC='true' | |
| + # FIXME: Should let the user specify the lib program. | |
| + old_archive_cmds_FC='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| + fix_srcfile_path_FC='`cygpath -w "$srcfile"`' | |
| + enable_shared_with_static_runtimes_FC=yes | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -15779,24 +14326,23 @@ | |
| hardcode_direct_FC=no | |
| hardcode_automatic_FC=yes | |
| hardcode_shlibpath_var_FC=unsupported | |
| - if test yes = "$lt_cv_ld_force_load"; then | |
| - whole_archive_flag_spec_FC='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | |
| - compiler_needs_object_FC=yes | |
| + if test "$lt_cv_ld_force_load" = "yes"; then | |
| + whole_archive_flag_spec_FC='`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_FC='' | |
| fi | |
| link_all_deplibs_FC=yes | |
| - allow_undefined_flag_FC=$_lt_dar_allow_undefined | |
| + allow_undefined_flag_FC="$_lt_dar_allow_undefined" | |
| case $cc_basename in | |
| - ifort*|nagfor*) _lt_dar_can_shared=yes ;; | |
| + ifort*) _lt_dar_can_shared=yes ;; | |
| *) _lt_dar_can_shared=$GCC ;; | |
| esac | |
| - if test yes = "$_lt_dar_can_shared"; then | |
| + if test "$_lt_dar_can_shared" = "yes"; then | |
| output_verbose_link_cmd=func_echo_all | |
| - archive_cmds_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" | |
| - module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" | |
| - archive_expsym_cmds_FC="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_FC="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_FC="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | |
| + module_cmds_FC="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | |
| + archive_expsym_cmds_FC="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_FC="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_FC=no | |
| @@ -15831,40 +14377,41 @@ | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| freebsd* | dragonfly*) | |
| - archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| hardcode_libdir_flag_spec_FC='-R$libdir' | |
| hardcode_direct_FC=yes | |
| hardcode_shlibpath_var_FC=no | |
| ;; | |
| hpux9*) | |
| - if test yes = "$GCC"; then | |
| - archive_cmds_FC='$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' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | |
| else | |
| - archive_cmds_FC='$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' | |
| + archive_cmds_FC='$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' | |
| fi | |
| - hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir' | |
| + hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir' | |
| hardcode_libdir_separator_FC=: | |
| hardcode_direct_FC=yes | |
| # hardcode_minus_L: Not really in the search PATH, | |
| # but as the default location of the library. | |
| hardcode_minus_L_FC=yes | |
| - export_dynamic_flag_spec_FC='$wl-E' | |
| + export_dynamic_flag_spec_FC='${wl}-E' | |
| ;; | |
| hpux10*) | |
| - if test yes,no = "$GCC,$with_gnu_ld"; then | |
| - archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; then | |
| + archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | |
| else | |
| archive_cmds_FC='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | |
| fi | |
| - if test no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir' | |
| + hardcode_libdir_flag_spec_ld_FC='+b $libdir' | |
| hardcode_libdir_separator_FC=: | |
| hardcode_direct_FC=yes | |
| hardcode_direct_absolute_FC=yes | |
| - export_dynamic_flag_spec_FC='$wl-E' | |
| + export_dynamic_flag_spec_FC='${wl}-E' | |
| # hardcode_minus_L: Not really in the search PATH, | |
| # but as the default location of the library. | |
| hardcode_minus_L_FC=yes | |
| @@ -15872,33 +14419,33 @@ | |
| ;; | |
| hpux11*) | |
| - if test yes,no = "$GCC,$with_gnu_ld"; then | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; then | |
| case $host_cpu in | |
| hppa*64*) | |
| - archive_cmds_FC='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| ;; | |
| ia64*) | |
| - archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | |
| ;; | |
| *) | |
| - archive_cmds_FC='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -shared -fPIC ${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_FC='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| ;; | |
| ia64*) | |
| - archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | |
| ;; | |
| *) | |
| - archive_cmds_FC='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | |
| ;; | |
| esac | |
| fi | |
| - if test no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec_FC='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec_FC='${wl}+b ${wl}$libdir' | |
| hardcode_libdir_separator_FC=: | |
| case $host_cpu in | |
| @@ -15909,7 +14456,7 @@ | |
| *) | |
| hardcode_direct_FC=yes | |
| hardcode_direct_absolute_FC=yes | |
| - export_dynamic_flag_spec_FC='$wl-E' | |
| + export_dynamic_flag_spec_FC='${wl}-E' | |
| # hardcode_minus_L: Not really in the search PATH, | |
| # but as the default location of the library. | |
| @@ -15920,62 +14467,37 @@ | |
| ;; | |
| irix5* | irix6* | nonstopux*) | |
| - if test yes = "$GCC"; then | |
| - archive_cmds_FC='$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 "$GCC" = yes; then | |
| + archive_cmds_FC='$CC -shared $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. | |
| - # This should be the same for all languages, so no per-tag cache variable. | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | |
| -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | |
| -if test "${lt_cv_irix_exported_symbol+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - save_LDFLAGS=$LDFLAGS | |
| - LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" | |
| - if test x$gcc_no_link = xyes; then | |
| + save_LDFLAGS="$LDFLAGS" | |
| + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat > conftest.$ac_ext <<_ACEOF | |
| - | |
| - subroutine foo | |
| - end | |
| +int foo(void) {} | |
| _ACEOF | |
| if ac_fn_fc_try_link "$LINENO"; then : | |
| - lt_cv_irix_exported_symbol=yes | |
| -else | |
| - lt_cv_irix_exported_symbol=no | |
| + archive_expsym_cmds_FC='$CC -shared $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 | |
| rm -f core conftest.err conftest.$ac_objext \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| - 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 yes = "$lt_cv_irix_exported_symbol"; then | |
| - archive_expsym_cmds_FC='$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 | |
| + LDFLAGS="$save_LDFLAGS" | |
| else | |
| - archive_cmds_FC='$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_FC='$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_FC='$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_FC='$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_FC='no' | |
| - hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir' | |
| hardcode_libdir_separator_FC=: | |
| inherit_rpath_FC=yes | |
| link_all_deplibs_FC=yes | |
| ;; | |
| - linux*) | |
| - case $cc_basename in | |
| - tcc*) | |
| - # Fabrice Bellard et al's Tiny C Compiler | |
| - ld_shlibs_FC=yes | |
| - archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - ;; | |
| - esac | |
| - ;; | |
| - | |
| netbsd*) | |
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | |
| archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
| @@ -15990,7 +14512,7 @@ | |
| newsos6) | |
| archive_cmds_FC='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' | |
| hardcode_direct_FC=yes | |
| - hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir' | |
| hardcode_libdir_separator_FC=: | |
| hardcode_shlibpath_var_FC=no | |
| ;; | |
| @@ -15998,19 +14520,27 @@ | |
| *nto* | *qnx*) | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| if test -f /usr/libexec/ld.so; then | |
| hardcode_direct_FC=yes | |
| hardcode_shlibpath_var_FC=no | |
| hardcode_direct_absolute_FC=yes | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' | |
| - hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir' | |
| - export_dynamic_flag_spec_FC='$wl-E' | |
| + archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir' | |
| + export_dynamic_flag_spec_FC='${wl}-E' | |
| else | |
| - archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - hardcode_libdir_flag_spec_FC='$wl-rpath,$libdir' | |
| + case $host_os in | |
| + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | |
| + archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| + hardcode_libdir_flag_spec_FC='-R$libdir' | |
| + ;; | |
| + *) | |
| + archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir' | |
| + ;; | |
| + esac | |
| fi | |
| else | |
| ld_shlibs_FC=no | |
| @@ -16021,53 +14551,33 @@ | |
| hardcode_libdir_flag_spec_FC='-L$libdir' | |
| hardcode_minus_L_FC=yes | |
| allow_undefined_flag_FC=unsupported | |
| - shrext_cmds=.dll | |
| - archive_cmds_FC='$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_FC='$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_FC='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' | |
| - enable_shared_with_static_runtimes_FC=yes | |
| + archive_cmds_FC='$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_FC='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' | |
| ;; | |
| osf3*) | |
| - if test yes = "$GCC"; then | |
| - allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*' | |
| - archive_cmds_FC='$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 "$GCC" = yes; then | |
| + allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*' | |
| + archive_cmds_FC='$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_FC=' -expect_unresolved \*' | |
| - archive_cmds_FC='$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_FC='$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_FC='no' | |
| - hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir' | |
| + hardcode_libdir_flag_spec_FC='${wl}-rpath ${wl}$libdir' | |
| hardcode_libdir_separator_FC=: | |
| ;; | |
| osf4* | osf5*) # as osf3* with the addition of -msym flag | |
| - if test yes = "$GCC"; then | |
| - allow_undefined_flag_FC=' $wl-expect_unresolved $wl\*' | |
| - archive_cmds_FC='$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_FC='$wl-rpath $wl$libdir' | |
| + if test "$GCC" = yes; then | |
| + allow_undefined_flag_FC=' ${wl}-expect_unresolved ${wl}\*' | |
| + archive_cmds_FC='$CC -shared${allow_undefined_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_FC='${wl}-rpath ${wl}$libdir' | |
| else | |
| allow_undefined_flag_FC=' -expect_unresolved \*' | |
| - archive_cmds_FC='$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_FC='$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_FC='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_FC='-rpath $libdir' | |
| @@ -16078,24 +14588,24 @@ | |
| solaris*) | |
| no_undefined_flag_FC=' -z defs' | |
| - if test yes = "$GCC"; then | |
| - wlarc='$wl' | |
| - archive_cmds_FC='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + if test "$GCC" = yes; then | |
| + wlarc='${wl}' | |
| + archive_cmds_FC='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| archive_expsym_cmds_FC='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 ${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_FC='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' | |
| + archive_cmds_FC='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' | |
| archive_expsym_cmds_FC='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_FC='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + wlarc='${wl}' | |
| + archive_cmds_FC='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' | |
| archive_expsym_cmds_FC='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 | |
| @@ -16105,11 +14615,11 @@ | |
| 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 yes = "$GCC"; then | |
| - whole_archive_flag_spec_FC='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' | |
| + if test "$GCC" = yes; then | |
| + whole_archive_flag_spec_FC='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | |
| else | |
| whole_archive_flag_spec_FC='-z allextract$convenience -z defaultextract' | |
| fi | |
| @@ -16119,10 +14629,10 @@ | |
| ;; | |
| sunos4*) | |
| - if test sequent = "$host_vendor"; then | |
| + if test "x$host_vendor" = xsequent; then | |
| # Use $CC to link under sequent, because it throws in some extra .o | |
| # files that make .init and .fini sections work. | |
| - archive_cmds_FC='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' | |
| else | |
| archive_cmds_FC='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' | |
| fi | |
| @@ -16171,43 +14681,43 @@ | |
| ;; | |
| sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) | |
| - no_undefined_flag_FC='$wl-z,text' | |
| + no_undefined_flag_FC='${wl}-z,text' | |
| archive_cmds_need_lc_FC=no | |
| hardcode_shlibpath_var_FC=no | |
| runpath_var='LD_RUN_PATH' | |
| - if test yes = "$GCC"; then | |
| - archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| else | |
| - archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| fi | |
| ;; | |
| sysv5* | sco3.2v5* | sco5v6*) | |
| - # Note: We CANNOT use -z defs as we might desire, because we do not | |
| + # Note: We can NOT 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_FC='$wl-z,text' | |
| - allow_undefined_flag_FC='$wl-z,nodefs' | |
| + no_undefined_flag_FC='${wl}-z,text' | |
| + allow_undefined_flag_FC='${wl}-z,nodefs' | |
| archive_cmds_need_lc_FC=no | |
| hardcode_shlibpath_var_FC=no | |
| - hardcode_libdir_flag_spec_FC='$wl-R,$libdir' | |
| + hardcode_libdir_flag_spec_FC='${wl}-R,$libdir' | |
| hardcode_libdir_separator_FC=':' | |
| link_all_deplibs_FC=yes | |
| - export_dynamic_flag_spec_FC='$wl-Bexport' | |
| + export_dynamic_flag_spec_FC='${wl}-Bexport' | |
| runpath_var='LD_RUN_PATH' | |
| - if test yes = "$GCC"; then | |
| - archive_cmds_FC='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds_FC='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds_FC='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_expsym_cmds_FC='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| else | |
| - archive_cmds_FC='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds_FC='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds_FC='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_expsym_cmds_FC='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | |
| fi | |
| ;; | |
| @@ -16222,10 +14732,10 @@ | |
| ;; | |
| esac | |
| - if test sni = "$host_vendor"; then | |
| + if test x$host_vendor = xsni; then | |
| case $host in | |
| sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | |
| - export_dynamic_flag_spec_FC='$wl-Blargedynsym' | |
| + export_dynamic_flag_spec_FC='${wl}-Blargedynsym' | |
| ;; | |
| esac | |
| fi | |
| @@ -16233,7 +14743,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_FC" >&5 | |
| $as_echo "$ld_shlibs_FC" >&6; } | |
| -test no = "$ld_shlibs_FC" && can_build_shared=no | |
| +test "$ld_shlibs_FC" = no && can_build_shared=no | |
| with_gnu_ld_FC=$with_gnu_ld | |
| @@ -16250,7 +14760,7 @@ | |
| # Assume -lc should be added | |
| archive_cmds_need_lc_FC=yes | |
| - if test yes,yes = "$GCC,$enable_shared"; then | |
| + if test "$enable_shared" = yes && test "$GCC" = yes; then | |
| case $archive_cmds_FC in | |
| *'~'*) | |
| # FIXME: we may have to deal with multi-command sequences. | |
| @@ -16372,13 +14882,15 @@ | |
| + | |
| + | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | |
| $as_echo_n "checking dynamic linker characteristics... " >&6; } | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| -shrext_cmds=.so | |
| +shrext_cmds=".so" | |
| postinstall_cmds= | |
| postuninstall_cmds= | |
| finish_cmds= | |
| @@ -16395,108 +14907,56 @@ | |
| # 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' | |
| + version_type=linux | |
| + 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]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| hardcode_into_libs=yes | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 | |
| - # 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 | |
| + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct | |
| # soname into executable. Probably we can add versioning support to | |
| # collect2, so additional links can be useful in future. | |
| - aix,yes) # traditional libtool | |
| - dynamic_linker='AIX unversionable lib.so' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| # 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' | |
| - ;; | |
| - aix,no) # traditional AIX only | |
| - dynamic_linker='AIX lib.a(lib.so.V)' | |
| + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | |
| + else | |
| # 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' | |
| - ;; | |
| - 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 | |
| + library_names_spec='${libname}${release}.a $libname.a' | |
| + soname_spec='${libname}${release}${shared_ext}$major' | |
| + fi | |
| shlibpath_var=LIBPATH | |
| fi | |
| ;; | |
| @@ -16506,27 +14966,27 @@ | |
| 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%'\''`; $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%'\''`; 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' | |
| ;; | |
| esac | |
| ;; | |
| beos*) | |
| - library_names_spec='$libname$shared_ext' | |
| + library_names_spec='${libname}${shared_ext}' | |
| dynamic_linker="$host_os ld.so" | |
| shlibpath_var=LIBRARY_PATH | |
| ;; | |
| bsdi[45]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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" | |
| @@ -16538,17 +14998,16 @@ | |
| cygwin* | mingw* | pw32* | cegcc*) | |
| version_type=windows | |
| - shrext_cmds=.dll | |
| + shrext_cmds=".dll" | |
| need_version=no | |
| need_lib_prefix=no | |
| - case $GCC,$cc_basename in | |
| - yes,*) | |
| - # gcc | |
| + case $GCC,$host_os in | |
| + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | |
| 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~ | |
| @@ -16564,83 +15023,25 @@ | |
| 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}' | |
| ;; | |
| 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' | |
| - ;; | |
| - esac | |
| - dynamic_linker='Win32 ld.exe' | |
| - ;; | |
| - | |
| - *,cl*) | |
| - # Native MSVC | |
| - libname_spec='$name' | |
| - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' | |
| - library_names_spec='$libname.dll.lib' | |
| - | |
| - case $build_os in | |
| - mingw*) | |
| - sys_lib_search_path_spec= | |
| - lt_save_ifs=$IFS | |
| - IFS=';' | |
| - for lt_path in $LIB | |
| - do | |
| - IFS=$lt_save_ifs | |
| - # Let DOS variable expansion print the short 8.3 style file name. | |
| - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | |
| - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | |
| - done | |
| - IFS=$lt_save_ifs | |
| - # Convert to MSYS style. | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | |
| - ;; | |
| - cygwin*) | |
| - # Convert to unix form, then to dos form, then back to unix form | |
| - # but this time dos style (no spaces!) so that the unix form looks | |
| - # like /cygdrive/c/PROGRA~1:/cygdr... | |
| - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | |
| - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | |
| - 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 | |
| - 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'` | |
| - else | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| - fi | |
| - # FIXME: find the short name or the path components, as spaces are | |
| - # common. (e.g. "Program Files" -> "PROGRA~1") | |
| + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | |
| ;; | |
| 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'\''`~ | |
| - dldir=$destdir/`dirname \$dlpath`~ | |
| - test -d \$dldir || mkdir -p \$dldir~ | |
| - $install_prog $dir/$dlname \$dldir/$dlname' | |
| - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| - dlpath=$dir/\$dldll~ | |
| - $RM \$dlpath' | |
| - shlibpath_overrides_runpath=yes | |
| - dynamic_linker='Win32 link.exe' | |
| ;; | |
| *) | |
| - # Assume MSVC wrapper | |
| - library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' | |
| - dynamic_linker='Win32 ld.exe' | |
| + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | |
| ;; | |
| esac | |
| + dynamic_linker='Win32 ld.exe' | |
| # FIXME: first we should search . and the directory the executable is in | |
| shlibpath_var=PATH | |
| ;; | |
| @@ -16650,8 +15051,8 @@ | |
| 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`' | |
| @@ -16660,11 +15061,11 @@ | |
| ;; | |
| dgux*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| @@ -16682,13 +15083,12 @@ | |
| version_type=freebsd-$objformat | |
| case $version_type in | |
| freebsd-elf*) | |
| - 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} $libname${shared_ext}' | |
| 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 | |
| @@ -16713,16 +15113,26 @@ | |
| esac | |
| ;; | |
| +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 | |
| + hardcode_into_libs=yes | |
| + ;; | |
| + | |
| haiku*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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=no | |
| - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | |
| + shlibpath_overrides_runpath=yes | |
| + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -16739,15 +15149,14 @@ | |
| 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 32 = "$HPUX_IA64_MODE"; 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 "X$HPUX_IA64_MODE" = X32; 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' | |
| @@ -16755,8 +15164,8 @@ | |
| 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 | |
| ;; | |
| @@ -16765,8 +15174,8 @@ | |
| 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, ... | |
| @@ -16776,11 +15185,11 @@ | |
| ;; | |
| interix[3-9]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -16791,16 +15200,16 @@ | |
| case $host_os in | |
| nonstopux*) version_type=nonstopux ;; | |
| *) | |
| - if test yes = "$lt_cv_prog_gnu_ld"; then | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| + version_type=linux | |
| else | |
| version_type=irix | |
| fi ;; | |
| 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= | |
| @@ -16819,8 +15228,8 @@ | |
| 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 | |
| ;; | |
| @@ -16829,33 +15238,13 @@ | |
| 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_FC='-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 | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-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' | |
| + 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 | |
| @@ -16896,12 +15285,7 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # 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. | |
| + # Append ld.so.conf contents 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" | |
| @@ -16921,12 +15305,12 @@ | |
| 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 | |
| @@ -16935,8 +15319,8 @@ | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -16945,68 +15329,58 @@ | |
| 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* | bitrig*) | |
| +openbsd*) | |
| version_type=sunos | |
| - sys_lib_dlsearch_path_spec=/usr/lib | |
| + sys_lib_dlsearch_path_spec="/usr/lib" | |
| need_lib_prefix=no | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| - need_version=no | |
| - else | |
| - need_version=yes | |
| - fi | |
| - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' | |
| + # 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 | |
| - shlibpath_overrides_runpath=yes | |
| + 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 | |
| + else | |
| + shlibpath_overrides_runpath=yes | |
| + fi | |
| ;; | |
| os2*) | |
| libname_spec='$name' | |
| - version_type=windows | |
| - shrext_cmds=.dll | |
| - need_version=no | |
| + shrext_cmds=".dll" | |
| need_lib_prefix=no | |
| - # 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' | |
| + library_names_spec='$libname${shared_ext} $libname.a' | |
| dynamic_linker='OS/2 ld.exe' | |
| - 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' | |
| + shlibpath_var=LIBPATH | |
| ;; | |
| 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*) | |
| @@ -17014,11 +15388,11 @@ | |
| ;; | |
| solaris*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -17028,20 +15402,20 @@ | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| need_lib_prefix=no | |
| fi | |
| need_version=yes | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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) | |
| @@ -17062,24 +15436,24 @@ | |
| ;; | |
| sysv4*MP*) | |
| - 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' | |
| + if test -d /usr/nec ;then | |
| + version_type=linux | |
| + 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=sco | |
| + version_type=freebsd-elf | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; 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' | |
| @@ -17094,19 +15468,19 @@ | |
| tpf*) | |
| # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -17116,32 +15490,20 @@ | |
| esac | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 | |
| $as_echo "$dynamic_linker" >&6; } | |
| -test no = "$dynamic_linker" && can_build_shared=no | |
| +test "$dynamic_linker" = no && can_build_shared=no | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then | |
| - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| fi | |
| - | |
| -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then | |
| - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = 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 | |
| - | |
| - | |
| - | |
| @@ -17184,15 +15546,15 @@ | |
| hardcode_action_FC= | |
| if test -n "$hardcode_libdir_flag_spec_FC" || | |
| test -n "$runpath_var_FC" || | |
| - test yes = "$hardcode_automatic_FC"; then | |
| + test "X$hardcode_automatic_FC" = "Xyes" ; then | |
| # We can hardcode non-existent directories. | |
| - if test no != "$hardcode_direct_FC" && | |
| + if test "$hardcode_direct_FC" != no && | |
| # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" && | |
| - test no != "$hardcode_minus_L_FC"; then | |
| + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, FC)" != no && | |
| + test "$hardcode_minus_L_FC" != no; then | |
| # Linking always hardcodes the temporary library directory. | |
| hardcode_action_FC=relink | |
| else | |
| @@ -17207,12 +15569,12 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_FC" >&5 | |
| $as_echo "$hardcode_action_FC" >&6; } | |
| -if test relink = "$hardcode_action_FC" || | |
| - test yes = "$inherit_rpath_FC"; then | |
| +if test "$hardcode_action_FC" = relink || | |
| + test "$inherit_rpath_FC" = yes; then | |
| # Fast installation is not supported | |
| enable_fast_install=no | |
| -elif test yes = "$shlibpath_overrides_runpath" || | |
| - test no = "$enable_shared"; then | |
| +elif test "$shlibpath_overrides_runpath" = yes || | |
| + test "$enable_shared" = no; then | |
| # Fast installation is not necessary | |
| enable_fast_install=needless | |
| fi | |
| @@ -17226,9 +15588,8 @@ | |
| fi # test -n "$compiler" | |
| GCC=$lt_save_GCC | |
| - CC=$lt_save_CC | |
| - CFLAGS=$lt_save_CFLAGS | |
| -fi # test yes != "$_lt_disable_FC" | |
| + CC="$lt_save_CC" | |
| +fi # test "$_lt_disable_FC" != yes | |
| ac_ext=c | |
| ac_cpp='$CPP $CPPFLAGS' | |
| @@ -28218,10 +26579,8 @@ | |
| 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"`' | |
| host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' | |
| host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' | |
| host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' | |
| @@ -28242,20 +26601,13 @@ | |
| lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | |
| lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | |
| lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | |
| -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | |
| -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | |
| reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | |
| reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | |
| OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | |
| deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | |
| file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | |
| -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | |
| -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | |
| -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | |
| -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | |
| AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | |
| AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | |
| -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | |
| STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | |
| RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | |
| old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | |
| @@ -28268,22 +26620,16 @@ | |
| 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"`' | |
| -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | |
| +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | |
| lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | |
| need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | |
| -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | |
| DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | |
| NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | |
| LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | |
| @@ -28307,6 +26653,7 @@ | |
| allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' | |
| no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' | |
| +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' | |
| @@ -28315,12 +26662,12 @@ | |
| hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | |
| inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | |
| link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | |
| +fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | |
| always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | |
| export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | |
| exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | |
| include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | |
| prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | |
| -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | |
| file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | |
| variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | |
| need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | |
| @@ -28339,8 +26686,7 @@ | |
| 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"`' | |
| -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"`' | |
| +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $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"`' | |
| @@ -28360,8 +26706,8 @@ | |
| compiler_FC='`$ECHO "$compiler_FC" | $SED "$delay_single_quote_subst"`' | |
| GCC_FC='`$ECHO "$GCC_FC" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_no_builtin_flag_FC='`$ECHO "$lt_prog_compiler_no_builtin_flag_FC" | $SED "$delay_single_quote_subst"`' | |
| -lt_prog_compiler_pic_FC='`$ECHO "$lt_prog_compiler_pic_FC" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_wl_FC='`$ECHO "$lt_prog_compiler_wl_FC" | $SED "$delay_single_quote_subst"`' | |
| +lt_prog_compiler_pic_FC='`$ECHO "$lt_prog_compiler_pic_FC" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_static_FC='`$ECHO "$lt_prog_compiler_static_FC" | $SED "$delay_single_quote_subst"`' | |
| lt_cv_prog_compiler_c_o_FC='`$ECHO "$lt_cv_prog_compiler_c_o_FC" | $SED "$delay_single_quote_subst"`' | |
| archive_cmds_need_lc_FC='`$ECHO "$archive_cmds_need_lc_FC" | $SED "$delay_single_quote_subst"`' | |
| @@ -28379,6 +26725,7 @@ | |
| allow_undefined_flag_FC='`$ECHO "$allow_undefined_flag_FC" | $SED "$delay_single_quote_subst"`' | |
| no_undefined_flag_FC='`$ECHO "$no_undefined_flag_FC" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_flag_spec_FC='`$ECHO "$hardcode_libdir_flag_spec_FC" | $SED "$delay_single_quote_subst"`' | |
| +hardcode_libdir_flag_spec_ld_FC='`$ECHO "$hardcode_libdir_flag_spec_ld_FC" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_separator_FC='`$ECHO "$hardcode_libdir_separator_FC" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct_FC='`$ECHO "$hardcode_direct_FC" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct_absolute_FC='`$ECHO "$hardcode_direct_absolute_FC" | $SED "$delay_single_quote_subst"`' | |
| @@ -28387,12 +26734,12 @@ | |
| hardcode_automatic_FC='`$ECHO "$hardcode_automatic_FC" | $SED "$delay_single_quote_subst"`' | |
| inherit_rpath_FC='`$ECHO "$inherit_rpath_FC" | $SED "$delay_single_quote_subst"`' | |
| link_all_deplibs_FC='`$ECHO "$link_all_deplibs_FC" | $SED "$delay_single_quote_subst"`' | |
| +fix_srcfile_path_FC='`$ECHO "$fix_srcfile_path_FC" | $SED "$delay_single_quote_subst"`' | |
| always_export_symbols_FC='`$ECHO "$always_export_symbols_FC" | $SED "$delay_single_quote_subst"`' | |
| export_symbols_cmds_FC='`$ECHO "$export_symbols_cmds_FC" | $SED "$delay_single_quote_subst"`' | |
| exclude_expsyms_FC='`$ECHO "$exclude_expsyms_FC" | $SED "$delay_single_quote_subst"`' | |
| include_expsyms_FC='`$ECHO "$include_expsyms_FC" | $SED "$delay_single_quote_subst"`' | |
| prelink_cmds_FC='`$ECHO "$prelink_cmds_FC" | $SED "$delay_single_quote_subst"`' | |
| -postlink_cmds_FC='`$ECHO "$postlink_cmds_FC" | $SED "$delay_single_quote_subst"`' | |
| file_list_spec_FC='`$ECHO "$file_list_spec_FC" | $SED "$delay_single_quote_subst"`' | |
| hardcode_action_FC='`$ECHO "$hardcode_action_FC" | $SED "$delay_single_quote_subst"`' | |
| compiler_lib_search_dirs_FC='`$ECHO "$compiler_lib_search_dirs_FC" | $SED "$delay_single_quote_subst"`' | |
| @@ -28417,7 +26764,6 @@ | |
| # Quote evaled strings. | |
| for var in SHELL \ | |
| ECHO \ | |
| -PATH_SEPARATOR \ | |
| SED \ | |
| GREP \ | |
| EGREP \ | |
| @@ -28431,13 +26777,8 @@ | |
| OBJDUMP \ | |
| deplibs_check_method \ | |
| file_magic_cmd \ | |
| -file_magic_glob \ | |
| -want_nocaseglob \ | |
| -DLLTOOL \ | |
| -sharedlib_from_linklib_cmd \ | |
| AR \ | |
| AR_FLAGS \ | |
| -archiver_list_spec \ | |
| STRIP \ | |
| RANLIB \ | |
| CC \ | |
| @@ -28445,19 +26786,14 @@ | |
| 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 \ | |
| +lt_prog_compiler_pic \ | |
| lt_prog_compiler_static \ | |
| lt_cv_prog_compiler_c_o \ | |
| need_locks \ | |
| -MANIFEST_TOOL \ | |
| DSYMUTIL \ | |
| NMEDIT \ | |
| LIPO \ | |
| @@ -28471,7 +26807,9 @@ | |
| allow_undefined_flag \ | |
| no_undefined_flag \ | |
| hardcode_libdir_flag_spec \ | |
| +hardcode_libdir_flag_spec_ld \ | |
| hardcode_libdir_separator \ | |
| +fix_srcfile_path \ | |
| exclude_expsyms \ | |
| include_expsyms \ | |
| file_list_spec \ | |
| @@ -28493,8 +26831,8 @@ | |
| reload_flag_FC \ | |
| compiler_FC \ | |
| lt_prog_compiler_no_builtin_flag_FC \ | |
| -lt_prog_compiler_pic_FC \ | |
| lt_prog_compiler_wl_FC \ | |
| +lt_prog_compiler_pic_FC \ | |
| lt_prog_compiler_static_FC \ | |
| lt_cv_prog_compiler_c_o_FC \ | |
| export_dynamic_flag_spec_FC \ | |
| @@ -28504,7 +26842,9 @@ | |
| allow_undefined_flag_FC \ | |
| no_undefined_flag_FC \ | |
| hardcode_libdir_flag_spec_FC \ | |
| +hardcode_libdir_flag_spec_ld_FC \ | |
| hardcode_libdir_separator_FC \ | |
| +fix_srcfile_path_FC \ | |
| exclude_expsyms_FC \ | |
| include_expsyms_FC \ | |
| file_list_spec_FC \ | |
| @@ -28516,7 +26856,7 @@ | |
| compiler_lib_search_path_FC; do | |
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | |
| *[\\\\\\\`\\"\\\$]*) | |
| - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes | |
| + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | |
| ;; | |
| *) | |
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | |
| @@ -28538,13 +26878,11 @@ | |
| module_expsym_cmds \ | |
| export_symbols_cmds \ | |
| prelink_cmds \ | |
| -postlink_cmds \ | |
| postinstall_cmds \ | |
| postuninstall_cmds \ | |
| finish_cmds \ | |
| sys_lib_search_path_spec \ | |
| -configure_time_dlsearch_path \ | |
| -configure_time_lt_sys_library_path \ | |
| +sys_lib_dlsearch_path_spec \ | |
| reload_cmds_FC \ | |
| old_archive_cmds_FC \ | |
| old_archive_from_new_cmds_FC \ | |
| @@ -28554,11 +26892,10 @@ | |
| module_cmds_FC \ | |
| module_expsym_cmds_FC \ | |
| export_symbols_cmds_FC \ | |
| -prelink_cmds_FC \ | |
| -postlink_cmds_FC; do | |
| +prelink_cmds_FC; do | |
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | |
| *[\\\\\\\`\\"\\\$]*) | |
| - 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=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | |
| ;; | |
| *) | |
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | |
| @@ -28567,16 +26904,19 @@ | |
| 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 that allow our | |
| +# See if we are running on zsh, and set the options which 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' | |
| @@ -29307,53 +27647,54 @@ | |
| ;; | |
| "libtool":C) | |
| - # See if we are running on zsh, and set the options that allow our | |
| + # See if we are running on zsh, and set the options which 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 | |
| -# Generated automatically by $as_me ($PACKAGE) $VERSION | |
| + | |
| +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. | |
| +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $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. | |
| # | |
| -# 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. | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | |
| +# 2006, 2007, 2008, 2009 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. | |
| # | |
| -# GNU Libtool is distributed in the hope that it will be useful, but | |
| -# WITHOUT ANY WARRANTY; without even the implied warranty of | |
| +# 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 | |
| # 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 this program. If not, see <http://www.gnu.org/licenses/>. | |
| +# 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. | |
| # The names of the tagged configurations supported by this script. | |
| -available_tags='FC ' | |
| - | |
| -# Configured defaults for sys_lib_dlsearch_path munging. | |
| -: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} | |
| +available_tags="FC " | |
| # ### BEGIN LIBTOOL CONFIG | |
| @@ -29373,18 +27714,12 @@ | |
| # 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 | |
| # An echo program that protects backslashes. | |
| ECHO=$lt_ECHO | |
| -# The PATH separator for the build system. | |
| -PATH_SEPARATOR=$lt_PATH_SEPARATOR | |
| - | |
| # The host system. | |
| host_alias=$host_alias | |
| host=$host | |
| @@ -29434,42 +27769,19 @@ | |
| # turn newlines into spaces. | |
| NL2SP=$lt_lt_NL2SP | |
| -# convert \$build file names to \$host format. | |
| -to_host_file_cmd=$lt_cv_to_host_file_cmd | |
| - | |
| -# convert \$build files to toolchain format. | |
| -to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
| - | |
| # An object symbol dumper. | |
| OBJDUMP=$lt_OBJDUMP | |
| # Method to check whether dependent libraries are shared objects. | |
| deplibs_check_method=$lt_deplibs_check_method | |
| -# Command to use when deplibs_check_method = "file_magic". | |
| +# Command to use when deplibs_check_method == "file_magic". | |
| file_magic_cmd=$lt_file_magic_cmd | |
| -# How to find potential files when deplibs_check_method = "file_magic". | |
| -file_magic_glob=$lt_file_magic_glob | |
| - | |
| -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | |
| -want_nocaseglob=$lt_want_nocaseglob | |
| - | |
| -# DLL creation program. | |
| -DLLTOOL=$lt_DLLTOOL | |
| - | |
| -# Command to associate shared and link libraries. | |
| -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | |
| - | |
| # The archiver. | |
| AR=$lt_AR | |
| - | |
| -# Flags to create an archive. | |
| AR_FLAGS=$lt_AR_FLAGS | |
| -# How to feed a file listing to the archiver. | |
| -archiver_list_spec=$lt_archiver_list_spec | |
| - | |
| # A symbol stripping program. | |
| STRIP=$lt_STRIP | |
| @@ -29493,27 +27805,12 @@ | |
| # 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 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 | |
| @@ -29523,9 +27820,6 @@ | |
| # Must we lock files when doing compilation? | |
| need_locks=$lt_need_locks | |
| -# Manifest tool. | |
| -MANIFEST_TOOL=$lt_MANIFEST_TOOL | |
| - | |
| # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | |
| DSYMUTIL=$lt_DSYMUTIL | |
| @@ -29604,11 +27898,8 @@ | |
| # Compile-time system search path for libraries. | |
| sys_lib_search_path_spec=$lt_sys_lib_search_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 | |
| +# Run-time system search path for libraries. | |
| +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Whether dlopen is supported. | |
| dlopen_support=$enable_dlopen | |
| @@ -29643,12 +27934,12 @@ | |
| # Compiler flag to turn off builtin functions. | |
| no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | |
| -# Additional compiler flags for building library objects. | |
| -pic_flag=$lt_lt_prog_compiler_pic | |
| - | |
| # How to pass a linker flag through the compiler. | |
| wl=$lt_lt_prog_compiler_wl | |
| +# Additional compiler flags for building library objects. | |
| +pic_flag=$lt_lt_prog_compiler_pic | |
| + | |
| # Compiler flag to prevent dynamic linking. | |
| link_static_flag=$lt_lt_prog_compiler_static | |
| @@ -29698,16 +27989,20 @@ | |
| # This must work even if \$libdir does not exist | |
| hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec | |
| +# If ld is used when linking, flag to hardcode \$libdir into a binary | |
| +# during linking. This must work even if \$libdir does not exist. | |
| +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld | |
| + | |
| # 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 | |
| @@ -29731,6 +28026,9 @@ | |
| # Whether libtool must link a program against all its dependency libraries. | |
| link_all_deplibs=$link_all_deplibs | |
| +# Fix the shell variable \$srcfile for the compiler. | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| + | |
| # Set to "yes" if exported symbols are required. | |
| always_export_symbols=$always_export_symbols | |
| @@ -29746,9 +28044,6 @@ | |
| # Commands necessary for linking programs (against libraries) with templates. | |
| prelink_cmds=$lt_prelink_cmds | |
| -# Commands necessary for finishing linking programs. | |
| -postlink_cmds=$lt_postlink_cmds | |
| - | |
| # Specify filename containing input files. | |
| file_list_spec=$lt_file_list_spec | |
| @@ -29773,72 +28068,13 @@ | |
| _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 | |
| aix3*) | |
| cat <<\_LT_EOF >> "$cfgfile" | |
| # 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 set != "${COLLECT_NAMES+set}"; then | |
| +if test "X${COLLECT_NAMES+set}" != Xset; then | |
| COLLECT_NAMES= | |
| export COLLECT_NAMES | |
| fi | |
| @@ -29847,17 +28083,217 @@ | |
| 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 | |
| # if finds mixed CR/LF and LF-only lines. Since sed operates in | |
| # text mode, it properly converts lines to CR/LF. This bash problem | |
| # is reportedly fixed, but why not run on old versions too? | |
| - sed '$q' "$ltmain" >> "$cfgfile" \ | |
| - || (rm -f "$cfgfile"; exit 1) | |
| + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | |
| + || (rm -f "$cfgfile"; exit 1) | |
| + | |
| + case $xsi_shell in | |
| + yes) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_dirname file append nondir_replacement | |
| +# Compute the dirname of FILE. If nonempty, add APPEND to the result, | |
| +# otherwise set result to NONDIR_REPLACEMENT. | |
| +func_dirname () | |
| +{ | |
| + case ${1} in | |
| + */*) func_dirname_result="${1%/*}${2}" ;; | |
| + * ) func_dirname_result="${3}" ;; | |
| + esac | |
| +} | |
| + | |
| +# func_basename file | |
| +func_basename () | |
| +{ | |
| + func_basename_result="${1##*/}" | |
| +} | |
| + | |
| +# func_dirname_and_basename file append nondir_replacement | |
| +# perform func_basename and func_dirname in a single function | |
| +# call: | |
| +# dirname: Compute the dirname of FILE. If nonempty, | |
| +# add APPEND to the result, otherwise set result | |
| +# to NONDIR_REPLACEMENT. | |
| +# value returned in "$func_dirname_result" | |
| +# basename: Compute filename of FILE. | |
| +# value retuned in "$func_basename_result" | |
| +# Implementation must be kept synchronized with func_dirname | |
| +# and func_basename. For efficiency, we do not delegate to | |
| +# those functions but instead duplicate the functionality here. | |
| +func_dirname_and_basename () | |
| +{ | |
| + case ${1} in | |
| + */*) func_dirname_result="${1%/*}${2}" ;; | |
| + * ) func_dirname_result="${3}" ;; | |
| + esac | |
| + func_basename_result="${1##*/}" | |
| +} | |
| + | |
| +# func_stripname prefix suffix name | |
| +# strip PREFIX and SUFFIX off of NAME. | |
| +# PREFIX and SUFFIX must not contain globbing or regex special | |
| +# characters, hashes, percent signs, but SUFFIX may contain a leading | |
| +# dot (in which case that matches only a dot). | |
| +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}"} | |
| +} | |
| + | |
| +# func_opt_split | |
| +func_opt_split () | |
| +{ | |
| + func_opt_split_opt=${1%%=*} | |
| + func_opt_split_arg=${1#*=} | |
| +} | |
| + | |
| +# func_lo2o object | |
| +func_lo2o () | |
| +{ | |
| + case ${1} in | |
| + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | |
| + *) func_lo2o_result=${1} ;; | |
| + esac | |
| +} | |
| + | |
| +# func_xform libobj-or-source | |
| +func_xform () | |
| +{ | |
| + func_xform_result=${1%.*}.lo | |
| +} | |
| + | |
| +# func_arith arithmetic-term... | |
| +func_arith () | |
| +{ | |
| + func_arith_result=$(( $* )) | |
| +} | |
| + | |
| +# func_len string | |
| +# STRING may not start with a hyphen. | |
| +func_len () | |
| +{ | |
| + func_len_result=${#1} | |
| +} | |
| + | |
| +_LT_EOF | |
| + ;; | |
| + *) # Bourne compatible functions. | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_dirname file append nondir_replacement | |
| +# Compute the dirname of FILE. If nonempty, add APPEND to the result, | |
| +# otherwise set result to NONDIR_REPLACEMENT. | |
| +func_dirname () | |
| +{ | |
| + # Extract subdirectory from the argument. | |
| + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | |
| + if test "X$func_dirname_result" = "X${1}"; then | |
| + func_dirname_result="${3}" | |
| + else | |
| + func_dirname_result="$func_dirname_result${2}" | |
| + fi | |
| +} | |
| + | |
| +# func_basename file | |
| +func_basename () | |
| +{ | |
| + func_basename_result=`$ECHO "${1}" | $SED "$basename"` | |
| +} | |
| + | |
| + | |
| +# func_stripname prefix suffix name | |
| +# strip PREFIX and SUFFIX off of NAME. | |
| +# PREFIX and SUFFIX must not contain globbing or regex special | |
| +# characters, hashes, percent signs, but SUFFIX may contain a leading | |
| +# dot (in which case that matches only a dot). | |
| +# func_strip_suffix prefix name | |
| +func_stripname () | |
| +{ | |
| + case ${2} in | |
| + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | |
| + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | |
| + esac | |
| +} | |
| + | |
| +# sed scripts: | |
| +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | |
| +my_sed_long_arg='1s/^-[^=]*=//' | |
| + | |
| +# func_opt_split | |
| +func_opt_split () | |
| +{ | |
| + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | |
| + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | |
| +} | |
| + | |
| +# func_lo2o object | |
| +func_lo2o () | |
| +{ | |
| + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | |
| +} | |
| + | |
| +# func_xform libobj-or-source | |
| +func_xform () | |
| +{ | |
| + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | |
| +} | |
| + | |
| +# func_arith arithmetic-term... | |
| +func_arith () | |
| +{ | |
| + func_arith_result=`expr "$@"` | |
| +} | |
| - mv -f "$cfgfile" "$ofile" || | |
| +# func_len string | |
| +# STRING may not start with a hyphen. | |
| +func_len () | |
| +{ | |
| + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | |
| +} | |
| + | |
| +_LT_EOF | |
| +esac | |
| + | |
| +case $lt_shell_append in | |
| + yes) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_append var value | |
| +# Append VALUE to the end of shell variable VAR. | |
| +func_append () | |
| +{ | |
| + eval "$1+=\$2" | |
| +} | |
| +_LT_EOF | |
| + ;; | |
| + *) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_append var value | |
| +# Append VALUE to the end of shell variable VAR. | |
| +func_append () | |
| +{ | |
| + eval "$1=\$$1\$2" | |
| +} | |
| + | |
| +_LT_EOF | |
| + ;; | |
| + esac | |
| + | |
| + | |
| + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | |
| + || (rm -f "$cfgfile"; exit 1) | |
| + | |
| + mv -f "$cfgfile" "$ofile" || | |
| (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | |
| chmod +x "$ofile" | |
| @@ -29885,12 +28321,12 @@ | |
| # Compiler flag to turn off builtin functions. | |
| no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_FC | |
| -# Additional compiler flags for building library objects. | |
| -pic_flag=$lt_lt_prog_compiler_pic_FC | |
| - | |
| # How to pass a linker flag through the compiler. | |
| wl=$lt_lt_prog_compiler_wl_FC | |
| +# Additional compiler flags for building library objects. | |
| +pic_flag=$lt_lt_prog_compiler_pic_FC | |
| + | |
| # Compiler flag to prevent dynamic linking. | |
| link_static_flag=$lt_lt_prog_compiler_static_FC | |
| @@ -29940,16 +28376,20 @@ | |
| # This must work even if \$libdir does not exist | |
| hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_FC | |
| +# If ld is used when linking, flag to hardcode \$libdir into a binary | |
| +# during linking. This must work even if \$libdir does not exist. | |
| +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_FC | |
| + | |
| # Whether we need a single "-rpath" flag with a separated argument. | |
| hardcode_libdir_separator=$lt_hardcode_libdir_separator_FC | |
| -# 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_FC | |
| -# 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_FC | |
| @@ -29973,6 +28413,9 @@ | |
| # Whether libtool must link a program against all its dependency libraries. | |
| link_all_deplibs=$link_all_deplibs_FC | |
| +# Fix the shell variable \$srcfile for the compiler. | |
| +fix_srcfile_path=$lt_fix_srcfile_path_FC | |
| + | |
| # Set to "yes" if exported symbols are required. | |
| always_export_symbols=$always_export_symbols_FC | |
| @@ -29988,9 +28431,6 @@ | |
| # Commands necessary for linking programs (against libraries) with templates. | |
| prelink_cmds=$lt_prelink_cmds_FC | |
| -# Commands necessary for finishing linking programs. | |
| -postlink_cmds=$lt_postlink_cmds_FC | |
| - | |
| # Specify filename containing input files. | |
| file_list_spec=$lt_file_list_spec_FC | |
| Only in ./gcc-4.7.0/libiberty: $libiberty_topdir | |
| Only in ./gcc-4.7.0/libquadmath: acl1 | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libquadmath/aclocal.m4 orig/gcc-4.7.0/libquadmath/aclocal.m4 | |
| --- ./gcc-4.7.0/libquadmath/aclocal.m4 2015-10-18 22:25:01.146047301 -0400 | |
| +++ orig/gcc-4.7.0/libquadmath/aclocal.m4 2011-02-13 06:45:53.000000000 -0500 | |
| @@ -1,8 +1,7 @@ | |
| -# generated automatically by aclocal 1.12 -*- Autoconf -*- | |
| +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- | |
| # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | |
| -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, | |
| -# Inc. | |
| +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -18,26 +17,24 @@ | |
| [m4_warning([this file was generated for autoconf 2.64. | |
| You have another version of autoconf. It may work, but is not guaranteed to. | |
| If you have problems, you may need to regenerate the build system entirely. | |
| -To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | |
| +To do so, use the procedure documented by the package, typically `autoreconf'.])]) | |
| -# Copyright (C) 2002-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 8 | |
| - | |
| # AM_AUTOMAKE_VERSION(VERSION) | |
| # ---------------------------- | |
| # Automake X.Y traces this macro to ensure aclocal.m4 has been | |
| # generated from the m4 files accompanying Automake X.Y. | |
| # (This private macro should not be called outside this file.) | |
| AC_DEFUN([AM_AUTOMAKE_VERSION], | |
| -[am__api_version='1.12' | |
| +[am__api_version='1.11' | |
| dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | |
| dnl require some minimum version. Point them to the right macro. | |
| -m4_if([$1], [1.12], [], | |
| +m4_if([$1], [1.11.1], [], | |
| [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | |
| ]) | |
| @@ -53,24 +50,22 @@ | |
| # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | |
| # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | |
| AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | |
| -[AM_AUTOMAKE_VERSION([1.12])dnl | |
| +[AM_AUTOMAKE_VERSION([1.11.1])dnl | |
| m4_ifndef([AC_AUTOCONF_VERSION], | |
| [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |
| _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | |
| # AM_AUX_DIR_EXPAND -*- Autoconf -*- | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 2 | |
| - | |
| # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | |
| -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to | |
| -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. | |
| +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to | |
| +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. | |
| # | |
| # Of course, Automake must honor this variable whenever it calls a | |
| # tool from the auxiliary directory. The problem is that $srcdir (and | |
| @@ -89,7 +84,7 @@ | |
| # | |
| # The reason of the latter failure is that $top_srcdir and $ac_aux_dir | |
| # are both prefixed by $srcdir. In an in-source build this is usually | |
| -# harmless because $srcdir is '.', but things will broke when you | |
| +# harmless because $srcdir is `.', but things will broke when you | |
| # start a VPATH build or use an absolute $srcdir. | |
| # | |
| # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, | |
| @@ -115,21 +110,22 @@ | |
| # AM_CONDITIONAL -*- Autoconf -*- | |
| -# Copyright (C) 1997-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 10 | |
| +# serial 9 | |
| # AM_CONDITIONAL(NAME, SHELL-CONDITION) | |
| # ------------------------------------- | |
| # Define a conditional. | |
| AC_DEFUN([AM_CONDITIONAL], | |
| -[AC_PREREQ([2.52])dnl | |
| - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], | |
| - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl | |
| +[AC_PREREQ(2.52)dnl | |
| + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], | |
| + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl | |
| AC_SUBST([$1_TRUE])dnl | |
| AC_SUBST([$1_FALSE])dnl | |
| _AM_SUBST_NOTMAKE([$1_TRUE])dnl | |
| @@ -148,15 +144,16 @@ | |
| Usually this means the macro was only invoked conditionally.]]) | |
| fi])]) | |
| -# Copyright (C) 1999-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 16 | |
| +# serial 10 | |
| -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be | |
| +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | |
| # written in clear, in which case automake, when reading aclocal.m4, | |
| # will think it sees a *use*, and therefore will trigger all it's | |
| # C support machinery. Also note that it means that autoscan, seeing | |
| @@ -179,12 +176,12 @@ | |
| AC_REQUIRE([AM_MAKE_INCLUDE])dnl | |
| AC_REQUIRE([AM_DEP_TRACK])dnl | |
| -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], | |
| - [$1], [CXX], [depcc="$CXX" am_compiler_list=], | |
| - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], | |
| - [$1], [UPC], [depcc="$UPC" am_compiler_list=], | |
| - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], | |
| - [depcc="$$1" am_compiler_list=]) | |
| +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], | |
| + [$1], CXX, [depcc="$CXX" am_compiler_list=], | |
| + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], | |
| + [$1], UPC, [depcc="$UPC" am_compiler_list=], | |
| + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], | |
| + [depcc="$$1" am_compiler_list=]) | |
| AC_CACHE_CHECK([dependency style of $depcc], | |
| [am_cv_$1_dependencies_compiler_type], | |
| @@ -192,9 +189,8 @@ | |
| # We make a subdir and do the tests there. Otherwise we can end up | |
| # making bogus files that we don't know about and never remove. For | |
| # instance it was reported that on HP-UX the gcc test will end up | |
| - # making a dummy file named 'D' -- because '-MD' means "put the output | |
| - # in D". | |
| - rm -rf conftest.dir | |
| + # making a dummy file named `D' -- because `-MD' means `put the output | |
| + # in D'. | |
| mkdir conftest.dir | |
| # Copy depcomp to subdir because otherwise we won't find it if we're | |
| # using a relative directory. | |
| @@ -233,16 +229,16 @@ | |
| : > sub/conftest.c | |
| for i in 1 2 3 4 5 6; do | |
| echo '#include "conftst'$i'.h"' >> sub/conftest.c | |
| - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with | |
| - # Solaris 10 /bin/sh. | |
| - echo '/* dummy */' > sub/conftst$i.h | |
| + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | |
| + # Solaris 8's {/usr,}/bin/sh. | |
| + touch sub/conftst$i.h | |
| done | |
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | |
| - # We check with '-c' and '-o' for the sake of the "dashmstdout" | |
| + # We check with `-c' and `-o' for the sake of the "dashmstdout" | |
| # mode. It turns out that the SunPro C++ compiler does not properly | |
| - # handle '-M -o', and we need to detect this. Also, some Intel | |
| - # versions had trouble with output in subdirs. | |
| + # handle `-M -o', and we need to detect this. Also, some Intel | |
| + # versions had trouble with output in subdirs | |
| am__obj=sub/conftest.${OBJEXT-o} | |
| am__minus_obj="-o $am__obj" | |
| case $depmode in | |
| @@ -251,16 +247,16 @@ | |
| test "$am__universal" = false || continue | |
| ;; | |
| nosideeffect) | |
| - # After this tag, mechanisms are not by side-effect, so they'll | |
| - # only be used when explicitly requested. | |
| + # after this tag, mechanisms are not by side-effect, so they'll | |
| + # only be used when explicitly requested | |
| if test "x$enable_dependency_tracking" = xyes; then | |
| continue | |
| else | |
| break | |
| fi | |
| ;; | |
| - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | |
| - # This compiler won't grok '-c -o', but also, the minuso test has | |
| + msvisualcpp | msvcmsys) | |
| + # This compiler won't grok `-c -o', but also, the minuso test has | |
| # not run yet. These depmodes are late enough in the game, and | |
| # so weak that their functioning should not be impacted. | |
| am__obj=conftest.${OBJEXT-o} | |
| @@ -308,7 +304,7 @@ | |
| # AM_SET_DEPDIR | |
| # ------------- | |
| # Choose a directory name for dependency files. | |
| -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. | |
| +# This macro is AC_REQUIREd in _AM_DEPENDENCIES | |
| AC_DEFUN([AM_SET_DEPDIR], | |
| [AC_REQUIRE([AM_SET_LEADING_DOT])dnl | |
| AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl | |
| @@ -318,34 +314,28 @@ | |
| # AM_DEP_TRACK | |
| # ------------ | |
| AC_DEFUN([AM_DEP_TRACK], | |
| -[AC_ARG_ENABLE([dependency-tracking], [dnl | |
| -AS_HELP_STRING( | |
| - [--enable-dependency-tracking], | |
| - [do not reject slow dependency extractors]) | |
| -AS_HELP_STRING( | |
| - [--disable-dependency-tracking], | |
| - [speeds up one-time build])]) | |
| +[AC_ARG_ENABLE(dependency-tracking, | |
| +[ --disable-dependency-tracking speeds up one-time build | |
| + --enable-dependency-tracking do not reject slow dependency extractors]) | |
| if test "x$enable_dependency_tracking" != xno; then | |
| am_depcomp="$ac_aux_dir/depcomp" | |
| AMDEPBACKSLASH='\' | |
| - am__nodep='_no' | |
| fi | |
| AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | |
| AC_SUBST([AMDEPBACKSLASH])dnl | |
| _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | |
| -AC_SUBST([am__nodep])dnl | |
| -_AM_SUBST_NOTMAKE([am__nodep])dnl | |
| ]) | |
| # Generate code to set up dependency tracking. -*- Autoconf -*- | |
| -# Copyright (C) 1999-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 6 | |
| +#serial 5 | |
| # _AM_OUTPUT_DEPENDENCY_COMMANDS | |
| # ------------------------------ | |
| @@ -364,7 +354,7 @@ | |
| # Strip MF so we end up with the name of the file. | |
| mf=`echo "$mf" | sed -e 's/:.*$//'` | |
| # Check whether this is an Automake generated Makefile or not. | |
| - # We used to match only the files named 'Makefile.in', but | |
| + # We used to match only the files named `Makefile.in', but | |
| # some people rename them; so instead we look at the file content. | |
| # Grep'ing the first line is not enough: some people post-process | |
| # each Makefile.in and add a new line on top of each file to say so. | |
| @@ -376,19 +366,21 @@ | |
| continue | |
| fi | |
| # Extract the definition of DEPDIR, am__include, and am__quote | |
| - # from the Makefile without running 'make'. | |
| + # from the Makefile without running `make'. | |
| DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | |
| test -z "$DEPDIR" && continue | |
| am__include=`sed -n 's/^am__include = //p' < "$mf"` | |
| test -z "am__include" && continue | |
| am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | |
| + # When using ansi2knr, U may be empty or an underscore; expand it | |
| + U=`sed -n 's/^U = //p' < "$mf"` | |
| # Find all dependency output files, they are included files with | |
| # $(DEPDIR) in their names. We invoke sed twice because it is the | |
| # simplest approach to changing $(DEPDIR) to its actual value in the | |
| # expansion. | |
| for file in `sed -n " | |
| s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | |
| - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | |
| + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | |
| # Make sure the directory exists. | |
| test -f "$dirpart/$file" && continue | |
| fdir=`AS_DIRNAME(["$file"])` | |
| @@ -406,7 +398,7 @@ | |
| # This macro should only be invoked once -- use via AC_REQUIRE. | |
| # | |
| # This code is only required when automatic dependency tracking | |
| -# is enabled. FIXME. This creates each '.P' file that we will | |
| +# is enabled. FIXME. This creates each `.P' file that we will | |
| # need in order to bootstrap the dependency handling code. | |
| AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | |
| [AC_CONFIG_COMMANDS([depfiles], | |
| @@ -416,13 +408,14 @@ | |
| # Do all the work for Automake. -*- Autoconf -*- | |
| -# Copyright (C) 1996-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | |
| +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 18 | |
| +# serial 16 | |
| # This macro actually does too much. Some checks are only needed if | |
| # your package does certain things. But this isn't really a big deal. | |
| @@ -473,25 +466,23 @@ | |
| AC_SUBST([VERSION], [$2])], | |
| [_AM_SET_OPTIONS([$1])dnl | |
| dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | |
| -m4_if( | |
| - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | |
| - [ok:ok],, | |
| +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, | |
| [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | |
| AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | |
| AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl | |
| _AM_IF_OPTION([no-define],, | |
| -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) | |
| - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl | |
| +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) | |
| + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl | |
| # Some tools Automake needs. | |
| AC_REQUIRE([AM_SANITY_CHECK])dnl | |
| AC_REQUIRE([AC_ARG_PROGRAM])dnl | |
| -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) | |
| -AM_MISSING_PROG([AUTOCONF], [autoconf]) | |
| -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) | |
| -AM_MISSING_PROG([AUTOHEADER], [autoheader]) | |
| -AM_MISSING_PROG([MAKEINFO], [makeinfo]) | |
| +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) | |
| +AM_MISSING_PROG(AUTOCONF, autoconf) | |
| +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) | |
| +AM_MISSING_PROG(AUTOHEADER, autoheader) | |
| +AM_MISSING_PROG(MAKEINFO, makeinfo) | |
| AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | |
| AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | |
| AC_REQUIRE([AM_PROG_MKDIR_P])dnl | |
| @@ -505,28 +496,28 @@ | |
| [_AM_PROG_TAR([v7])])]) | |
| _AM_IF_OPTION([no-dependencies],, | |
| [AC_PROVIDE_IFELSE([AC_PROG_CC], | |
| - [_AM_DEPENDENCIES([CC])], | |
| + [_AM_DEPENDENCIES(CC)], | |
| [define([AC_PROG_CC], | |
| - defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl | |
| + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl | |
| AC_PROVIDE_IFELSE([AC_PROG_CXX], | |
| - [_AM_DEPENDENCIES([CXX])], | |
| + [_AM_DEPENDENCIES(CXX)], | |
| [define([AC_PROG_CXX], | |
| - defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl | |
| + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | |
| AC_PROVIDE_IFELSE([AC_PROG_OBJC], | |
| - [_AM_DEPENDENCIES([OBJC])], | |
| + [_AM_DEPENDENCIES(OBJC)], | |
| [define([AC_PROG_OBJC], | |
| - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl | |
| + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | |
| ]) | |
| _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl | |
| -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the | |
| -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | |
| +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the | |
| +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | |
| dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. | |
| AC_CONFIG_COMMANDS_PRE(dnl | |
| [m4_provide_if([_AM_COMPILER_EXEEXT], | |
| [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | |
| ]) | |
| -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | |
| +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | |
| dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | |
| dnl mangled by Autoconf and run in a shell conditional statement. | |
| m4_define([_AC_COMPILER_EXEEXT], | |
| @@ -554,14 +545,12 @@ | |
| done | |
| echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 8 | |
| - | |
| # AM_PROG_INSTALL_SH | |
| # ------------------ | |
| # Define $install_sh. | |
| @@ -575,24 +564,25 @@ | |
| install_sh="\${SHELL} $am_aux_dir/install-sh" | |
| esac | |
| fi | |
| -AC_SUBST([install_sh])]) | |
| +AC_SUBST(install_sh)]) | |
| # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | |
| # From Jim Meyering | |
| -# Copyright (C) 1996-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 7 | |
| +# serial 5 | |
| # AM_MAINTAINER_MODE([DEFAULT-MODE]) | |
| # ---------------------------------- | |
| # Control maintainer-specific portions of Makefiles. | |
| -# Default is to disable them, unless 'enable' is passed literally. | |
| -# For symmetry, 'disable' may be passed as well. Anyway, the user | |
| +# Default is to disable them, unless `enable' is passed literally. | |
| +# For symmetry, `disable' may be passed as well. Anyway, the user | |
| # can override the default with the --enable/--disable switch. | |
| AC_DEFUN([AM_MAINTAINER_MODE], | |
| [m4_case(m4_default([$1], [disable]), | |
| @@ -600,14 +590,13 @@ | |
| [disable], [m4_define([am_maintainer_other], [enable])], | |
| [m4_define([am_maintainer_other], [enable]) | |
| m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) | |
| -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | |
| +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) | |
| dnl maintainer-mode's default is 'disable' unless 'enable' is passed | |
| AC_ARG_ENABLE([maintainer-mode], | |
| - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], | |
| - am_maintainer_other[ make rules and dependencies not useful | |
| - (and sometimes confusing) to the casual installer])], | |
| - [USE_MAINTAINER_MODE=$enableval], | |
| - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | |
| +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful | |
| + (and sometimes confusing) to the casual installer], | |
| + [USE_MAINTAINER_MODE=$enableval], | |
| + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | |
| AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | |
| AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) | |
| MAINT=$MAINTAINER_MODE_TRUE | |
| @@ -619,13 +608,13 @@ | |
| # Check to see how 'make' treats includes. -*- Autoconf -*- | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 5 | |
| +# serial 4 | |
| # AM_MAKE_INCLUDE() | |
| # ----------------- | |
| @@ -644,7 +633,7 @@ | |
| _am_result=none | |
| # First try GNU make style include. | |
| echo "include confinc" > confmf | |
| -# Ignore all kinds of additional output from 'make'. | |
| +# Ignore all kinds of additional output from `make'. | |
| case `$am_make -s -f confmf 2> /dev/null` in #( | |
| *the\ am__doit\ target*) | |
| am__include=include | |
| @@ -669,7 +658,8 @@ | |
| rm -f confinc confmf | |
| ]) | |
| -# Copyright (C) 1999-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| @@ -705,13 +695,14 @@ | |
| # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | |
| -# Copyright (C) 1997-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 7 | |
| +# serial 6 | |
| # AM_MISSING_PROG(NAME, PROGRAM) | |
| # ------------------------------ | |
| @@ -741,21 +732,19 @@ | |
| am_missing_run="$MISSING --run " | |
| else | |
| am_missing_run= | |
| - AC_MSG_WARN(['missing' script is too old or missing]) | |
| + AC_MSG_WARN([`missing' script is too old or missing]) | |
| fi | |
| ]) | |
| -# Copyright (C) 2003-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 2 | |
| - | |
| # AM_PROG_MKDIR_P | |
| # --------------- | |
| -# Check for 'mkdir -p'. | |
| +# Check for `mkdir -p'. | |
| AC_DEFUN([AM_PROG_MKDIR_P], | |
| [AC_PREREQ([2.60])dnl | |
| AC_REQUIRE([AC_PROG_MKDIR_P])dnl | |
| @@ -775,13 +764,13 @@ | |
| # Helper functions for option handling. -*- Autoconf -*- | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 6 | |
| +# serial 4 | |
| # _AM_MANGLE_OPTION(NAME) | |
| # ----------------------- | |
| @@ -789,13 +778,13 @@ | |
| [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | |
| # _AM_SET_OPTION(NAME) | |
| -# -------------------- | |
| +# ------------------------------ | |
| # Set option NAME. Presently that only means defining a flag for this option. | |
| AC_DEFUN([_AM_SET_OPTION], | |
| -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) | |
| +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | |
| # _AM_SET_OPTIONS(OPTIONS) | |
| -# ------------------------ | |
| +# ---------------------------------- | |
| # OPTIONS is a space-separated list of Automake options. | |
| AC_DEFUN([_AM_SET_OPTIONS], | |
| [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | |
| @@ -808,18 +797,22 @@ | |
| # Check to make sure that the build environment is sane. -*- Autoconf -*- | |
| -# Copyright (C) 1996-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 9 | |
| +# serial 5 | |
| # AM_SANITY_CHECK | |
| # --------------- | |
| AC_DEFUN([AM_SANITY_CHECK], | |
| [AC_MSG_CHECKING([whether build environment is sane]) | |
| +# Just in case | |
| +sleep 1 | |
| +echo timestamp > conftest.file | |
| # Reject unsafe characters in $srcdir or the absolute working directory | |
| # name. Accept space and tab only in the latter. | |
| am_lf=' | |
| @@ -830,40 +823,32 @@ | |
| esac | |
| case $srcdir in | |
| *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) | |
| - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; | |
| + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; | |
| esac | |
| -# Do 'set' in a subshell so we don't clobber the current shell's | |
| +# Do `set' in a subshell so we don't clobber the current shell's | |
| # arguments. Must try -L first in case configure is actually a | |
| # symlink; some systems play weird games with the mod time of symlinks | |
| # (eg FreeBSD returns the mod time of the symlink's containing | |
| # directory). | |
| if ( | |
| - am_has_slept=no | |
| - for am_try in 1 2; do | |
| - echo "timestamp, slept: $am_has_slept" > conftest.file | |
| - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| - if test "$[*]" = "X"; then | |
| - # -L didn't work. | |
| - set X `ls -t "$srcdir/configure" conftest.file` | |
| - fi | |
| - if test "$[*]" != "X $srcdir/configure conftest.file" \ | |
| - && test "$[*]" != "X conftest.file $srcdir/configure"; then | |
| - | |
| - # If neither matched, then we have a broken ls. This can happen | |
| - # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| - # broken ls alias from the environment. This has actually | |
| - # happened. Such a system could not be considered "sane". | |
| - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken | |
| - alias in your environment]) | |
| - fi | |
| - if test "$[2]" = conftest.file || test $am_try -eq 2; then | |
| - break | |
| - fi | |
| - # Just in case. | |
| - sleep 1 | |
| - am_has_slept=yes | |
| - done | |
| + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| + if test "$[*]" = "X"; then | |
| + # -L didn't work. | |
| + set X `ls -t "$srcdir/configure" conftest.file` | |
| + fi | |
| + rm -f conftest.file | |
| + if test "$[*]" != "X $srcdir/configure conftest.file" \ | |
| + && test "$[*]" != "X conftest.file $srcdir/configure"; then | |
| + | |
| + # If neither matched, then we have a broken ls. This can happen | |
| + # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| + # broken ls alias from the environment. This has actually | |
| + # happened. Such a system could not be considered "sane". | |
| + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken | |
| +alias in your environment]) | |
| + fi | |
| + | |
| test "$[2]" = conftest.file | |
| ) | |
| then | |
| @@ -873,61 +858,43 @@ | |
| AC_MSG_ERROR([newly created file is older than distributed files! | |
| Check your system clock]) | |
| fi | |
| -AC_MSG_RESULT([yes]) | |
| -# If we didn't sleep, we still need to ensure time stamps of config.status and | |
| -# generated files are strictly newer. | |
| -am_sleep_pid= | |
| -if grep 'slept: no' conftest.file >/dev/null 2>&1; then | |
| - ( sleep 1 ) & | |
| - am_sleep_pid=$! | |
| -fi | |
| -AC_CONFIG_COMMANDS_PRE( | |
| - [AC_MSG_CHECKING([that generated files are newer than configure]) | |
| - if test -n "$am_sleep_pid"; then | |
| - # Hide warnings about reused PIDs. | |
| - wait $am_sleep_pid 2>/dev/null | |
| - fi | |
| - AC_MSG_RESULT([done])]) | |
| -rm -f conftest.file | |
| -]) | |
| +AC_MSG_RESULT(yes)]) | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 2 | |
| - | |
| # AM_PROG_INSTALL_STRIP | |
| # --------------------- | |
| -# One issue with vendor 'install' (even GNU) is that you can't | |
| +# One issue with vendor `install' (even GNU) is that you can't | |
| # specify the program used to strip binaries. This is especially | |
| # annoying in cross-compiling environments, where the build's strip | |
| # is unlikely to handle the host's binaries. | |
| # Fortunately install-sh will honor a STRIPPROG variable, so we | |
| -# always use install-sh in "make install-strip", and initialize | |
| +# always use install-sh in `make install-strip', and initialize | |
| # STRIPPROG with the value of the STRIP variable (set by the user). | |
| AC_DEFUN([AM_PROG_INSTALL_STRIP], | |
| [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | |
| -# Installed binaries are usually stripped using 'strip' when the user | |
| -# run "make install-strip". However 'strip' might not be the right | |
| +# Installed binaries are usually stripped using `strip' when the user | |
| +# run `make install-strip'. However `strip' might not be the right | |
| # tool to use in cross-compilation environments, therefore Automake | |
| -# will honor the 'STRIP' environment variable to overrule this program. | |
| -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. | |
| +# will honor the `STRIP' environment variable to overrule this program. | |
| +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. | |
| if test "$cross_compiling" != no; then | |
| AC_CHECK_TOOL([STRIP], [strip], :) | |
| fi | |
| INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | |
| AC_SUBST([INSTALL_STRIP_PROGRAM])]) | |
| -# Copyright (C) 2006-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 3 | |
| +# serial 2 | |
| # _AM_SUBST_NOTMAKE(VARIABLE) | |
| # --------------------------- | |
| @@ -936,24 +903,24 @@ | |
| AC_DEFUN([_AM_SUBST_NOTMAKE]) | |
| # AM_SUBST_NOTMAKE(VARIABLE) | |
| -# -------------------------- | |
| +# --------------------------- | |
| # Public sister of _AM_SUBST_NOTMAKE. | |
| AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | |
| # Check how to create a tarball. -*- Autoconf -*- | |
| -# Copyright (C) 2004-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 3 | |
| +# serial 2 | |
| # _AM_PROG_TAR(FORMAT) | |
| # -------------------- | |
| # Check how to create a tarball in format FORMAT. | |
| -# FORMAT should be one of 'v7', 'ustar', or 'pax'. | |
| +# FORMAT should be one of `v7', `ustar', or `pax'. | |
| # | |
| # Substitute a variable $(am__tar) that is a command | |
| # writing to stdout a FORMAT-tarball containing the directory | |
| @@ -964,11 +931,10 @@ | |
| # a tarball read from stdin. | |
| # $(am__untar) < result.tar | |
| AC_DEFUN([_AM_PROG_TAR], | |
| -[# Always define AMTAR for backward compatibility. Yes, it's still used | |
| -# in the wild :-( We should find a proper way to deprecate it ... | |
| -AC_SUBST([AMTAR], ['$${TAR-tar}']) | |
| +[# Always define AMTAR for backward compatibility. | |
| +AM_MISSING_PROG([AMTAR], [tar]) | |
| m4_if([$1], [v7], | |
| - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], | |
| + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], | |
| [m4_case([$1], [ustar],, [pax],, | |
| [m4_fatal([Unknown tar format])]) | |
| AC_MSG_CHECKING([how to create a $1 tar archive]) | |
| @@ -976,7 +942,7 @@ | |
| _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | |
| _am_tools=${am_cv_prog_tar_$1-$_am_tools} | |
| # Do not fold the above two line into one, because Tru64 sh and | |
| -# Solaris sh will not grok spaces in the rhs of '-'. | |
| +# Solaris sh will not grok spaces in the rhs of `-'. | |
| for _am_tool in $_am_tools | |
| do | |
| case $_am_tool in | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libquadmath/config.h.in orig/gcc-4.7.0/libquadmath/config.h.in | |
| --- ./gcc-4.7.0/libquadmath/config.h.in 2015-10-18 20:10:23.000000000 -0400 | |
| +++ orig/gcc-4.7.0/libquadmath/config.h.in 2011-02-17 14:57:18.000000000 -0500 | |
| @@ -87,7 +87,8 @@ | |
| /* Define to 1 if you have the <wctype.h> header file. */ | |
| #undef HAVE_WCTYPE_H | |
| -/* Define to the sub-directory where libtool stores uninstalled libraries. */ | |
| +/* Define to the sub-directory in which libtool stores uninstalled libraries. | |
| + */ | |
| #undef LT_OBJDIR | |
| /* Define to 1 if your C compiler doesn't accept -c and -o together. */ | |
| Only in ./gcc-4.7.0/libquadmath: config.h.in~ | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libquadmath/configure orig/gcc-4.7.0/libquadmath/configure | |
| --- ./gcc-4.7.0/libquadmath/configure 2015-10-18 22:25:02.924056092 -0400 | |
| +++ orig/gcc-4.7.0/libquadmath/configure 2011-11-21 14:22:35.000000000 -0500 | |
| @@ -620,17 +620,13 @@ | |
| enable_static | |
| enable_shared | |
| lt_host_flags | |
| -LT_SYS_LIBRARY_PATH | |
| OTOOL64 | |
| OTOOL | |
| LIPO | |
| NMEDIT | |
| DSYMUTIL | |
| -MANIFEST_TOOL | |
| RANLIB | |
| -ac_ct_AR | |
| AR | |
| -DLLTOOL | |
| OBJDUMP | |
| LN_S | |
| NM | |
| @@ -650,7 +646,6 @@ | |
| am__fastdepCC_FALSE | |
| am__fastdepCC_TRUE | |
| CCDEPMODE | |
| -am__nodep | |
| AMDEPBACKSLASH | |
| AMDEP_FALSE | |
| AMDEP_TRUE | |
| @@ -748,9 +743,7 @@ | |
| enable_static | |
| with_pic | |
| enable_fast_install | |
| -with_aix_soname | |
| with_gnu_ld | |
| -with_sysroot | |
| enable_libtool_lock | |
| enable_maintainer_mode | |
| enable_multilib | |
| @@ -765,8 +758,7 @@ | |
| LDFLAGS | |
| LIBS | |
| CPPFLAGS | |
| -CPP | |
| -LT_SYS_LIBRARY_PATH' | |
| +CPP' | |
| # Initialize some variables set by options. | |
| @@ -1390,18 +1382,15 @@ | |
| --enable-version-specific-runtime-libs | |
| specify that runtime libraries should be installed | |
| in a compiler-specific directory | |
| - --enable-dependency-tracking | |
| - do not reject slow dependency extractors | |
| - --disable-dependency-tracking | |
| - speeds up one-time build | |
| + --disable-dependency-tracking speeds up one-time build | |
| + --enable-dependency-tracking do not reject slow dependency extractors | |
| --enable-shared[=PKGS] build shared libraries [default=yes] | |
| --enable-static[=PKGS] build static libraries [default=yes] | |
| --enable-fast-install[=PKGS] | |
| optimize for fast installation [default=yes] | |
| --disable-libtool-lock avoid locking (might break parallel builds) | |
| - --enable-maintainer-mode | |
| - enable make rules and dependencies not useful (and | |
| - sometimes confusing) to the casual installer | |
| + --enable-maintainer-mode enable make rules and dependencies not useful | |
| + (and sometimes confusing) to the casual installer | |
| --enable-multilib build many library versions (default) | |
| --disable-symvers disable symbol versioning for libquadmath | |
| --enable-generated-files-in-srcdir | |
| @@ -1413,14 +1402,9 @@ | |
| --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | |
| --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | |
| --with-bugurl=URL Direct users to URL to report a bug | |
| - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | |
| + --with-pic 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). | |
| Some influential environment variables: | |
| CC C compiler command | |
| @@ -1431,8 +1415,6 @@ | |
| CPPFLAGS C/C++/Objective 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. | |
| @@ -2391,7 +2373,7 @@ | |
| target_alias=${target_alias-$host_alias} | |
| -am__api_version='1.12' | |
| +am__api_version='1.11' | |
| # Find a good install program. We prefer a C program (faster), | |
| # so one script is as good as another. But avoid the broken or | |
| @@ -2488,6 +2470,9 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 | |
| $as_echo_n "checking whether build environment is sane... " >&6; } | |
| +# Just in case | |
| +sleep 1 | |
| +echo timestamp > conftest.file | |
| # Reject unsafe characters in $srcdir or the absolute working directory | |
| # name. Accept space and tab only in the latter. | |
| am_lf=' | |
| @@ -2498,40 +2483,32 @@ | |
| esac | |
| case $srcdir in | |
| *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | |
| - as_fn_error "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; | |
| + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; | |
| esac | |
| -# Do 'set' in a subshell so we don't clobber the current shell's | |
| +# Do `set' in a subshell so we don't clobber the current shell's | |
| # arguments. Must try -L first in case configure is actually a | |
| # symlink; some systems play weird games with the mod time of symlinks | |
| # (eg FreeBSD returns the mod time of the symlink's containing | |
| # directory). | |
| if ( | |
| - am_has_slept=no | |
| - for am_try in 1 2; do | |
| - echo "timestamp, slept: $am_has_slept" > conftest.file | |
| - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| - if test "$*" = "X"; then | |
| - # -L didn't work. | |
| - set X `ls -t "$srcdir/configure" conftest.file` | |
| - fi | |
| - if test "$*" != "X $srcdir/configure conftest.file" \ | |
| - && test "$*" != "X conftest.file $srcdir/configure"; then | |
| + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| + if test "$*" = "X"; then | |
| + # -L didn't work. | |
| + set X `ls -t "$srcdir/configure" conftest.file` | |
| + fi | |
| + rm -f conftest.file | |
| + if test "$*" != "X $srcdir/configure conftest.file" \ | |
| + && test "$*" != "X conftest.file $srcdir/configure"; then | |
| + | |
| + # If neither matched, then we have a broken ls. This can happen | |
| + # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| + # broken ls alias from the environment. This has actually | |
| + # happened. Such a system could not be considered "sane". | |
| + as_fn_error "ls -t appears to fail. Make sure there is not a broken | |
| +alias in your environment" "$LINENO" 5 | |
| + fi | |
| - # If neither matched, then we have a broken ls. This can happen | |
| - # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| - # broken ls alias from the environment. This has actually | |
| - # happened. Such a system could not be considered "sane". | |
| - as_fn_error "ls -t appears to fail. Make sure there is not a broken | |
| - alias in your environment" "$LINENO" 5 | |
| - fi | |
| - if test "$2" = conftest.file || test $am_try -eq 2; then | |
| - break | |
| - fi | |
| - # Just in case. | |
| - sleep 1 | |
| - am_has_slept=yes | |
| - done | |
| test "$2" = conftest.file | |
| ) | |
| then | |
| @@ -2543,16 +2520,6 @@ | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |
| $as_echo "yes" >&6; } | |
| -# If we didn't sleep, we still need to ensure time stamps of config.status and | |
| -# generated files are strictly newer. | |
| -am_sleep_pid= | |
| -if grep 'slept: no' conftest.file >/dev/null 2>&1; then | |
| - ( sleep 1 ) & | |
| - am_sleep_pid=$! | |
| -fi | |
| - | |
| -rm -f conftest.file | |
| - | |
| test "$program_prefix" != NONE && | |
| program_transform_name="s&^&$program_prefix&;$program_transform_name" | |
| # Use a double $ so make ignores it. | |
| @@ -2579,8 +2546,8 @@ | |
| am_missing_run="$MISSING --run " | |
| else | |
| am_missing_run= | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 | |
| -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} | |
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 | |
| +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} | |
| fi | |
| if test x"${install_sh}" != xset; then | |
| @@ -2592,10 +2559,10 @@ | |
| esac | |
| fi | |
| -# Installed binaries are usually stripped using 'strip' when the user | |
| -# run "make install-strip". However 'strip' might not be the right | |
| +# Installed binaries are usually stripped using `strip' when the user | |
| +# run `make install-strip'. However `strip' might not be the right | |
| # tool to use in cross-compilation environments, therefore Automake | |
| -# will honor the 'STRIP' environment variable to overrule this program. | |
| +# will honor the `STRIP' environment variable to overrule this program. | |
| if test "$cross_compiling" != no; then | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | |
| @@ -2874,11 +2841,11 @@ | |
| # We need awk for the "check" target. 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}' | |
| +# Always define AMTAR for backward compatibility. | |
| + | |
| +AMTAR=${AMTAR-"${am_missing_run}tar"} | |
| -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | |
| +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' | |
| @@ -2922,7 +2889,7 @@ | |
| _am_result=none | |
| # First try GNU make style include. | |
| echo "include confinc" > confmf | |
| -# Ignore all kinds of additional output from 'make'. | |
| +# Ignore all kinds of additional output from `make'. | |
| case `$am_make -s -f confmf 2> /dev/null` in #( | |
| *the\ am__doit\ target*) | |
| am__include=include | |
| @@ -2955,7 +2922,6 @@ | |
| if test "x$enable_dependency_tracking" != xno; then | |
| am_depcomp="$ac_aux_dir/depcomp" | |
| AMDEPBACKSLASH='\' | |
| - am__nodep='_no' | |
| fi | |
| if test "x$enable_dependency_tracking" != xno; then | |
| AMDEP_TRUE= | |
| @@ -3771,9 +3737,8 @@ | |
| # We make a subdir and do the tests there. Otherwise we can end up | |
| # making bogus files that we don't know about and never remove. For | |
| # instance it was reported that on HP-UX the gcc test will end up | |
| - # making a dummy file named 'D' -- because '-MD' means "put the output | |
| - # in D". | |
| - rm -rf conftest.dir | |
| + # making a dummy file named `D' -- because `-MD' means `put the output | |
| + # in D'. | |
| mkdir conftest.dir | |
| # Copy depcomp to subdir because otherwise we won't find it if we're | |
| # using a relative directory. | |
| @@ -3807,16 +3772,16 @@ | |
| : > sub/conftest.c | |
| for i in 1 2 3 4 5 6; do | |
| echo '#include "conftst'$i'.h"' >> sub/conftest.c | |
| - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with | |
| - # Solaris 10 /bin/sh. | |
| - echo '/* dummy */' > sub/conftst$i.h | |
| + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | |
| + # Solaris 8's {/usr,}/bin/sh. | |
| + touch sub/conftst$i.h | |
| done | |
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | |
| - # We check with '-c' and '-o' for the sake of the "dashmstdout" | |
| + # We check with `-c' and `-o' for the sake of the "dashmstdout" | |
| # mode. It turns out that the SunPro C++ compiler does not properly | |
| - # handle '-M -o', and we need to detect this. Also, some Intel | |
| - # versions had trouble with output in subdirs. | |
| + # handle `-M -o', and we need to detect this. Also, some Intel | |
| + # versions had trouble with output in subdirs | |
| am__obj=sub/conftest.${OBJEXT-o} | |
| am__minus_obj="-o $am__obj" | |
| case $depmode in | |
| @@ -3825,16 +3790,16 @@ | |
| test "$am__universal" = false || continue | |
| ;; | |
| nosideeffect) | |
| - # After this tag, mechanisms are not by side-effect, so they'll | |
| - # only be used when explicitly requested. | |
| + # after this tag, mechanisms are not by side-effect, so they'll | |
| + # only be used when explicitly requested | |
| if test "x$enable_dependency_tracking" = xyes; then | |
| continue | |
| else | |
| break | |
| fi | |
| ;; | |
| - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | |
| - # This compiler won't grok '-c -o', but also, the minuso test has | |
| + msvisualcpp | msvcmsys) | |
| + # This compiler won't grok `-c -o', but also, the minuso test has | |
| # not run yet. These depmodes are late enough in the game, and | |
| # so weak that their functioning should not be impacted. | |
| am__obj=conftest.${OBJEXT-o} | |
| @@ -4463,8 +4428,8 @@ | |
| -macro_version='2.4.6' | |
| -macro_revision='2.4.6' | |
| +macro_version='2.2.7a' | |
| +macro_revision='1.3134' | |
| @@ -4478,7 +4443,7 @@ | |
| -ltmain=$ac_aux_dir/ltmain.sh | |
| +ltmain="$ac_aux_dir/ltmain.sh" | |
| # Backslashify metacharacters that are still active within | |
| # double-quoted strings. | |
| @@ -4504,7 +4469,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | |
| $as_echo_n "checking how to print strings... " >&6; } | |
| # Test print first, because it will be a builtin if present. | |
| -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | |
| +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | |
| test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| ECHO='print -r --' | |
| elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| @@ -4527,7 +4492,7 @@ | |
| $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 | |
| @@ -4720,19 +4685,19 @@ | |
| # Check whether --with-gnu-ld was given. | |
| if test "${with_gnu_ld+set}" = set; then : | |
| - withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes | |
| + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | |
| else | |
| with_gnu_ld=no | |
| fi | |
| ac_prog=ld | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; 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` ;; | |
| @@ -4746,7 +4711,7 @@ | |
| 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. | |
| @@ -4757,7 +4722,7 @@ | |
| with_gnu_ld=unknown | |
| ;; | |
| esac | |
| -elif test yes = "$with_gnu_ld"; then | |
| +elif test "$with_gnu_ld" = yes; then | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 | |
| $as_echo_n "checking for GNU ld... " >&6; } | |
| else | |
| @@ -4768,32 +4733,32 @@ | |
| $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 no != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != no && break | |
| ;; | |
| *) | |
| - test yes != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != yes && 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; } | |
| @@ -4836,38 +4801,33 @@ | |
| 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 | |
| - # 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'*) | |
| + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in | |
| + */dev/null* | *'Invalid file or object type'*) | |
| lt_cv_path_NM="$tmp_nm -B" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in | |
| */dev/null*) | |
| lt_cv_path_NM="$tmp_nm -p" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but | |
| @@ -4878,15 +4838,15 @@ | |
| 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 no != "$lt_cv_path_NM"; then | |
| - NM=$lt_cv_path_NM | |
| +if test "$lt_cv_path_NM" != "no"; then | |
| + NM="$lt_cv_path_NM" | |
| else | |
| # Didn't find any BSD compatible name lister, look for dumpbin. | |
| if test -n "$DUMPBIN"; then : | |
| @@ -4992,9 +4952,9 @@ | |
| fi | |
| fi | |
| - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in | |
| + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | |
| *COFF*) | |
| - DUMPBIN="$DUMPBIN -symbols -headers" | |
| + DUMPBIN="$DUMPBIN -symbols" | |
| ;; | |
| *) | |
| DUMPBIN=: | |
| @@ -5002,8 +4962,8 @@ | |
| esac | |
| fi | |
| - if test : != "$DUMPBIN"; then | |
| - NM=$DUMPBIN | |
| + if test "$DUMPBIN" != ":"; then | |
| + NM="$DUMPBIN" | |
| fi | |
| fi | |
| test -z "$NM" && NM=nm | |
| @@ -5054,7 +5014,7 @@ | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| i=0 | |
| - teststring=ABCD | |
| + teststring="ABCD" | |
| case $build_os in | |
| msdosdjgpp*) | |
| @@ -5094,7 +5054,7 @@ | |
| lt_cv_sys_max_cmd_len=8192; | |
| ;; | |
| - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) | |
| + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) | |
| # 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` | |
| @@ -5113,11 +5073,6 @@ | |
| lt_cv_sys_max_cmd_len=196608 | |
| ;; | |
| - os2*) | |
| - # The test takes a long time on OS/2. | |
| - lt_cv_sys_max_cmd_len=8192 | |
| - ;; | |
| - | |
| osf*) | |
| # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | |
| # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | |
| @@ -5144,23 +5099,22 @@ | |
| ;; | |
| *) | |
| 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 | |
| + if test -n "$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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | |
| = "X$teststring$teststring"; } >/dev/null 2>&1 && | |
| - test 17 != "$i" # 1/2 MB should be enough | |
| + test $i != 17 # 1/2 MB should be enough | |
| do | |
| i=`expr $i + 1` | |
| teststring=$teststring$teststring | |
| @@ -5178,7 +5132,7 @@ | |
| 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 | |
| @@ -5196,6 +5150,30 @@ | |
| : ${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"}, \ | |
| + = c,a/b,, \ | |
| + && 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 | |
| @@ -5227,80 +5205,6 @@ | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | |
| -if test "${lt_cv_to_host_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| - *-*-cygwin* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | |
| - ;; | |
| - esac | |
| - ;; | |
| - * ) # unhandled hosts (and "normal" native builds) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_host_file_cmd=$lt_cv_to_host_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_host_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | |
| -if test "${lt_cv_to_tool_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - #assume ordinary cross tools, or native build. | |
| -lt_cv_to_tool_file_cmd=func_convert_file_noop | |
| -case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | |
| $as_echo_n "checking for $LD option to reload object files... " >&6; } | |
| if test "${lt_cv_ld_reload_flag+set}" = set; then : | |
| @@ -5317,14 +5221,9 @@ | |
| esac | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| case $host_os in | |
| - cygwin* | mingw* | pw32* | cegcc*) | |
| - if test yes != "$GCC"; then | |
| - reload_cmds=false | |
| - fi | |
| - ;; | |
| darwin*) | |
| - if test yes = "$GCC"; then | |
| - reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' | |
| + if test "$GCC" = yes; then | |
| + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | |
| else | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| fi | |
| @@ -5452,13 +5351,13 @@ | |
| # 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 | |
| -# 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. | |
| +# 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. | |
| case $host_os in | |
| aix[4-9]*) | |
| @@ -5485,12 +5384,12 @@ | |
| # 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. | |
| - if ( file / ) >/dev/null 2>&1; then | |
| + # 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 | |
| lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | |
| lt_cv_file_magic_cmd='func_win32_libid' | |
| else | |
| - # Keep this pattern in sync with the one in func_win32_libid. | |
| - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | |
| + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| fi | |
| ;; | |
| @@ -5521,6 +5420,10 @@ | |
| fi | |
| ;; | |
| +gnu*) | |
| + lt_cv_deplibs_check_method=pass_all | |
| + ;; | |
| + | |
| haiku*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -5558,8 +5461,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -# This must be glibc/ELF. | |
| -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-gnu) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -5581,8 +5484,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -openbsd* | bitrig*) | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| +openbsd*) | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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)$' | |
| @@ -5635,29 +5538,11 @@ | |
| tpf*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -os2*) | |
| - lt_cv_deplibs_check_method=pass_all | |
| - ;; | |
| esac | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | |
| $as_echo "$lt_cv_deplibs_check_method" >&6; } | |
| - | |
| -file_magic_glob= | |
| -want_nocaseglob=no | |
| -if test "$build" = "$host"; then | |
| - case $host_os in | |
| - mingw* | pw32*) | |
| - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | |
| - want_nocaseglob=yes | |
| - else | |
| - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | |
| - fi | |
| - ;; | |
| - esac | |
| -fi | |
| - | |
| file_magic_cmd=$lt_cv_file_magic_cmd | |
| deplibs_check_method=$lt_cv_deplibs_check_method | |
| test -z "$deplibs_check_method" && deplibs_check_method=unknown | |
| @@ -5673,162 +5558,9 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -if test -n "$ac_tool_prefix"; then | |
| - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | |
| -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$DLLTOOL"; then | |
| - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -DLLTOOL=$ac_cv_prog_DLLTOOL | |
| -if test -n "$DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | |
| -$as_echo "$DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_DLLTOOL"; then | |
| - ac_ct_DLLTOOL=$DLLTOOL | |
| - # Extract the first word of "dlltool", so it can be a program name with args. | |
| -set dummy dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_DLLTOOL"; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | |
| -if test -n "$ac_ct_DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | |
| -$as_echo "$ac_ct_DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_DLLTOOL" = x; then | |
| - DLLTOOL="false" | |
| - else | |
| - case $cross_compiling:$ac_tool_warned in | |
| -yes:) | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | |
| -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
| -ac_tool_warned=yes ;; | |
| -esac | |
| - DLLTOOL=$ac_ct_DLLTOOL | |
| - fi | |
| -else | |
| - DLLTOOL="$ac_cv_prog_DLLTOOL" | |
| -fi | |
| - | |
| -test -z "$DLLTOOL" && DLLTOOL=dlltool | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | |
| -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | |
| -if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_sharedlib_from_linklib_cmd='unknown' | |
| - | |
| -case $host_os in | |
| -cygwin* | mingw* | pw32* | cegcc*) | |
| - # 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 | |
| - ;; | |
| - *) | |
| - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | |
| - ;; | |
| - esac | |
| - ;; | |
| -*) | |
| - # fallback: assume linklib IS sharedlib | |
| - lt_cv_sharedlib_from_linklib_cmd=$ECHO | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | |
| -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | |
| -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | |
| -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in ar | |
| - do | |
| - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | |
| +set dummy ${ac_tool_prefix}ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_AR+set}" = set; then : | |
| @@ -5844,7 +5576,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | |
| + ac_cv_prog_AR="${ac_tool_prefix}ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -5864,15 +5596,11 @@ | |
| fi | |
| - test -n "$AR" && break | |
| - done | |
| fi | |
| -if test -z "$AR"; then | |
| +if test -z "$ac_cv_prog_AR"; then | |
| ac_ct_AR=$AR | |
| - for ac_prog in ar | |
| -do | |
| - # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_prog; ac_word=$2 | |
| + # Extract the first word of "ar", so it can be a program name with args. | |
| +set dummy ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | |
| @@ -5888,7 +5616,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_AR="$ac_prog" | |
| + ac_cv_prog_ac_ct_AR="ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -5907,10 +5635,6 @@ | |
| $as_echo "no" >&6; } | |
| fi | |
| - | |
| - test -n "$ac_ct_AR" && break | |
| -done | |
| - | |
| if test "x$ac_ct_AR" = x; then | |
| AR="false" | |
| else | |
| @@ -5922,72 +5646,16 @@ | |
| esac | |
| AR=$ac_ct_AR | |
| fi | |
| -fi | |
| - | |
| -: ${AR=ar} | |
| -: ${AR_FLAGS=cru} | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | |
| -$as_echo_n "checking for archiver @FILE support... " >&6; } | |
| -if test "${lt_cv_ar_at_file+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| else | |
| - lt_cv_ar_at_file=no | |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| -/* end confdefs.h. */ | |
| + AR="$ac_cv_prog_AR" | |
| +fi | |
| -int | |
| -main () | |
| -{ | |
| +test -z "$AR" && AR=ar | |
| +test -z "$AR_FLAGS" && AR_FLAGS=cru | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -if ac_fn_c_try_compile "$LINENO"; then : | |
| - echo conftest.$ac_objext > conftest.lst | |
| - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | |
| - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - 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 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - if test 0 -ne "$ac_status"; then | |
| - lt_cv_ar_at_file=@ | |
| - fi | |
| - fi | |
| - rm -f conftest.* libconftest.a | |
| -fi | |
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -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 no = "$lt_cv_ar_at_file"; then | |
| - archiver_list_spec= | |
| -else | |
| - archiver_list_spec=$lt_cv_ar_at_file | |
| -fi | |
| @@ -6200,14 +5868,14 @@ | |
| if test -n "$RANLIB"; then | |
| case $host_os in | |
| - bitrig* | openbsd*) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | |
| + openbsd*) | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | |
| ;; | |
| *) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | |
| ;; | |
| esac | |
| - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" | |
| + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | |
| fi | |
| case $host_os in | |
| @@ -6290,7 +5958,7 @@ | |
| symcode='[ABCDGISTW]' | |
| ;; | |
| hpux*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| symcode='[ABCDEGRST]' | |
| fi | |
| ;; | |
| @@ -6323,44 +5991,14 @@ | |
| 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"\ | |
| -$lt_cdecl_hook\ | |
| -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ | |
| -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" | |
| +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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"\ | |
| -$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'" | |
| +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'" | |
| # Handle CRLF in mingw tool chain | |
| opt_cr= | |
| @@ -6378,29 +6016,24 @@ | |
| # 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, | |
| - # D for any global variable and I for any imported variable. | |
| + # Fake it for dumpbin and say T for any non-static function | |
| + # and D for any global 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=\"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))}"\ | |
| +" {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))}"\ | |
| " ' prfx=^$ac_symprfx" | |
| else | |
| lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | |
| fi | |
| - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | |
| # Check to see that the pipe works correctly. | |
| pipe_works=no | |
| @@ -6442,18 +6075,6 @@ | |
| if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | |
| 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 can't be const, because runtime | |
| - relocations are performed -- see ld's documentation on pseudo-relocs. */ | |
| -# define LT_DLSYM_CONST | |
| -#elif defined __osf__ | |
| -/* This system does not cope well with relocations in const data. */ | |
| -# define LT_DLSYM_CONST | |
| -#else | |
| -# define LT_DLSYM_CONST const | |
| -#endif | |
| - | |
| #ifdef __cplusplus | |
| extern "C" { | |
| #endif | |
| @@ -6465,7 +6086,7 @@ | |
| cat <<_LT_EOF >> conftest.$ac_ext | |
| /* The mapping between symbol names and symbols. */ | |
| -LT_DLSYM_CONST struct { | |
| +const struct { | |
| const char *name; | |
| void *address; | |
| } | |
| @@ -6473,7 +6094,7 @@ | |
| { | |
| { "@PROGRAM@", (void *) 0 }, | |
| _LT_EOF | |
| - $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| cat <<\_LT_EOF >> conftest.$ac_ext | |
| {0, (void *) 0} | |
| }; | |
| @@ -6491,19 +6112,19 @@ | |
| _LT_EOF | |
| # Now try linking the two files. | |
| mv conftest.$ac_objext conftstm.$ac_objext | |
| - lt_globsym_save_LIBS=$LIBS | |
| - lt_globsym_save_CFLAGS=$CFLAGS | |
| - LIBS=conftstm.$ac_objext | |
| + lt_save_LIBS="$LIBS" | |
| + lt_save_CFLAGS="$CFLAGS" | |
| + 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 | |
| - CFLAGS=$lt_globsym_save_CFLAGS | |
| + LIBS="$lt_save_LIBS" | |
| + CFLAGS="$lt_save_CFLAGS" | |
| else | |
| echo "cannot find nm_test_func in $nlist" >&5 | |
| fi | |
| @@ -6520,7 +6141,7 @@ | |
| rm -rf conftest* conftst* | |
| # Do not use the global_symbol_pipe unless it works. | |
| - if test yes = "$pipe_works"; then | |
| + if test "$pipe_works" = yes; then | |
| break | |
| else | |
| lt_cv_sys_global_symbol_pipe= | |
| @@ -6540,18 +6161,6 @@ | |
| $as_echo "ok" >&6; } | |
| fi | |
| -# Response file support. | |
| -if test "$lt_cv_nm_interface" = "MS dumpbin"; then | |
| - nm_file_list_spec='@' | |
| -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | |
| - nm_file_list_spec='@' | |
| -fi | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| @@ -6573,146 +6182,18 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | |
| -$as_echo_n "checking for sysroot... " >&6; } | |
| - | |
| -# Check whether --with-sysroot was given. | |
| -if test "${with_sysroot+set}" = set; then : | |
| - withval=$with_sysroot; | |
| -else | |
| - with_sysroot=no | |
| +# Check whether --enable-libtool-lock was given. | |
| +if test "${enable_libtool_lock+set}" = set; then : | |
| + enableval=$enable_libtool_lock; | |
| fi | |
| - | |
| -lt_sysroot= | |
| -case $with_sysroot in #( | |
| - yes) | |
| - if test yes = "$GCC"; then | |
| - lt_sysroot=`$CC --print-sysroot 2>/dev/null` | |
| - fi | |
| - ;; #( | |
| - /*) | |
| - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | |
| - ;; #( | |
| - no|'') | |
| - ;; #( | |
| - *) | |
| - { $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 | |
| - | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | |
| -$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 test "${ac_cv_path_lt_DD+set}" = set; 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" | |
| - { test -f "$ac_path_lt_DD" && $as_test_x "$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 test "${lt_cv_truncate_bin+set}" = set; 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 no = "$enable_libtool_lock" || enable_libtool_lock=yes | |
| +test "x$enable_libtool_lock" != xno && 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 what ABI is being produced by ac_compile, and set mode | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6721,25 +6202,24 @@ | |
| 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| 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 yes = "$lt_cv_prog_gnu_ld"; then | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| case `/usr/bin/file conftest.$ac_objext` in | |
| *32-bit*) | |
| LD="${LD-ld} -melf32bsmip" | |
| @@ -6768,50 +6248,9 @@ | |
| 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*| \ | |
| +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | |
| s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | |
| - # 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. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6825,19 +6264,9 @@ | |
| LD="${LD-ld} -m elf_i386_fbsd" | |
| ;; | |
| x86_64-*linux*) | |
| - case `/usr/bin/file conftest.o` in | |
| - *x86-64*) | |
| - LD="${LD-ld} -m elf32_x86_64" | |
| - ;; | |
| - *) | |
| - LD="${LD-ld} -m elf_i386" | |
| - ;; | |
| - esac | |
| - ;; | |
| - powerpc64le-*linux*) | |
| - LD="${LD-ld} -m elf32lppclinux" | |
| + LD="${LD-ld} -m elf_i386" | |
| ;; | |
| - powerpc64-*linux*) | |
| + ppc64-*linux*|powerpc64-*linux*) | |
| LD="${LD-ld} -m elf32ppclinux" | |
| ;; | |
| s390x-*linux*) | |
| @@ -6856,10 +6285,7 @@ | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_x86_64" | |
| ;; | |
| - powerpcle-*linux*) | |
| - LD="${LD-ld} -m elf64lppc" | |
| - ;; | |
| - powerpc-*linux*) | |
| + ppc*-*linux*|powerpc*-*linux*) | |
| LD="${LD-ld} -m elf64ppc" | |
| ;; | |
| s390*-*linux*|s390*-*tpf*) | |
| @@ -6877,7 +6303,7 @@ | |
| *-*-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; } | |
| @@ -6920,14 +6346,13 @@ | |
| 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 yes != "$lt_cv_cc_needs_belf"; then | |
| + if test x"$lt_cv_cc_needs_belf" != x"yes"; 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| +sparc*-*solaris*) | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6937,20 +6362,7 @@ | |
| case `/usr/bin/file conftest.o` in | |
| *64-bit*) | |
| case $lt_cv_prog_gnu_ld in | |
| - yes*) | |
| - case $host in | |
| - i?86-*-solaris*|x86_64-*-solaris*) | |
| - LD="${LD-ld} -m elf_x86_64" | |
| - ;; | |
| - sparc*-*-solaris*) | |
| - LD="${LD-ld} -m elf64_sparc" | |
| - ;; | |
| - 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 | |
| - fi | |
| - ;; | |
| + yes*) LD="${LD-ld} -m elf64_sparc" ;; | |
| *) | |
| if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | |
| LD="${LD-ld} -64" | |
| @@ -6964,124 +6376,7 @@ | |
| ;; | |
| esac | |
| -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. | |
| -set dummy ${ac_tool_prefix}mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$MANIFEST_TOOL"; then | |
| - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | |
| -if test -n "$MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | |
| -$as_echo "$MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | |
| - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | |
| - # Extract the first word of "mt", so it can be a program name with args. | |
| -set dummy mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | |
| -if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | |
| -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_MANIFEST_TOOL" = x; then | |
| - MANIFEST_TOOL=":" | |
| - else | |
| - case $cross_compiling:$ac_tool_warned in | |
| -yes:) | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | |
| -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
| -ac_tool_warned=yes ;; | |
| -esac | |
| - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | |
| - fi | |
| -else | |
| - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | |
| -fi | |
| - | |
| -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | |
| -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | |
| -if test "${lt_cv_path_mainfest_tool+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_path_mainfest_tool=no | |
| - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | |
| - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | |
| - cat conftest.err >&5 | |
| - if $GREP 'Manifest Tool' conftest.out > /dev/null; then | |
| - lt_cv_path_mainfest_tool=yes | |
| - fi | |
| - rm -f conftest* | |
| -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 yes != "$lt_cv_path_mainfest_tool"; then | |
| - MANIFEST_TOOL=: | |
| -fi | |
| - | |
| - | |
| - | |
| - | |
| +need_locks="$enable_libtool_lock" | |
| case $host_os in | |
| @@ -7578,7 +6873,7 @@ | |
| $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 | |
| @@ -7590,13 +6885,7 @@ | |
| $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | |
| -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | |
| _lt_result=$? | |
| - # If there is a non-empty error log, and "single_module" | |
| - # appears in it, assume the flag caused a linker warning | |
| - if test -s conftest.err && $GREP single_module conftest.err; then | |
| - 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 0 = "$_lt_result"; then | |
| + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then | |
| lt_cv_apple_cc_single_mod=yes | |
| else | |
| cat conftest.err >&5 | |
| @@ -7607,7 +6896,6 @@ | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 | |
| $as_echo "$lt_cv_apple_cc_single_mod" >&6; } | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 | |
| $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } | |
| if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : | |
| @@ -7638,12 +6926,11 @@ | |
| 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 | |
| $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 | |
| $as_echo_n "checking for -force_load linker flag... " >&6; } | |
| if test "${lt_cv_ld_force_load+set}" = set; then : | |
| @@ -7657,17 +6944,13 @@ | |
| $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | |
| echo "$AR cru libconftest.a conftest.o" >&5 | |
| $AR cru libconftest.a conftest.o 2>&5 | |
| - echo "$RANLIB libconftest.a" >&5 | |
| - $RANLIB libconftest.a 2>&5 | |
| cat > conftest.c << _LT_EOF | |
| int main() { return 0;} | |
| _LT_EOF | |
| echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 | |
| $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | |
| _lt_result=$? | |
| - if test -s conftest.err && $GREP force_load conftest.err; then | |
| - cat conftest.err >&5 | |
| - elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then | |
| + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | |
| lt_cv_ld_force_load=yes | |
| else | |
| cat conftest.err >&5 | |
| @@ -7680,32 +6963,32 @@ | |
| $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 yes = "$lt_cv_apple_cc_single_mod"; then | |
| + if test "$lt_cv_apple_cc_single_mod" = "yes"; then | |
| _lt_dar_single_mod='$single_module' | |
| fi | |
| - if test yes = "$lt_cv_ld_exported_symbols_list"; then | |
| - _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' | |
| + if test "$lt_cv_ld_exported_symbols_list" = "yes"; 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 no = "$lt_cv_ld_force_load"; then | |
| + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then | |
| _lt_dsymutil='~$DSYMUTIL $lib || :' | |
| else | |
| _lt_dsymutil= | |
| @@ -7713,41 +6996,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 | |
| @@ -7784,14 +7032,14 @@ | |
| *) | |
| 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 | |
| @@ -7815,14 +7063,14 @@ | |
| *) | |
| 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 | |
| @@ -7840,27 +7088,14 @@ | |
| # Check whether --with-pic was given. | |
| if test "${with_pic+set}" = set; then : | |
| - withval=$with_pic; lt_p=${PACKAGE-default} | |
| - case $withval in | |
| - yes|no) pic_mode=$withval ;; | |
| - *) | |
| - pic_mode=default | |
| - # Look at the argument we got. We use all the common list separators. | |
| - lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, | |
| - for lt_pkg in $withval; do | |
| - IFS=$lt_save_ifs | |
| - if test "X$lt_pkg" = "X$lt_p"; then | |
| - pic_mode=yes | |
| - fi | |
| - done | |
| - IFS=$lt_save_ifs | |
| - ;; | |
| - esac | |
| + withval=$with_pic; pic_mode="$withval" | |
| else | |
| pic_mode=default | |
| fi | |
| +test -z "$pic_mode" && pic_mode=default | |
| + | |
| @@ -7876,14 +7111,14 @@ | |
| *) | |
| 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 | |
| @@ -7897,63 +7132,11 @@ | |
| - 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 test "${lt_cv_with_aix_soname+set}" = set; 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' | |
| @@ -7983,10 +7166,6 @@ | |
| - | |
| - | |
| - | |
| - | |
| test -z "$LN_S" && LN_S="ln -s" | |
| @@ -8002,7 +7181,7 @@ | |
| -if test -n "${ZSH_VERSION+set}"; then | |
| +if test -n "${ZSH_VERSION+set}" ; then | |
| setopt NO_GLOB_SUBST | |
| fi | |
| @@ -8041,7 +7220,7 @@ | |
| # 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 set != "${COLLECT_NAMES+set}"; then | |
| + if test "X${COLLECT_NAMES+set}" != Xset; then | |
| COLLECT_NAMES= | |
| export COLLECT_NAMES | |
| fi | |
| @@ -8052,14 +7231,14 @@ | |
| 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 | |
| @@ -8068,8 +7247,15 @@ | |
| test -z "$LD" && LD=ld | |
| test -z "$ac_objext" && ac_objext=o | |
| -func_cc_basename $compiler | |
| -cc_basename=$func_cc_basename_result | |
| +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-%%"` | |
| # Only perform the check for file, if the check method requires it | |
| @@ -8084,22 +7270,22 @@ | |
| 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 | |
| : | |
| @@ -8122,13 +7308,13 @@ | |
| 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; } | |
| @@ -8150,22 +7336,22 @@ | |
| 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 | |
| : | |
| @@ -8188,13 +7374,13 @@ | |
| 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; } | |
| @@ -8215,7 +7401,7 @@ | |
| # 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' | |
| @@ -8277,7 +7463,7 @@ | |
| lt_prog_compiler_no_builtin_flag= | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; then | |
| case $cc_basename in | |
| nvcc*) | |
| lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; | |
| @@ -8293,7 +7479,7 @@ | |
| 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" ## exclude from sc_useless_quotes_in_assignment | |
| + lt_compiler_flag="-fno-rtti -fno-exceptions" | |
| # 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 | |
| @@ -8323,7 +7509,7 @@ | |
| { $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 yes = "$lt_cv_prog_compiler_rtti_exceptions"; then | |
| +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | |
| lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" | |
| else | |
| : | |
| @@ -8340,19 +7526,20 @@ | |
| lt_prog_compiler_pic= | |
| lt_prog_compiler_static= | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; then | |
| lt_prog_compiler_wl='-Wl,' | |
| lt_prog_compiler_static='-static' | |
| case $host_os in | |
| aix*) | |
| # All AIX code is PIC. | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static='-Bstatic' | |
| fi | |
| - lt_prog_compiler_pic='-fPIC' | |
| ;; | |
| amigaos*) | |
| @@ -8363,8 +7550,8 @@ | |
| ;; | |
| 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 | |
| @@ -8380,11 +7567,6 @@ | |
| # 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*) | |
| @@ -8445,9 +7627,7 @@ | |
| case $cc_basename in | |
| nvcc*) # Cuda Compiler Driver 2.2 | |
| lt_prog_compiler_wl='-Xlinker ' | |
| - if test -n "$lt_prog_compiler_pic"; then | |
| - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" | |
| - fi | |
| + lt_prog_compiler_pic='-Xcompiler -fPIC' | |
| ;; | |
| esac | |
| else | |
| @@ -8455,7 +7635,7 @@ | |
| case $host_os in | |
| aix*) | |
| lt_prog_compiler_wl='-Wl,' | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| lt_prog_compiler_static='-Bstatic' | |
| else | |
| @@ -8463,29 +7643,10 @@ | |
| 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*) | |
| @@ -8501,7 +7662,7 @@ | |
| ;; | |
| 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*) | |
| @@ -8510,9 +7671,9 @@ | |
| lt_prog_compiler_static='-non_shared' | |
| ;; | |
| - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| + linux* | k*bsd*-gnu | kopensolaris*-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' | |
| @@ -8531,18 +7692,6 @@ | |
| lt_prog_compiler_pic='--shared' | |
| lt_prog_compiler_static='--static' | |
| ;; | |
| - nagfor*) | |
| - # NAG Fortran compiler | |
| - lt_prog_compiler_wl='-Wl,-Wl,,' | |
| - 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) | |
| @@ -8563,33 +7712,18 @@ | |
| ;; | |
| *) | |
| case `$CC -V 2>&1 | sed 5q` in | |
| - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) | |
| + *Sun\ F* | *Sun*Fortran*) | |
| # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| lt_prog_compiler_wl='' | |
| ;; | |
| - *Sun\ F* | *Sun*Fortran*) | |
| - lt_prog_compiler_pic='-KPIC' | |
| - lt_prog_compiler_static='-Bstatic' | |
| - lt_prog_compiler_wl='-Qoption ld ' | |
| - ;; | |
| *Sun\ C*) | |
| # Sun C 5.9 | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| lt_prog_compiler_wl='-Wl,' | |
| ;; | |
| - *Intel*\ [CF]*Compiler*) | |
| - lt_prog_compiler_wl='-Wl,' | |
| - lt_prog_compiler_pic='-fPIC' | |
| - lt_prog_compiler_static='-static' | |
| - ;; | |
| - *Portland\ Group*) | |
| - lt_prog_compiler_wl='-Wl,' | |
| - lt_prog_compiler_pic='-fpic' | |
| - lt_prog_compiler_static='-Bstatic' | |
| - ;; | |
| esac | |
| ;; | |
| esac | |
| @@ -8620,7 +7754,7 @@ | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| case $cc_basename in | |
| - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | |
| + f77* | f90* | f95*) | |
| lt_prog_compiler_wl='-Qoption ld ';; | |
| *) | |
| lt_prog_compiler_wl='-Wl,';; | |
| @@ -8640,7 +7774,7 @@ | |
| ;; | |
| 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 | |
| @@ -8669,7 +7803,7 @@ | |
| fi | |
| case $host_os in | |
| - # For platforms that do not support PIC, -DPIC is meaningless: | |
| + # For platforms which do not support PIC, -DPIC is meaningless: | |
| *djgpp*) | |
| lt_prog_compiler_pic= | |
| ;; | |
| @@ -8677,17 +7811,13 @@ | |
| lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | |
| ;; | |
| esac | |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | |
| +$as_echo "$lt_prog_compiler_pic" >&6; } | |
| + | |
| + | |
| + | |
| + | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | |
| -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
| -if test "${lt_cv_prog_compiler_pic+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | |
| -$as_echo "$lt_cv_prog_compiler_pic" >&6; } | |
| -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| @@ -8701,7 +7831,7 @@ | |
| 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" ## exclude from sc_useless_quotes_in_assignment | |
| + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" | |
| # 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 | |
| @@ -8731,7 +7861,7 @@ | |
| { $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 yes = "$lt_cv_prog_compiler_pic_works"; then | |
| +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then | |
| case $lt_prog_compiler_pic in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; | |
| @@ -8748,11 +7878,6 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| # | |
| # Check to make sure the static flag actually works. | |
| # | |
| @@ -8763,7 +7888,7 @@ | |
| $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 | |
| @@ -8782,13 +7907,13 @@ | |
| 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 yes = "$lt_cv_prog_compiler_static_works"; then | |
| +if test x"$lt_cv_prog_compiler_static_works" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static= | |
| @@ -8908,8 +8033,8 @@ | |
| -hard_links=nottested | |
| -if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then | |
| +hard_links="nottested" | |
| +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; 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; } | |
| @@ -8921,9 +8046,9 @@ | |
| 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 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;} | |
| + 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;} | |
| need_locks=warn | |
| fi | |
| else | |
| @@ -8951,6 +8076,7 @@ | |
| hardcode_direct=no | |
| hardcode_direct_absolute=no | |
| hardcode_libdir_flag_spec= | |
| + hardcode_libdir_flag_spec_ld= | |
| hardcode_libdir_separator= | |
| hardcode_minus_L=no | |
| hardcode_shlibpath_var=unsupported | |
| @@ -8966,9 +8092,9 @@ | |
| # 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 | |
| @@ -8983,7 +8109,7 @@ | |
| # 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 yes != "$GCC"; then | |
| + if test "$GCC" != yes; then | |
| with_gnu_ld=no | |
| fi | |
| ;; | |
| @@ -8991,7 +8117,7 @@ | |
| # we just hope/assume this is gcc and not c89 (= MSVC++) | |
| with_gnu_ld=yes | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| with_gnu_ld=no | |
| ;; | |
| esac | |
| @@ -9001,7 +8127,7 @@ | |
| # 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| case $host_os in | |
| aix*) | |
| # The AIX port of GNU ld has always aspired to compatibility | |
| @@ -9023,24 +8149,24 @@ | |
| esac | |
| fi | |
| - if test yes = "$lt_use_gnu_ld_interface"; then | |
| + if test "$lt_use_gnu_ld_interface" = yes; 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 | $SED -e 's/(^)\+)\s\+//' 2>&1` in | |
| + case `$LD -v 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 ... | |
| @@ -9053,7 +8179,7 @@ | |
| case $host_os in | |
| aix[3-9]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| - if test ia64 != "$host_cpu"; then | |
| + if test "$host_cpu" != ia64; then | |
| ld_shlibs=no | |
| cat <<_LT_EOF 1>&2 | |
| @@ -9072,7 +8198,7 @@ | |
| 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) | |
| @@ -9088,7 +8214,7 @@ | |
| 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 | |
| @@ -9098,97 +8224,68 @@ | |
| # _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 | |
| - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' | |
| - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | |
| + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| 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, 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' | |
| + 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' | |
| 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 linux-dietlibc = "$host_os"; then | |
| + if test "$host_os" = linux-dietlibc; 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 no = "$tmp_diet" | |
| + && test "$tmp_diet" = no | |
| then | |
| - tmp_addflag=' $pic_flag' | |
| + tmp_addflag= | |
| 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' ;; | |
| @@ -9199,47 +8296,43 @@ | |
| 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 yes = "$supports_anon_versioning"; then | |
| + if test "x$supports_anon_versioning" = xyes; 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' | |
| - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | |
| - if test yes = "$supports_anon_versioning"; then | |
| + hardcode_libdir_flag_spec= | |
| + hardcode_libdir_flag_spec_ld='-rpath $libdir' | |
| + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | |
| + if test "x$supports_anon_versioning" = xyes; 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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | |
| fi | |
| ;; | |
| esac | |
| @@ -9253,8 +8346,8 @@ | |
| 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 $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' | |
| fi | |
| ;; | |
| @@ -9272,8 +8365,8 @@ | |
| _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 $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 | |
| @@ -9285,7 +8378,7 @@ | |
| ld_shlibs=no | |
| cat <<_LT_EOF 1>&2 | |
| -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot | |
| +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not | |
| *** 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 | |
| @@ -9300,9 +8393,9 @@ | |
| # 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 | |
| @@ -9319,15 +8412,15 @@ | |
| *) | |
| 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 $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 | |
| ;; | |
| esac | |
| - if test no = "$ld_shlibs"; then | |
| + if test "$ld_shlibs" = no; then | |
| runpath_var= | |
| hardcode_libdir_flag_spec= | |
| export_dynamic_flag_spec= | |
| @@ -9343,7 +8436,7 @@ | |
| # Note: this linker hardcodes the directories in LIBPATH if there | |
| # are no directories specified by -L. | |
| hardcode_minus_L=yes | |
| - if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then | |
| + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then | |
| # Neither direct hardcoding nor static linking is supported with a | |
| # broken collect2. | |
| hardcode_direct=unsupported | |
| @@ -9351,57 +8444,34 @@ | |
| ;; | |
| aix[4-9]*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 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. | |
| + # -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". | |
| 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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | |
| else | |
| - 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' | |
| + 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' | |
| 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 | |
| - # 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 | |
| + # need to do runtime linking. | |
| case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then | |
| + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); 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 | |
| @@ -9420,21 +8490,13 @@ | |
| hardcode_direct_absolute=yes | |
| hardcode_libdir_separator=':' | |
| link_all_deplibs=yes | |
| - 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 | |
| + file_list_spec='${wl}-f,' | |
| - if test yes = "$GCC"; then | |
| + if test "$GCC" = yes; 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 | |
| @@ -9453,48 +8515,35 @@ | |
| ;; | |
| esac | |
| shared_flag='-shared' | |
| - if test yes = "$aix_use_runtimelinking"; then | |
| - shared_flag="$shared_flag "'$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| + shared_flag="$shared_flag "'${wl}-G' | |
| fi | |
| - # 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 ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 yes = "$aix_use_runtimelinking"; then | |
| - shared_flag='$wl-G' | |
| + if test "$aix_use_runtimelinking" = yes; 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,yes = "$with_aix_soname,$aix_use_runtimelinking"; then | |
| + if test "$aix_use_runtimelinking" = yes; 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 set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath_+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test x$gcc_no_link = xyes; then | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| @@ -9510,47 +8559,34 @@ | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath_"; then | |
| - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| 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 | |
| - fi | |
| - | |
| -fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 -n "$allow_undefined_flag"; 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 "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | |
| else | |
| - if test ia64 = "$host_cpu"; then | |
| - hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' | |
| + if test "$host_cpu" = ia64; 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 set = "${lt_cv_aix_libpath+set}"; then | |
| - aix_libpath=$lt_cv_aix_libpath | |
| -else | |
| - if test "${lt_cv_aix_libpath_+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test x$gcc_no_link = xyes; then | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| @@ -9566,57 +8602,38 @@ | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_aix_libpath_sed=' | |
| - /Import File Strings/,/^$/ { | |
| - /^0/ { | |
| - s/^0 *\([^ ]*\) *$/\1/ | |
| - p | |
| - } | |
| - }' | |
| - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - # Check for a 64-bit object if we didn't find anything. | |
| - if test -z "$lt_cv_aix_libpath_"; then | |
| - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| - fi | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +# Check for a 64-bit object if we didn't find anything. | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| 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 | |
| - fi | |
| - | |
| -fi | |
| - | |
| - aix_libpath=$lt_cv_aix_libpath_ | |
| -fi | |
| +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 yes = "$with_gnu_ld"; then | |
| + no_undefined_flag=' ${wl}-bernotok' | |
| + allow_undefined_flag=' ${wl}-berok' | |
| + if test "$with_gnu_ld" = yes; 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 | |
| - 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' | |
| + # 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' | |
| fi | |
| fi | |
| ;; | |
| @@ -9625,7 +8642,7 @@ | |
| 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) | |
| @@ -9645,65 +8662,20 @@ | |
| # Microsoft Visual C++. | |
| # hardcode_libdir_flag_spec is actually meaningless, as there is | |
| # no search path for DLLs. | |
| - case $cc_basename in | |
| - cl*) | |
| - # Native MSVC | |
| - hardcode_libdir_flag_spec=' ' | |
| - allow_undefined_flag=unsupported | |
| - always_export_symbols=yes | |
| - file_list_spec='@' | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - shrext_cmds=.dll | |
| - # FIXME: Setting linknames here is a bad hack. | |
| - 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 | |
| - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | |
| - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| - # 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' | |
| - ;; | |
| - *) | |
| - # Assume MSVC wrapper | |
| - hardcode_libdir_flag_spec=' ' | |
| - allow_undefined_flag=unsupported | |
| - # Tell ltmain to make .lib files, not .a files. | |
| - libext=lib | |
| - # Tell ltmain to make .dll files, not .so files. | |
| - 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. | |
| - old_archive_from_new_cmds='true' | |
| - # FIXME: Should let the user specify the lib program. | |
| - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| - enable_shared_with_static_runtimes=yes | |
| - ;; | |
| - esac | |
| + hardcode_libdir_flag_spec=' ' | |
| + allow_undefined_flag=unsupported | |
| + # Tell ltmain to make .lib files, not .a files. | |
| + libext=lib | |
| + # Tell ltmain to make .dll files, not .so files. | |
| + 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. | |
| + old_archive_from_new_cmds='true' | |
| + # FIXME: Should let the user specify the lib program. | |
| + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| + fix_srcfile_path='`cygpath -w "$srcfile"`' | |
| + enable_shared_with_static_runtimes=yes | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -9713,24 +8685,23 @@ | |
| hardcode_direct=no | |
| hardcode_automatic=yes | |
| hardcode_shlibpath_var=unsupported | |
| - 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\"`' | |
| - | |
| + 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\"`' | |
| 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*|nagfor*) _lt_dar_can_shared=yes ;; | |
| + ifort*) _lt_dar_can_shared=yes ;; | |
| *) _lt_dar_can_shared=$GCC ;; | |
| esac | |
| - if test yes = "$_lt_dar_can_shared"; then | |
| + if test "$_lt_dar_can_shared" = "yes"; 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 | |
| @@ -9765,40 +8736,41 @@ | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| freebsd* | dragonfly*) | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| hardcode_libdir_flag_spec='-R$libdir' | |
| hardcode_direct=yes | |
| hardcode_shlibpath_var=no | |
| ;; | |
| hpux9*) | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $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 "x$output_objdir/$soname" = "x$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 $output_objdir/$soname = $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 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' | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; then | |
| + archive_cmds='$CC -shared -fPIC ${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 no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | |
| + hardcode_libdir_flag_spec_ld='+b $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 | |
| @@ -9806,25 +8778,25 @@ | |
| ;; | |
| hpux11*) | |
| - if test yes,no = "$GCC,$with_gnu_ld"; then | |
| + if test "$GCC" = yes && test "$with_gnu_ld" = no; 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 -fPIC ${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 -fPIC ${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' | |
| ;; | |
| *) | |
| @@ -9836,7 +8808,7 @@ | |
| $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 | |
| @@ -9855,14 +8827,14 @@ | |
| 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 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' | |
| +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' | |
| else | |
| archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | |
| fi | |
| @@ -9870,8 +8842,8 @@ | |
| ;; | |
| esac | |
| fi | |
| - if test no = "$with_gnu_ld"; then | |
| - hardcode_libdir_flag_spec='$wl+b $wl$libdir' | |
| + if test "$with_gnu_ld" = no; then | |
| + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | |
| hardcode_libdir_separator=: | |
| case $host_cpu in | |
| @@ -9882,7 +8854,7 @@ | |
| *) | |
| 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. | |
| @@ -9893,61 +8865,38 @@ | |
| ;; | |
| irix5* | irix6* | nonstopux*) | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + archive_cmds='$CC -shared $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. | |
| - # This should be the same for all languages, so no per-tag cache variable. | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 | |
| -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } | |
| -if test "${lt_cv_irix_exported_symbol+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - save_LDFLAGS=$LDFLAGS | |
| - LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" | |
| - if test x$gcc_no_link = xyes; then | |
| + save_LDFLAGS="$LDFLAGS" | |
| + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | |
| + if test x$gcc_no_link = xyes; then | |
| as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 | |
| fi | |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| /* end confdefs.h. */ | |
| -int foo (void) { return 0; } | |
| +int foo(void) {} | |
| _ACEOF | |
| if ac_fn_c_try_link "$LINENO"; then : | |
| - lt_cv_irix_exported_symbol=yes | |
| -else | |
| - lt_cv_irix_exported_symbol=no | |
| + archive_expsym_cmds='$CC -shared $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 | |
| rm -f core conftest.err conftest.$ac_objext \ | |
| - conftest$ac_exeext conftest.$ac_ext | |
| - 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 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 | |
| + conftest$ac_exeext conftest.$ac_ext | |
| + LDFLAGS="$save_LDFLAGS" | |
| 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 | |
| ;; | |
| - 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 | |
| @@ -9962,7 +8911,7 @@ | |
| 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 | |
| ;; | |
| @@ -9970,19 +8919,27 @@ | |
| *nto* | *qnx*) | |
| ;; | |
| - openbsd* | bitrig*) | |
| + openbsd*) | |
| 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__`"; then | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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 | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - hardcode_libdir_flag_spec='$wl-rpath,$libdir' | |
| + 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 | |
| fi | |
| else | |
| ld_shlibs=no | |
| @@ -9993,53 +8950,33 @@ | |
| 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 | |
| + 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' | |
| ;; | |
| osf3*) | |
| - 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' | |
| + 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' | |
| 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 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' | |
| + if test "$GCC" = yes; then | |
| + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | |
| + archive_cmds='$CC -shared${allow_undefined_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' | |
| @@ -10050,24 +8987,24 @@ | |
| solaris*) | |
| no_undefined_flag=' -z defs' | |
| - 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' | |
| + if test "$GCC" = yes; then | |
| + wlarc='${wl}' | |
| + archive_cmds='$CC -shared ${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 ${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 | |
| @@ -10077,11 +9014,11 @@ | |
| 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 yes = "$GCC"; then | |
| - whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' | |
| + if test "$GCC" = yes; 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 | |
| @@ -10091,10 +9028,10 @@ | |
| ;; | |
| sunos4*) | |
| - if test sequent = "$host_vendor"; then | |
| + if test "x$host_vendor" = xsequent; 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 | |
| @@ -10143,43 +9080,43 @@ | |
| ;; | |
| 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 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' | |
| + 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' | |
| 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 CANNOT use -z defs as we might desire, because we do not | |
| + # Note: We can NOT 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 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' | |
| + 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' | |
| 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 | |
| ;; | |
| @@ -10194,10 +9131,10 @@ | |
| ;; | |
| esac | |
| - if test sni = "$host_vendor"; then | |
| + if test x$host_vendor = xsni; then | |
| case $host in | |
| sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | |
| - export_dynamic_flag_spec='$wl-Blargedynsym' | |
| + export_dynamic_flag_spec='${wl}-Blargedynsym' | |
| ;; | |
| esac | |
| fi | |
| @@ -10205,7 +9142,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 | |
| $as_echo "$ld_shlibs" >&6; } | |
| -test no = "$ld_shlibs" && can_build_shared=no | |
| +test "$ld_shlibs" = no && can_build_shared=no | |
| with_gnu_ld=$with_gnu_ld | |
| @@ -10231,7 +9168,7 @@ | |
| # Assume -lc should be added | |
| archive_cmds_need_lc=yes | |
| - if test yes,yes = "$GCC,$enable_shared"; then | |
| + if test "$enable_shared" = yes && test "$GCC" = yes; then | |
| case $archive_cmds in | |
| *'~'*) | |
| # FIXME: we may have to deal with multi-command sequences. | |
| @@ -10443,17 +9380,22 @@ | |
| + | |
| + | |
| + | |
| + | |
| + | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 | |
| $as_echo_n "checking dynamic linker characteristics... " >&6; } | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; 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 | |
| @@ -10469,35 +9411,28 @@ | |
| ;; | |
| 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` | |
| - # ...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 | |
| + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` | |
| 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" | |
| - elif test -n "$lt_multi_os_dir"; then | |
| + 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 | |
| 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--; | |
| } | |
| @@ -10511,7 +9446,7 @@ | |
| # 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 | |
| @@ -10520,7 +9455,7 @@ | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| -shrext_cmds=.so | |
| +shrext_cmds=".so" | |
| postinstall_cmds= | |
| postuninstall_cmds= | |
| finish_cmds= | |
| @@ -10537,108 +9472,56 @@ | |
| # 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' | |
| + version_type=linux | |
| + 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]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| hardcode_into_libs=yes | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; 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 | |
| - # 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 | |
| + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct | |
| # soname into executable. Probably we can add versioning support to | |
| # collect2, so additional links can be useful in future. | |
| - aix,yes) # traditional libtool | |
| - dynamic_linker='AIX unversionable lib.so' | |
| + if test "$aix_use_runtimelinking" = yes; then | |
| # 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' | |
| - ;; | |
| - aix,no) # traditional AIX only | |
| - dynamic_linker='AIX lib.a(lib.so.V)' | |
| + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | |
| + else | |
| # 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' | |
| - ;; | |
| - 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 | |
| + library_names_spec='${libname}${release}.a $libname.a' | |
| + soname_spec='${libname}${release}${shared_ext}$major' | |
| + fi | |
| shlibpath_var=LIBPATH | |
| fi | |
| ;; | |
| @@ -10648,27 +9531,27 @@ | |
| 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%'\''`; $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%'\''`; 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' | |
| ;; | |
| esac | |
| ;; | |
| beos*) | |
| - library_names_spec='$libname$shared_ext' | |
| + library_names_spec='${libname}${shared_ext}' | |
| dynamic_linker="$host_os ld.so" | |
| shlibpath_var=LIBRARY_PATH | |
| ;; | |
| bsdi[45]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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" | |
| @@ -10680,17 +9563,16 @@ | |
| cygwin* | mingw* | pw32* | cegcc*) | |
| version_type=windows | |
| - shrext_cmds=.dll | |
| + shrext_cmds=".dll" | |
| need_version=no | |
| need_lib_prefix=no | |
| - case $GCC,$cc_basename in | |
| - yes,*) | |
| - # gcc | |
| + case $GCC,$host_os in | |
| + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | |
| 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~ | |
| @@ -10706,84 +9588,26 @@ | |
| 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' | |
| - ;; | |
| - esac | |
| - dynamic_linker='Win32 ld.exe' | |
| - ;; | |
| - | |
| - *,cl*) | |
| - # Native MSVC | |
| - libname_spec='$name' | |
| - soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' | |
| - library_names_spec='$libname.dll.lib' | |
| - | |
| - case $build_os in | |
| - mingw*) | |
| - sys_lib_search_path_spec= | |
| - lt_save_ifs=$IFS | |
| - IFS=';' | |
| - for lt_path in $LIB | |
| - do | |
| - IFS=$lt_save_ifs | |
| - # Let DOS variable expansion print the short 8.3 style file name. | |
| - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | |
| - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | |
| - done | |
| - IFS=$lt_save_ifs | |
| - # Convert to MSYS style. | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` | |
| - ;; | |
| - cygwin*) | |
| - # Convert to unix form, then to dos form, then back to unix form | |
| - # but this time dos style (no spaces!) so that the unix form looks | |
| - # like /cygdrive/c/PROGRA~1:/cygdr... | |
| - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | |
| - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | |
| - 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 | |
| - 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'` | |
| - else | |
| - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| - fi | |
| - # FIXME: find the short name or the path components, as spaces are | |
| - # common. (e.g. "Program Files" -> "PROGRA~1") | |
| + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | |
| ;; | |
| 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'\''`~ | |
| - dldir=$destdir/`dirname \$dlpath`~ | |
| - test -d \$dldir || mkdir -p \$dldir~ | |
| - $install_prog $dir/$dlname \$dldir/$dlname' | |
| - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | |
| - dlpath=$dir/\$dldll~ | |
| - $RM \$dlpath' | |
| - shlibpath_overrides_runpath=yes | |
| - dynamic_linker='Win32 link.exe' | |
| ;; | |
| *) | |
| - # Assume MSVC wrapper | |
| - library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' | |
| - dynamic_linker='Win32 ld.exe' | |
| + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | |
| ;; | |
| esac | |
| + dynamic_linker='Win32 ld.exe' | |
| # FIXME: first we should search . and the directory the executable is in | |
| shlibpath_var=PATH | |
| ;; | |
| @@ -10793,8 +9617,8 @@ | |
| 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`' | |
| @@ -10804,11 +9628,11 @@ | |
| ;; | |
| dgux*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| @@ -10826,13 +9650,12 @@ | |
| version_type=freebsd-$objformat | |
| case $version_type in | |
| freebsd-elf*) | |
| - 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} $libname${shared_ext}' | |
| 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 | |
| @@ -10857,16 +9680,26 @@ | |
| esac | |
| ;; | |
| +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 | |
| + hardcode_into_libs=yes | |
| + ;; | |
| + | |
| haiku*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + version_type=linux | |
| 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=no | |
| - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | |
| + shlibpath_overrides_runpath=yes | |
| + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -10883,15 +9716,14 @@ | |
| 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 32 = "$HPUX_IA64_MODE"; 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 "X$HPUX_IA64_MODE" = X32; 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' | |
| @@ -10899,8 +9731,8 @@ | |
| 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 | |
| ;; | |
| @@ -10909,8 +9741,8 @@ | |
| 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, ... | |
| @@ -10920,11 +9752,11 @@ | |
| ;; | |
| interix[3-9]*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -10935,16 +9767,16 @@ | |
| case $host_os in | |
| nonstopux*) version_type=nonstopux ;; | |
| *) | |
| - if test yes = "$lt_cv_prog_gnu_ld"; then | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| + version_type=linux | |
| else | |
| version_type=irix | |
| fi ;; | |
| 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= | |
| @@ -10963,8 +9795,8 @@ | |
| 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 | |
| ;; | |
| @@ -10973,33 +9805,13 @@ | |
| 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 | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-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' | |
| + 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 | |
| @@ -11046,12 +9858,7 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # 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. | |
| + # Append ld.so.conf contents 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" | |
| @@ -11071,12 +9878,12 @@ | |
| 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 | |
| @@ -11085,8 +9892,8 @@ | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -11095,68 +9902,58 @@ | |
| 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* | bitrig*) | |
| +openbsd*) | |
| version_type=sunos | |
| - sys_lib_dlsearch_path_spec=/usr/lib | |
| + sys_lib_dlsearch_path_spec="/usr/lib" | |
| need_lib_prefix=no | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| - need_version=no | |
| - else | |
| - need_version=yes | |
| - fi | |
| - library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' | |
| + # 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 | |
| - shlibpath_overrides_runpath=yes | |
| + 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 | |
| + else | |
| + shlibpath_overrides_runpath=yes | |
| + fi | |
| ;; | |
| os2*) | |
| libname_spec='$name' | |
| - version_type=windows | |
| - shrext_cmds=.dll | |
| - need_version=no | |
| + shrext_cmds=".dll" | |
| need_lib_prefix=no | |
| - # 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' | |
| + library_names_spec='$libname${shared_ext} $libname.a' | |
| dynamic_linker='OS/2 ld.exe' | |
| - 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' | |
| + shlibpath_var=LIBPATH | |
| ;; | |
| 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*) | |
| @@ -11164,11 +9961,11 @@ | |
| ;; | |
| solaris*) | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| @@ -11178,20 +9975,20 @@ | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; then | |
| need_lib_prefix=no | |
| fi | |
| need_version=yes | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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) | |
| @@ -11212,24 +10009,24 @@ | |
| ;; | |
| sysv4*MP*) | |
| - 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' | |
| + if test -d /usr/nec ;then | |
| + version_type=linux | |
| + 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=sco | |
| + version_type=freebsd-elf | |
| 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 yes = "$with_gnu_ld"; then | |
| + if test "$with_gnu_ld" = yes; 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' | |
| @@ -11244,19 +10041,19 @@ | |
| tpf*) | |
| # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | |
| - version_type=linux # correct to gnu/linux during the next big refactor | |
| + 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' | |
| + 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 | |
| ;; | |
| 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' | |
| + version_type=linux | |
| + 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 | |
| ;; | |
| @@ -11266,35 +10063,20 @@ | |
| esac | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 | |
| $as_echo "$dynamic_linker" >&6; } | |
| -test no = "$dynamic_linker" && can_build_shared=no | |
| +test "$dynamic_linker" = no && can_build_shared=no | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then | |
| - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| fi | |
| - | |
| -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then | |
| - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = 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 | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| @@ -11391,15 +10173,15 @@ | |
| hardcode_action= | |
| if test -n "$hardcode_libdir_flag_spec" || | |
| test -n "$runpath_var" || | |
| - test yes = "$hardcode_automatic"; then | |
| + test "X$hardcode_automatic" = "Xyes" ; then | |
| # We can hardcode non-existent directories. | |
| - if test no != "$hardcode_direct" && | |
| + if test "$hardcode_direct" != no && | |
| # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && | |
| - test no != "$hardcode_minus_L"; then | |
| + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && | |
| + test "$hardcode_minus_L" != no; then | |
| # Linking always hardcodes the temporary library directory. | |
| hardcode_action=relink | |
| else | |
| @@ -11414,12 +10196,12 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 | |
| $as_echo "$hardcode_action" >&6; } | |
| -if test relink = "$hardcode_action" || | |
| - test yes = "$inherit_rpath"; then | |
| +if test "$hardcode_action" = relink || | |
| + test "$inherit_rpath" = yes; then | |
| # Fast installation is not supported | |
| enable_fast_install=no | |
| -elif test yes = "$shlibpath_overrides_runpath" || | |
| - test no = "$enable_shared"; then | |
| +elif test "$shlibpath_overrides_runpath" = yes || | |
| + test "$enable_shared" = no; then | |
| # Fast installation is not necessary | |
| enable_fast_install=needless | |
| fi | |
| @@ -11429,7 +10211,7 @@ | |
| - if test yes != "$enable_dlopen"; then | |
| + if test "x$enable_dlopen" != xyes; then | |
| enable_dlopen=unknown | |
| enable_dlopen_self=unknown | |
| enable_dlopen_self_static=unknown | |
| @@ -11439,23 +10221,23 @@ | |
| 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 test "${ac_cv_lib_dl_dlopen+set}" = set; then : | |
| @@ -11496,10 +10278,10 @@ | |
| { $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" = x""yes; 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 | |
| @@ -11507,18 +10289,10 @@ | |
| ;; | |
| - 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" = x""yes; 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; } | |
| @@ -11560,11 +10334,11 @@ | |
| { $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" = x""yes; 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" = x""yes; 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; } | |
| @@ -11606,7 +10380,7 @@ | |
| { $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" = x""yes; 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; } | |
| @@ -11648,7 +10422,7 @@ | |
| { $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" = x""yes; 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; } | |
| @@ -11690,7 +10464,7 @@ | |
| { $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" = x""yes; then : | |
| - lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld | |
| + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" | |
| fi | |
| @@ -11711,21 +10485,21 @@ | |
| ;; | |
| esac | |
| - if test no = "$lt_cv_dlopen"; then | |
| - enable_dlopen=no | |
| - else | |
| + if test "x$lt_cv_dlopen" != xno; then | |
| enable_dlopen=yes | |
| + else | |
| + enable_dlopen=no | |
| fi | |
| case $lt_cv_dlopen in | |
| dlopen) | |
| - save_CPPFLAGS=$CPPFLAGS | |
| - test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" | |
| + save_CPPFLAGS="$CPPFLAGS" | |
| + test "x$ac_cv_header_dlfcn_h" = xyes && 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 | |
| @@ -11733,13 +10507,13 @@ | |
| if test "${lt_cv_dlopen_self+set}" = set; then : | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| - if test yes = "$cross_compiling"; then : | |
| + if test "$cross_compiling" = yes; then : | |
| lt_cv_dlopen_self=cross | |
| else | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<_LT_EOF | |
| -#line $LINENO "configure" | |
| +#line 10516 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -11780,13 +10554,13 @@ | |
| # endif | |
| #endif | |
| -/* When -fvisibility=hidden is used, assume the code has been annotated | |
| +/* When -fvisbility=hidden is used, assume the code has been annotated | |
| correspondingly for the symbols needed. */ | |
| -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| -int fnord () __attribute__((visibility("default"))); | |
| +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| +void fnord () __attribute__((visibility("default"))); | |
| #endif | |
| -int fnord () { return 42; } | |
| +void fnord () { int i=42; } | |
| int main () | |
| { | |
| void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | |
| @@ -11812,7 +10586,7 @@ | |
| (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 | |
| @@ -11832,20 +10606,20 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 | |
| $as_echo "$lt_cv_dlopen_self" >&6; } | |
| - if test yes = "$lt_cv_dlopen_self"; then | |
| + if test "x$lt_cv_dlopen_self" = xyes; 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 test "${lt_cv_dlopen_self_static+set}" = set; then : | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| - if test yes = "$cross_compiling"; then : | |
| + if test "$cross_compiling" = yes; then : | |
| lt_cv_dlopen_self_static=cross | |
| else | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<_LT_EOF | |
| -#line $LINENO "configure" | |
| +#line 10622 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -11886,13 +10660,13 @@ | |
| # endif | |
| #endif | |
| -/* When -fvisibility=hidden is used, assume the code has been annotated | |
| +/* When -fvisbility=hidden is used, assume the code has been annotated | |
| correspondingly for the symbols needed. */ | |
| -#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| -int fnord () __attribute__((visibility("default"))); | |
| +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | |
| +void fnord () __attribute__((visibility("default"))); | |
| #endif | |
| -int fnord () { return 42; } | |
| +void fnord () { int i=42; } | |
| int main () | |
| { | |
| void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | |
| @@ -11918,7 +10692,7 @@ | |
| (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 | |
| @@ -11939,9 +10713,9 @@ | |
| $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 | |
| @@ -11985,7 +10759,7 @@ | |
| # 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 | |
| @@ -12013,7 +10787,7 @@ | |
| - # Report what library types will actually be built | |
| + # Report which 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 | |
| @@ -12021,13 +10795,13 @@ | |
| { $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 no = "$can_build_shared" && enable_shared=no | |
| + test "$can_build_shared" = "no" && 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 yes = "$enable_shared" && enable_static=no | |
| + test "$enable_shared" = yes && enable_static=no | |
| if test -n "$RANLIB"; then | |
| archive_cmds="$archive_cmds~\$RANLIB \$lib" | |
| postinstall_cmds='$RANLIB $lib' | |
| @@ -12035,12 +10809,8 @@ | |
| ;; | |
| aix[4-9]*) | |
| - 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 | |
| + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| + test "$enable_shared" = yes && enable_static=no | |
| fi | |
| ;; | |
| esac | |
| @@ -12050,7 +10820,7 @@ | |
| { $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 yes = "$enable_shared" || enable_static=yes | |
| + test "$enable_shared" = yes || enable_static=yes | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 | |
| $as_echo "$enable_static" >&6; } | |
| @@ -12064,9 +10834,7 @@ | |
| 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" | |
| @@ -12738,9 +11506,8 @@ | |
| # We make a subdir and do the tests there. Otherwise we can end up | |
| # making bogus files that we don't know about and never remove. For | |
| # instance it was reported that on HP-UX the gcc test will end up | |
| - # making a dummy file named 'D' -- because '-MD' means "put the output | |
| - # in D". | |
| - rm -rf conftest.dir | |
| + # making a dummy file named `D' -- because `-MD' means `put the output | |
| + # in D'. | |
| mkdir conftest.dir | |
| # Copy depcomp to subdir because otherwise we won't find it if we're | |
| # using a relative directory. | |
| @@ -12774,16 +11541,16 @@ | |
| : > sub/conftest.c | |
| for i in 1 2 3 4 5 6; do | |
| echo '#include "conftst'$i'.h"' >> sub/conftest.c | |
| - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with | |
| - # Solaris 10 /bin/sh. | |
| - echo '/* dummy */' > sub/conftst$i.h | |
| + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | |
| + # Solaris 8's {/usr,}/bin/sh. | |
| + touch sub/conftst$i.h | |
| done | |
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | |
| - # We check with '-c' and '-o' for the sake of the "dashmstdout" | |
| + # We check with `-c' and `-o' for the sake of the "dashmstdout" | |
| # mode. It turns out that the SunPro C++ compiler does not properly | |
| - # handle '-M -o', and we need to detect this. Also, some Intel | |
| - # versions had trouble with output in subdirs. | |
| + # handle `-M -o', and we need to detect this. Also, some Intel | |
| + # versions had trouble with output in subdirs | |
| am__obj=sub/conftest.${OBJEXT-o} | |
| am__minus_obj="-o $am__obj" | |
| case $depmode in | |
| @@ -12792,16 +11559,16 @@ | |
| test "$am__universal" = false || continue | |
| ;; | |
| nosideeffect) | |
| - # After this tag, mechanisms are not by side-effect, so they'll | |
| - # only be used when explicitly requested. | |
| + # after this tag, mechanisms are not by side-effect, so they'll | |
| + # only be used when explicitly requested | |
| if test "x$enable_dependency_tracking" = xyes; then | |
| continue | |
| else | |
| break | |
| fi | |
| ;; | |
| - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | |
| - # This compiler won't grok '-c -o', but also, the minuso test has | |
| + msvisualcpp | msvcmsys) | |
| + # This compiler won't grok `-c -o', but also, the minuso test has | |
| # not run yet. These depmodes are late enough in the game, and | |
| # so weak that their functioning should not be impacted. | |
| am__obj=conftest.${OBJEXT-o} | |
| @@ -14195,14 +12962,6 @@ | |
| LTLIBOBJS=$ac_ltlibobjs | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 | |
| -$as_echo_n "checking that generated files are newer than configure... " >&6; } | |
| - if test -n "$am_sleep_pid"; then | |
| - # Hide warnings about reused PIDs. | |
| - wait $am_sleep_pid 2>/dev/null | |
| - fi | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 | |
| -$as_echo "done" >&6; } | |
| if test -n "$EXEEXT"; then | |
| am__EXEEXT_TRUE= | |
| am__EXEEXT_FALSE='#' | |
| @@ -14850,10 +13609,8 @@ | |
| 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"`' | |
| host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' | |
| host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' | |
| host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' | |
| @@ -14874,20 +13631,13 @@ | |
| lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' | |
| lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' | |
| lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' | |
| -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' | |
| -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' | |
| reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' | |
| reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' | |
| OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' | |
| deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' | |
| file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' | |
| -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' | |
| -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' | |
| -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' | |
| -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' | |
| AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' | |
| AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' | |
| -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' | |
| STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' | |
| RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' | |
| old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' | |
| @@ -14900,22 +13650,16 @@ | |
| 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"`' | |
| -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' | |
| +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' | |
| lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' | |
| lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' | |
| need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' | |
| -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' | |
| DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' | |
| NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' | |
| LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' | |
| @@ -14939,6 +13683,7 @@ | |
| allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' | |
| no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' | |
| +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' | |
| hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' | |
| hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' | |
| @@ -14947,12 +13692,12 @@ | |
| hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' | |
| inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' | |
| link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' | |
| +fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' | |
| always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' | |
| export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' | |
| exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' | |
| include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' | |
| prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' | |
| -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' | |
| file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' | |
| variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' | |
| need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' | |
| @@ -14971,8 +13716,7 @@ | |
| 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"`' | |
| -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"`' | |
| +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $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"`' | |
| @@ -14995,7 +13739,6 @@ | |
| # Quote evaled strings. | |
| for var in SHELL \ | |
| ECHO \ | |
| -PATH_SEPARATOR \ | |
| SED \ | |
| GREP \ | |
| EGREP \ | |
| @@ -15009,13 +13752,8 @@ | |
| OBJDUMP \ | |
| deplibs_check_method \ | |
| file_magic_cmd \ | |
| -file_magic_glob \ | |
| -want_nocaseglob \ | |
| -DLLTOOL \ | |
| -sharedlib_from_linklib_cmd \ | |
| AR \ | |
| AR_FLAGS \ | |
| -archiver_list_spec \ | |
| STRIP \ | |
| RANLIB \ | |
| CC \ | |
| @@ -15023,19 +13761,14 @@ | |
| 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 \ | |
| +lt_prog_compiler_pic \ | |
| lt_prog_compiler_static \ | |
| lt_cv_prog_compiler_c_o \ | |
| need_locks \ | |
| -MANIFEST_TOOL \ | |
| DSYMUTIL \ | |
| NMEDIT \ | |
| LIPO \ | |
| @@ -15049,7 +13782,9 @@ | |
| allow_undefined_flag \ | |
| no_undefined_flag \ | |
| hardcode_libdir_flag_spec \ | |
| +hardcode_libdir_flag_spec_ld \ | |
| hardcode_libdir_separator \ | |
| +fix_srcfile_path \ | |
| exclude_expsyms \ | |
| include_expsyms \ | |
| file_list_spec \ | |
| @@ -15063,7 +13798,7 @@ | |
| striplib; do | |
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | |
| *[\\\\\\\`\\"\\\$]*) | |
| - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes | |
| + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | |
| ;; | |
| *) | |
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | |
| @@ -15085,16 +13820,14 @@ | |
| module_expsym_cmds \ | |
| export_symbols_cmds \ | |
| prelink_cmds \ | |
| -postlink_cmds \ | |
| postinstall_cmds \ | |
| postuninstall_cmds \ | |
| finish_cmds \ | |
| sys_lib_search_path_spec \ | |
| -configure_time_dlsearch_path \ | |
| -configure_time_lt_sys_library_path; do | |
| +sys_lib_dlsearch_path_spec; do | |
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | |
| *[\\\\\\\`\\"\\\$]*) | |
| - 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=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | |
| ;; | |
| *) | |
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | |
| @@ -15103,16 +13836,19 @@ | |
| 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 that allow our | |
| +# See if we are running on zsh, and set the options which 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' | |
| @@ -15744,7 +14480,7 @@ | |
| # Strip MF so we end up with the name of the file. | |
| mf=`echo "$mf" | sed -e 's/:.*$//'` | |
| # Check whether this is an Automake generated Makefile or not. | |
| - # We used to match only the files named 'Makefile.in', but | |
| + # We used to match only the files named `Makefile.in', but | |
| # some people rename them; so instead we look at the file content. | |
| # Grep'ing the first line is not enough: some people post-process | |
| # each Makefile.in and add a new line on top of each file to say so. | |
| @@ -15778,19 +14514,21 @@ | |
| continue | |
| fi | |
| # Extract the definition of DEPDIR, am__include, and am__quote | |
| - # from the Makefile without running 'make'. | |
| + # from the Makefile without running `make'. | |
| DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | |
| test -z "$DEPDIR" && continue | |
| am__include=`sed -n 's/^am__include = //p' < "$mf"` | |
| test -z "am__include" && continue | |
| am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | |
| + # When using ansi2knr, U may be empty or an underscore; expand it | |
| + U=`sed -n 's/^U = //p' < "$mf"` | |
| # Find all dependency output files, they are included files with | |
| # $(DEPDIR) in their names. We invoke sed twice because it is the | |
| # simplest approach to changing $(DEPDIR) to its actual value in the | |
| # expansion. | |
| for file in `sed -n " | |
| s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | |
| - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | |
| + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | |
| # Make sure the directory exists. | |
| test -f "$dirpart/$file" && continue | |
| fdir=`$as_dirname -- "$file" || | |
| @@ -15825,53 +14563,54 @@ | |
| ;; | |
| "libtool":C) | |
| - # See if we are running on zsh, and set the options that allow our | |
| + # See if we are running on zsh, and set the options which 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 | |
| -# Generated automatically by $as_me ($PACKAGE) $VERSION | |
| + | |
| +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. | |
| +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $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. | |
| # | |
| -# 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. | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | |
| +# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | |
| +# Written by Gordon Matzigkeit, 1996 | |
| # | |
| -# GNU Libtool is distributed in the hope that it will be useful, but | |
| -# WITHOUT ANY WARRANTY; without even the implied warranty of | |
| +# 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. | |
| +# | |
| +# 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 this program. If not, see <http://www.gnu.org/licenses/>. | |
| +# 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. | |
| # The names of the tagged configurations supported by this script. | |
| -available_tags='' | |
| - | |
| -# Configured defaults for sys_lib_dlsearch_path munging. | |
| -: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} | |
| +available_tags="" | |
| # ### BEGIN LIBTOOL CONFIG | |
| @@ -15891,18 +14630,12 @@ | |
| # 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 | |
| # An echo program that protects backslashes. | |
| ECHO=$lt_ECHO | |
| -# The PATH separator for the build system. | |
| -PATH_SEPARATOR=$lt_PATH_SEPARATOR | |
| - | |
| # The host system. | |
| host_alias=$host_alias | |
| host=$host | |
| @@ -15952,42 +14685,19 @@ | |
| # turn newlines into spaces. | |
| NL2SP=$lt_lt_NL2SP | |
| -# convert \$build file names to \$host format. | |
| -to_host_file_cmd=$lt_cv_to_host_file_cmd | |
| - | |
| -# convert \$build files to toolchain format. | |
| -to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
| - | |
| # An object symbol dumper. | |
| OBJDUMP=$lt_OBJDUMP | |
| # Method to check whether dependent libraries are shared objects. | |
| deplibs_check_method=$lt_deplibs_check_method | |
| -# Command to use when deplibs_check_method = "file_magic". | |
| +# Command to use when deplibs_check_method == "file_magic". | |
| file_magic_cmd=$lt_file_magic_cmd | |
| -# How to find potential files when deplibs_check_method = "file_magic". | |
| -file_magic_glob=$lt_file_magic_glob | |
| - | |
| -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". | |
| -want_nocaseglob=$lt_want_nocaseglob | |
| - | |
| -# DLL creation program. | |
| -DLLTOOL=$lt_DLLTOOL | |
| - | |
| -# Command to associate shared and link libraries. | |
| -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | |
| - | |
| # The archiver. | |
| AR=$lt_AR | |
| - | |
| -# Flags to create an archive. | |
| AR_FLAGS=$lt_AR_FLAGS | |
| -# How to feed a file listing to the archiver. | |
| -archiver_list_spec=$lt_archiver_list_spec | |
| - | |
| # A symbol stripping program. | |
| STRIP=$lt_STRIP | |
| @@ -16011,27 +14721,12 @@ | |
| # 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 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 | |
| @@ -16041,9 +14736,6 @@ | |
| # Must we lock files when doing compilation? | |
| need_locks=$lt_need_locks | |
| -# Manifest tool. | |
| -MANIFEST_TOOL=$lt_MANIFEST_TOOL | |
| - | |
| # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | |
| DSYMUTIL=$lt_DSYMUTIL | |
| @@ -16122,11 +14814,8 @@ | |
| # Compile-time system search path for libraries. | |
| sys_lib_search_path_spec=$lt_sys_lib_search_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 | |
| +# Run-time system search path for libraries. | |
| +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Whether dlopen is supported. | |
| dlopen_support=$enable_dlopen | |
| @@ -16161,12 +14850,12 @@ | |
| # Compiler flag to turn off builtin functions. | |
| no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | |
| -# Additional compiler flags for building library objects. | |
| -pic_flag=$lt_lt_prog_compiler_pic | |
| - | |
| # How to pass a linker flag through the compiler. | |
| wl=$lt_lt_prog_compiler_wl | |
| +# Additional compiler flags for building library objects. | |
| +pic_flag=$lt_lt_prog_compiler_pic | |
| + | |
| # Compiler flag to prevent dynamic linking. | |
| link_static_flag=$lt_lt_prog_compiler_static | |
| @@ -16216,16 +14905,20 @@ | |
| # This must work even if \$libdir does not exist | |
| hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec | |
| +# If ld is used when linking, flag to hardcode \$libdir into a binary | |
| +# during linking. This must work even if \$libdir does not exist. | |
| +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld | |
| + | |
| # 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 | |
| @@ -16249,6 +14942,9 @@ | |
| # Whether libtool must link a program against all its dependency libraries. | |
| link_all_deplibs=$link_all_deplibs | |
| +# Fix the shell variable \$srcfile for the compiler. | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| + | |
| # Set to "yes" if exported symbols are required. | |
| always_export_symbols=$always_export_symbols | |
| @@ -16264,9 +14960,6 @@ | |
| # Commands necessary for linking programs (against libraries) with templates. | |
| prelink_cmds=$lt_prelink_cmds | |
| -# Commands necessary for finishing linking programs. | |
| -postlink_cmds=$lt_postlink_cmds | |
| - | |
| # Specify filename containing input files. | |
| file_list_spec=$lt_file_list_spec | |
| @@ -16277,72 +14970,13 @@ | |
| _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 | |
| aix3*) | |
| cat <<\_LT_EOF >> "$cfgfile" | |
| # 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 set != "${COLLECT_NAMES+set}"; then | |
| +if test "X${COLLECT_NAMES+set}" != Xset; then | |
| COLLECT_NAMES= | |
| export COLLECT_NAMES | |
| fi | |
| @@ -16351,17 +14985,217 @@ | |
| 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 | |
| # if finds mixed CR/LF and LF-only lines. Since sed operates in | |
| # text mode, it properly converts lines to CR/LF. This bash problem | |
| # is reportedly fixed, but why not run on old versions too? | |
| - sed '$q' "$ltmain" >> "$cfgfile" \ | |
| - || (rm -f "$cfgfile"; exit 1) | |
| + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | |
| + || (rm -f "$cfgfile"; exit 1) | |
| + | |
| + case $xsi_shell in | |
| + yes) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_dirname file append nondir_replacement | |
| +# Compute the dirname of FILE. If nonempty, add APPEND to the result, | |
| +# otherwise set result to NONDIR_REPLACEMENT. | |
| +func_dirname () | |
| +{ | |
| + case ${1} in | |
| + */*) func_dirname_result="${1%/*}${2}" ;; | |
| + * ) func_dirname_result="${3}" ;; | |
| + esac | |
| +} | |
| + | |
| +# func_basename file | |
| +func_basename () | |
| +{ | |
| + func_basename_result="${1##*/}" | |
| +} | |
| + | |
| +# func_dirname_and_basename file append nondir_replacement | |
| +# perform func_basename and func_dirname in a single function | |
| +# call: | |
| +# dirname: Compute the dirname of FILE. If nonempty, | |
| +# add APPEND to the result, otherwise set result | |
| +# to NONDIR_REPLACEMENT. | |
| +# value returned in "$func_dirname_result" | |
| +# basename: Compute filename of FILE. | |
| +# value retuned in "$func_basename_result" | |
| +# Implementation must be kept synchronized with func_dirname | |
| +# and func_basename. For efficiency, we do not delegate to | |
| +# those functions but instead duplicate the functionality here. | |
| +func_dirname_and_basename () | |
| +{ | |
| + case ${1} in | |
| + */*) func_dirname_result="${1%/*}${2}" ;; | |
| + * ) func_dirname_result="${3}" ;; | |
| + esac | |
| + func_basename_result="${1##*/}" | |
| +} | |
| + | |
| +# func_stripname prefix suffix name | |
| +# strip PREFIX and SUFFIX off of NAME. | |
| +# PREFIX and SUFFIX must not contain globbing or regex special | |
| +# characters, hashes, percent signs, but SUFFIX may contain a leading | |
| +# dot (in which case that matches only a dot). | |
| +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}"} | |
| +} | |
| + | |
| +# func_opt_split | |
| +func_opt_split () | |
| +{ | |
| + func_opt_split_opt=${1%%=*} | |
| + func_opt_split_arg=${1#*=} | |
| +} | |
| + | |
| +# func_lo2o object | |
| +func_lo2o () | |
| +{ | |
| + case ${1} in | |
| + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | |
| + *) func_lo2o_result=${1} ;; | |
| + esac | |
| +} | |
| + | |
| +# func_xform libobj-or-source | |
| +func_xform () | |
| +{ | |
| + func_xform_result=${1%.*}.lo | |
| +} | |
| + | |
| +# func_arith arithmetic-term... | |
| +func_arith () | |
| +{ | |
| + func_arith_result=$(( $* )) | |
| +} | |
| + | |
| +# func_len string | |
| +# STRING may not start with a hyphen. | |
| +func_len () | |
| +{ | |
| + func_len_result=${#1} | |
| +} | |
| + | |
| +_LT_EOF | |
| + ;; | |
| + *) # Bourne compatible functions. | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_dirname file append nondir_replacement | |
| +# Compute the dirname of FILE. If nonempty, add APPEND to the result, | |
| +# otherwise set result to NONDIR_REPLACEMENT. | |
| +func_dirname () | |
| +{ | |
| + # Extract subdirectory from the argument. | |
| + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` | |
| + if test "X$func_dirname_result" = "X${1}"; then | |
| + func_dirname_result="${3}" | |
| + else | |
| + func_dirname_result="$func_dirname_result${2}" | |
| + fi | |
| +} | |
| + | |
| +# func_basename file | |
| +func_basename () | |
| +{ | |
| + func_basename_result=`$ECHO "${1}" | $SED "$basename"` | |
| +} | |
| + | |
| + | |
| +# func_stripname prefix suffix name | |
| +# strip PREFIX and SUFFIX off of NAME. | |
| +# PREFIX and SUFFIX must not contain globbing or regex special | |
| +# characters, hashes, percent signs, but SUFFIX may contain a leading | |
| +# dot (in which case that matches only a dot). | |
| +# func_strip_suffix prefix name | |
| +func_stripname () | |
| +{ | |
| + case ${2} in | |
| + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | |
| + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | |
| + esac | |
| +} | |
| + | |
| +# sed scripts: | |
| +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | |
| +my_sed_long_arg='1s/^-[^=]*=//' | |
| + | |
| +# func_opt_split | |
| +func_opt_split () | |
| +{ | |
| + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` | |
| + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` | |
| +} | |
| + | |
| +# func_lo2o object | |
| +func_lo2o () | |
| +{ | |
| + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` | |
| +} | |
| + | |
| +# func_xform libobj-or-source | |
| +func_xform () | |
| +{ | |
| + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` | |
| +} | |
| + | |
| +# func_arith arithmetic-term... | |
| +func_arith () | |
| +{ | |
| + func_arith_result=`expr "$@"` | |
| +} | |
| + | |
| +# func_len string | |
| +# STRING may not start with a hyphen. | |
| +func_len () | |
| +{ | |
| + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | |
| +} | |
| + | |
| +_LT_EOF | |
| +esac | |
| + | |
| +case $lt_shell_append in | |
| + yes) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_append var value | |
| +# Append VALUE to the end of shell variable VAR. | |
| +func_append () | |
| +{ | |
| + eval "$1+=\$2" | |
| +} | |
| +_LT_EOF | |
| + ;; | |
| + *) | |
| + cat << \_LT_EOF >> "$cfgfile" | |
| + | |
| +# func_append var value | |
| +# Append VALUE to the end of shell variable VAR. | |
| +func_append () | |
| +{ | |
| + eval "$1=\$$1\$2" | |
| +} | |
| + | |
| +_LT_EOF | |
| + ;; | |
| + esac | |
| + | |
| + | |
| + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | |
| + || (rm -f "$cfgfile"; exit 1) | |
| - mv -f "$cfgfile" "$ofile" || | |
| + mv -f "$cfgfile" "$ofile" || | |
| (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | |
| chmod +x "$ofile" | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libquadmath/Makefile.in orig/gcc-4.7.0/libquadmath/Makefile.in | |
| --- ./gcc-4.7.0/libquadmath/Makefile.in 2015-10-18 22:25:03.790060373 -0400 | |
| +++ orig/gcc-4.7.0/libquadmath/Makefile.in 2011-09-21 10:36:03.000000000 -0400 | |
| @@ -1,9 +1,9 @@ | |
| -# Makefile.in generated by automake 1.12 from Makefile.am. | |
| +# Makefile.in generated by automake 1.11.1 from Makefile.am. | |
| # @configure_input@ | |
| # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software | |
| -# Foundation, Inc. | |
| +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | |
| +# Inc. | |
| # This Makefile.in is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -17,23 +17,6 @@ | |
| VPATH = @srcdir@ | |
| -am__make_dryrun = \ | |
| - { \ | |
| - am__dry=no; \ | |
| - case $$MAKEFLAGS in \ | |
| - *\\[\ \ ]*) \ | |
| - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
| - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
| - *) \ | |
| - for am__flg in $$MAKEFLAGS; do \ | |
| - case $$am__flg in \ | |
| - *=*|--*) ;; \ | |
| - *n*) am__dry=yes; break;; \ | |
| - esac; \ | |
| - done;; \ | |
| - esac; \ | |
| - test $$am__dry = yes; \ | |
| - } | |
| pkgdatadir = $(datadir)/@PACKAGE@ | |
| pkgincludedir = $(includedir)/@PACKAGE@ | |
| pkglibdir = $(libdir)/@PACKAGE@ | |
| @@ -55,10 +38,10 @@ | |
| target_triplet = @target@ | |
| @BUILD_LIBQUADMATH_FALSE@libquadmath_la_DEPENDENCIES = | |
| subdir = . | |
| -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | |
| +DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | |
| $(top_srcdir)/configure $(am__configure_deps) \ | |
| - $(srcdir)/config.h.in $(top_srcdir)/../mkinstalldirs \ | |
| - $(top_srcdir)/../depcomp $(libquadmath_TEXINFOS) | |
| + $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ | |
| + $(srcdir)/../depcomp $(libquadmath_TEXINFOS) | |
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
| am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ | |
| $(top_srcdir)/../config/depstand.m4 \ | |
| @@ -100,12 +83,6 @@ | |
| am__base_list = \ | |
| sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | |
| sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | |
| -am__uninstall_files_from_dir = { \ | |
| - test -z "$$files" \ | |
| - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ | |
| - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ | |
| - $(am__cd) "$$dir" && rm -f $$files; }; \ | |
| - } | |
| am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" \ | |
| "$(DESTDIR)$(libsubincludedir)" | |
| LTLIBRARIES = $(toolexeclib_LTLIBRARIES) | |
| @@ -181,6 +158,12 @@ | |
| --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | |
| $(LDFLAGS) -o $@ | |
| SOURCES = $(libquadmath_la_SOURCES) | |
| +MULTISRCTOP = | |
| +MULTIBUILDTOP = | |
| +MULTIDIRS = | |
| +MULTISUBDIR = | |
| +MULTIDO = true | |
| +MULTICLEAN = true | |
| INFO_DEPS = libquadmath.info | |
| am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include | |
| DVIS = libquadmath.dvi | |
| @@ -193,16 +176,9 @@ | |
| MAKEINFOHTML = $(MAKEINFO) --html | |
| AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) | |
| DVIPS = dvips | |
| -am__can_run_installinfo = \ | |
| - case $$AM_UPDATE_INFO_DIR in \ | |
| - n|no|NO) false;; \ | |
| - *) (install-info --version) >/dev/null 2>&1;; \ | |
| - esac | |
| HEADERS = $(nodist_libsubinclude_HEADERS) | |
| ETAGS = etags | |
| CTAGS = ctags | |
| -CSCOPE = cscope | |
| -AM_RECURSIVE_TARGETS = cscope | |
| ACLOCAL = @ACLOCAL@ | |
| AMTAR = @AMTAR@ | |
| AR = @AR@ | |
| @@ -218,7 +194,6 @@ | |
| CYGPATH_W = @CYGPATH_W@ | |
| DEFS = @DEFS@ | |
| DEPDIR = @DEPDIR@ | |
| -DLLTOOL = @DLLTOOL@ | |
| DSYMUTIL = @DSYMUTIL@ | |
| DUMPBIN = @DUMPBIN@ | |
| ECHO_C = @ECHO_C@ | |
| @@ -241,10 +216,8 @@ | |
| LIPO = @LIPO@ | |
| LN_S = @LN_S@ | |
| LTLIBOBJS = @LTLIBOBJS@ | |
| -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ | |
| MAINT = @MAINT@ | |
| MAKEINFO = @MAKEINFO@ | |
| -MANIFEST_TOOL = @MANIFEST_TOOL@ | |
| MKDIR_P = @MKDIR_P@ | |
| NM = @NM@ | |
| NMEDIT = @NMEDIT@ | |
| @@ -272,7 +245,6 @@ | |
| abs_srcdir = @abs_srcdir@ | |
| abs_top_builddir = @abs_top_builddir@ | |
| abs_top_srcdir = @abs_top_srcdir@ | |
| -ac_ct_AR = @ac_ct_AR@ | |
| ac_ct_CC = @ac_ct_CC@ | |
| ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | |
| am__include = @am__include@ | |
| @@ -444,7 +416,7 @@ | |
| .SUFFIXES: | |
| .SUFFIXES: .c .dvi .lo .o .obj .ps | |
| -am--refresh: Makefile | |
| +am--refresh: | |
| @: | |
| $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | |
| @for dep in $?; do \ | |
| @@ -480,8 +452,10 @@ | |
| $(am__aclocal_m4_deps): | |
| config.h: stamp-h1 | |
| - @if test ! -f $@; then rm -f stamp-h1; else :; fi | |
| - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi | |
| + @if test ! -f $@; then \ | |
| + rm -f stamp-h1; \ | |
| + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ | |
| + else :; fi | |
| stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | |
| @rm -f stamp-h1 | |
| @@ -495,6 +469,7 @@ | |
| -rm -f config.h stamp-h1 | |
| install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) | |
| @$(NORMAL_INSTALL) | |
| + test -z "$(toolexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)" | |
| @list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \ | |
| list2=; for p in $$list; do \ | |
| if test -f $$p; then \ | |
| @@ -502,8 +477,6 @@ | |
| else :; fi; \ | |
| done; \ | |
| test -z "$$list2" || { \ | |
| - echo " $(MKDIR_P) '$(DESTDIR)$(toolexeclibdir)'"; \ | |
| - $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)" || exit 1; \ | |
| echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(toolexeclibdir)'"; \ | |
| $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(toolexeclibdir)"; \ | |
| } | |
| @@ -519,14 +492,12 @@ | |
| clean-toolexeclibLTLIBRARIES: | |
| -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES) | |
| - @list='$(toolexeclib_LTLIBRARIES)'; \ | |
| - locs=`for p in $$list; do echo $$p; done | \ | |
| - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ | |
| - sort -u`; \ | |
| - test -z "$$locs" || { \ | |
| - echo rm -f $${locs}; \ | |
| - rm -f $${locs}; \ | |
| - } | |
| + @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ | |
| + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ | |
| + test "$$dir" != "$$p" || dir=.; \ | |
| + echo "rm -f \"$${dir}/so_locations\""; \ | |
| + rm -f "$${dir}/so_locations"; \ | |
| + done | |
| math/$(am__dirstamp): | |
| @$(MKDIR_P) math | |
| @: > math/$(am__dirstamp) | |
| @@ -665,7 +636,7 @@ | |
| strtod/$(DEPDIR)/$(am__dirstamp) | |
| strtod/tens_in_limb.lo: strtod/$(am__dirstamp) \ | |
| strtod/$(DEPDIR)/$(am__dirstamp) | |
| -libquadmath.la: $(libquadmath_la_OBJECTS) $(libquadmath_la_DEPENDENCIES) $(EXTRA_libquadmath_la_DEPENDENCIES) | |
| +libquadmath.la: $(libquadmath_la_OBJECTS) $(libquadmath_la_DEPENDENCIES) | |
| $(libquadmath_la_LINK) $(am_libquadmath_la_rpath) $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) $(LIBS) | |
| mostlyclean-compile: | |
| @@ -999,15 +970,32 @@ | |
| distclean-libtool: | |
| -rm -f libtool config.lt | |
| +# GNU Make needs to see an explicit $(MAKE) variable in the command it | |
| +# runs to enable its job server during parallel builds. Hence the | |
| +# comments below. | |
| +all-multi: | |
| + $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) | |
| +install-multi: | |
| + $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE) | |
| + | |
| +mostlyclean-multi: | |
| + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE) | |
| +clean-multi: | |
| + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE) | |
| +distclean-multi: | |
| + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE) | |
| +maintainer-clean-multi: | |
| + $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE) | |
| + | |
| libquadmath.dvi: libquadmath.texi $(libquadmath_TEXINFOS) | |
| TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ | |
| MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ | |
| - $(TEXI2DVI) --clean -o $@ `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi | |
| + $(TEXI2DVI) -o $@ `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi | |
| libquadmath.pdf: libquadmath.texi $(libquadmath_TEXINFOS) | |
| TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ | |
| MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ | |
| - $(TEXI2PDF) --clean -o $@ `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi | |
| + $(TEXI2PDF) -o $@ `test -f 'libquadmath.texi' || echo '$(srcdir)/'`libquadmath.texi | |
| libquadmath.html: libquadmath.texi $(libquadmath_TEXINFOS) | |
| rm -rf $(@:.html=.htp) | |
| @@ -1024,7 +1012,7 @@ | |
| fi | |
| .dvi.ps: | |
| TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ | |
| - $(DVIPS) -o $@ $< | |
| + $(DVIPS) -o $@ $< | |
| uninstall-dvi-am: | |
| @$(NORMAL_UNINSTALL) | |
| @@ -1046,7 +1034,9 @@ | |
| uninstall-info-am: | |
| @$(PRE_UNINSTALL) | |
| - @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \ | |
| + @if test -d '$(DESTDIR)$(infodir)' && \ | |
| + (install-info --version && \ | |
| + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ | |
| list='$(INFO_DEPS)'; \ | |
| for file in $$list; do \ | |
| relfile=`echo "$$file" | sed 's|^.*/||'`; \ | |
| @@ -1121,11 +1111,8 @@ | |
| done | |
| install-nodist_libsubincludeHEADERS: $(nodist_libsubinclude_HEADERS) | |
| @$(NORMAL_INSTALL) | |
| + test -z "$(libsubincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libsubincludedir)" | |
| @list='$(nodist_libsubinclude_HEADERS)'; test -n "$(libsubincludedir)" || list=; \ | |
| - if test -n "$$list"; then \ | |
| - echo " $(MKDIR_P) '$(DESTDIR)$(libsubincludedir)'"; \ | |
| - $(MKDIR_P) "$(DESTDIR)$(libsubincludedir)" || exit 1; \ | |
| - fi; \ | |
| for p in $$list; do \ | |
| if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
| echo "$$d$$p"; \ | |
| @@ -1139,7 +1126,9 @@ | |
| @$(NORMAL_UNINSTALL) | |
| @list='$(nodist_libsubinclude_HEADERS)'; test -n "$(libsubincludedir)" || list=; \ | |
| files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | |
| - dir='$(DESTDIR)$(libsubincludedir)'; $(am__uninstall_files_from_dir) | |
| + test -n "$$files" || exit 0; \ | |
| + echo " ( cd '$(DESTDIR)$(libsubincludedir)' && rm -f" $$files ")"; \ | |
| + cd "$(DESTDIR)$(libsubincludedir)" && rm -f $$files | |
| ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | |
| list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| @@ -1190,37 +1179,13 @@ | |
| && $(am__cd) $(top_srcdir) \ | |
| && gtags -i $(GTAGS_ARGS) "$$here" | |
| -cscope: cscope.files | |
| - test ! -s cscope.files \ | |
| - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) | |
| - | |
| -clean-cscope: | |
| - -rm -f cscope.files | |
| - | |
| -cscope.files: clean-cscope cscopelist | |
| - | |
| -cscopelist: $(HEADERS) $(SOURCES) $(LISP) | |
| - list='$(SOURCES) $(HEADERS) $(LISP)'; \ | |
| - case "$(srcdir)" in \ | |
| - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | |
| - *) sdir=$(subdir)/$(srcdir) ;; \ | |
| - esac; \ | |
| - for i in $$list; do \ | |
| - if test -f "$$i"; then \ | |
| - echo "$(subdir)/$$i"; \ | |
| - else \ | |
| - echo "$$sdir/$$i"; \ | |
| - fi; \ | |
| - done >> $(top_builddir)/cscope.files | |
| - | |
| distclean-tags: | |
| -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | |
| - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files | |
| check-am: all-am | |
| check: check-am | |
| @BUILD_LIBQUADMATH_FALSE@all-local: | |
| -all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h \ | |
| - all-local | |
| +all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) all-multi $(HEADERS) \ | |
| + config.h all-local | |
| installdirs: | |
| for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(libsubincludedir)"; do \ | |
| test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | |
| @@ -1235,15 +1200,10 @@ | |
| installcheck: installcheck-am | |
| install-strip: | |
| - if test -z '$(STRIP)'; then \ | |
| - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | |
| - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | |
| - install; \ | |
| - else \ | |
| - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | |
| - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | |
| - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ | |
| - fi | |
| + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | |
| + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | |
| + `test -z '$(STRIP)' || \ | |
| + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | |
| mostlyclean-generic: | |
| clean-generic: | |
| @@ -1263,12 +1223,12 @@ | |
| @echo "This command is intended for maintainers to use" | |
| @echo "it deletes files that may require special tools to rebuild." | |
| -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) | |
| -clean: clean-am | |
| +clean: clean-am clean-multi | |
| clean-am: clean-aminfo clean-generic clean-libtool \ | |
| clean-toolexeclibLTLIBRARIES mostlyclean-am | |
| -distclean: distclean-am | |
| +distclean: distclean-am distclean-multi | |
| -rm -f $(am__CONFIG_DISTCLEAN_FILES) | |
| -rm -rf math/$(DEPDIR) printf/$(DEPDIR) strtod/$(DEPDIR) | |
| -rm -f Makefile | |
| @@ -1293,11 +1253,8 @@ | |
| install-dvi-am: $(DVIS) | |
| @$(NORMAL_INSTALL) | |
| + test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" | |
| @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ | |
| - if test -n "$$list"; then \ | |
| - echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \ | |
| - $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \ | |
| - fi; \ | |
| for p in $$list; do \ | |
| if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
| echo "$$d$$p"; \ | |
| @@ -1306,28 +1263,24 @@ | |
| echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ | |
| $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ | |
| done | |
| -install-exec-am: install-toolexeclibLTLIBRARIES | |
| +install-exec-am: install-multi install-toolexeclibLTLIBRARIES | |
| install-html: install-html-am | |
| install-html-am: $(HTMLS) | |
| @$(NORMAL_INSTALL) | |
| + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" | |
| @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ | |
| - if test -n "$$list"; then \ | |
| - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ | |
| - $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ | |
| - fi; \ | |
| for p in $$list; do \ | |
| if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
| $(am__strip_dir) \ | |
| - d2=$$d$$p; \ | |
| - if test -d "$$d2"; then \ | |
| + if test -d "$$d$$p"; then \ | |
| echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ | |
| $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ | |
| - echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ | |
| - $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ | |
| + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ | |
| + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ | |
| else \ | |
| - list2="$$list2 $$d2"; \ | |
| + list2="$$list2 $$d$$p"; \ | |
| fi; \ | |
| done; \ | |
| test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ | |
| @@ -1339,12 +1292,9 @@ | |
| install-info-am: $(INFO_DEPS) | |
| @$(NORMAL_INSTALL) | |
| + test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" | |
| @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ | |
| - if test -n "$$list"; then \ | |
| - echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \ | |
| - $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \ | |
| - fi; \ | |
| for file in $$list; do \ | |
| case $$file in \ | |
| $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| @@ -1362,7 +1312,8 @@ | |
| echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ | |
| $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done | |
| @$(POST_INSTALL) | |
| - @if $(am__can_run_installinfo); then \ | |
| + @if (install-info --version && \ | |
| + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ | |
| list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ | |
| for file in $$list; do \ | |
| relfile=`echo "$$file" | sed 's|^.*/||'`; \ | |
| @@ -1376,11 +1327,8 @@ | |
| install-pdf-am: $(PDFS) | |
| @$(NORMAL_INSTALL) | |
| + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" | |
| @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ | |
| - if test -n "$$list"; then \ | |
| - echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \ | |
| - $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \ | |
| - fi; \ | |
| for p in $$list; do \ | |
| if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
| echo "$$d$$p"; \ | |
| @@ -1392,11 +1340,8 @@ | |
| install-ps-am: $(PSS) | |
| @$(NORMAL_INSTALL) | |
| + test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" | |
| @list='$(PSS)'; test -n "$(psdir)" || list=; \ | |
| - if test -n "$$list"; then \ | |
| - echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \ | |
| - $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \ | |
| - fi; \ | |
| for p in $$list; do \ | |
| if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
| echo "$$d$$p"; \ | |
| @@ -1406,7 +1351,7 @@ | |
| $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done | |
| installcheck-am: | |
| -maintainer-clean: maintainer-clean-am | |
| +maintainer-clean: maintainer-clean-am maintainer-clean-multi | |
| -rm -f $(am__CONFIG_DISTCLEAN_FILES) | |
| -rm -rf $(top_srcdir)/autom4te.cache | |
| -rm -rf math/$(DEPDIR) printf/$(DEPDIR) strtod/$(DEPDIR) | |
| @@ -1414,7 +1359,7 @@ | |
| maintainer-clean-am: distclean-am maintainer-clean-aminfo \ | |
| maintainer-clean-generic | |
| -mostlyclean: mostlyclean-am | |
| +mostlyclean: mostlyclean-am mostlyclean-multi | |
| mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ | |
| mostlyclean-generic mostlyclean-libtool | |
| @@ -1431,26 +1376,30 @@ | |
| uninstall-nodist_libsubincludeHEADERS uninstall-pdf-am \ | |
| uninstall-ps-am uninstall-toolexeclibLTLIBRARIES | |
| -.MAKE: all install-am install-strip | |
| - | |
| -.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ | |
| - clean clean-aminfo clean-cscope clean-generic clean-libtool \ | |
| - clean-toolexeclibLTLIBRARIES cscope cscopelist ctags dist-info \ | |
| +.MAKE: all all-multi clean-multi distclean-multi install-am \ | |
| + install-multi install-strip maintainer-clean-multi \ | |
| + mostlyclean-multi | |
| + | |
| +.PHONY: CTAGS GTAGS all all-am all-local all-multi am--refresh check \ | |
| + check-am clean clean-aminfo clean-generic clean-libtool \ | |
| + clean-multi clean-toolexeclibLTLIBRARIES ctags dist-info \ | |
| distclean distclean-compile distclean-generic distclean-hdr \ | |
| - distclean-libtool distclean-tags dvi dvi-am html html-am info \ | |
| - info-am install install-am install-data install-data-am \ | |
| - install-dvi install-dvi-am install-exec install-exec-am \ | |
| - install-html install-html-am install-info install-info-am \ | |
| - install-man install-nodist_libsubincludeHEADERS install-pdf \ | |
| - install-pdf-am install-ps install-ps-am install-strip \ | |
| + distclean-libtool distclean-multi distclean-tags dvi dvi-am \ | |
| + html html-am info info-am install install-am install-data \ | |
| + install-data-am install-dvi install-dvi-am install-exec \ | |
| + install-exec-am install-html install-html-am install-info \ | |
| + install-info-am install-man install-multi \ | |
| + install-nodist_libsubincludeHEADERS install-pdf install-pdf-am \ | |
| + install-ps install-ps-am install-strip \ | |
| install-toolexeclibLTLIBRARIES installcheck installcheck-am \ | |
| installdirs maintainer-clean maintainer-clean-aminfo \ | |
| - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ | |
| - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | |
| - pdf pdf-am ps ps-am tags uninstall uninstall-am \ | |
| - uninstall-dvi-am uninstall-html-am uninstall-info-am \ | |
| - uninstall-nodist_libsubincludeHEADERS uninstall-pdf-am \ | |
| - uninstall-ps-am uninstall-toolexeclibLTLIBRARIES | |
| + maintainer-clean-generic maintainer-clean-multi mostlyclean \ | |
| + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ | |
| + mostlyclean-libtool mostlyclean-multi pdf pdf-am ps ps-am tags \ | |
| + uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ | |
| + uninstall-info-am uninstall-nodist_libsubincludeHEADERS \ | |
| + uninstall-pdf-am uninstall-ps-am \ | |
| + uninstall-toolexeclibLTLIBRARIES | |
| @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@quadmath.map-sun : $(srcdir)/quadmath.map \ | |
| @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@ $(top_srcdir)/../contrib/make_sunver.pl \ | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libssp/aclocal.m4 orig/gcc-4.7.0/libssp/aclocal.m4 | |
| --- ./gcc-4.7.0/libssp/aclocal.m4 2015-10-18 19:59:06.237253126 -0400 | |
| +++ orig/gcc-4.7.0/libssp/aclocal.m4 2011-02-13 06:45:53.000000000 -0500 | |
| @@ -1,8 +1,7 @@ | |
| -# generated automatically by aclocal 1.12 -*- Autoconf -*- | |
| +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- | |
| # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | |
| -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, | |
| -# Inc. | |
| +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -18,26 +17,24 @@ | |
| [m4_warning([this file was generated for autoconf 2.64. | |
| You have another version of autoconf. It may work, but is not guaranteed to. | |
| If you have problems, you may need to regenerate the build system entirely. | |
| -To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | |
| +To do so, use the procedure documented by the package, typically `autoreconf'.])]) | |
| -# Copyright (C) 2002-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 8 | |
| - | |
| # AM_AUTOMAKE_VERSION(VERSION) | |
| # ---------------------------- | |
| # Automake X.Y traces this macro to ensure aclocal.m4 has been | |
| # generated from the m4 files accompanying Automake X.Y. | |
| # (This private macro should not be called outside this file.) | |
| AC_DEFUN([AM_AUTOMAKE_VERSION], | |
| -[am__api_version='1.12' | |
| +[am__api_version='1.11' | |
| dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | |
| dnl require some minimum version. Point them to the right macro. | |
| -m4_if([$1], [1.12], [], | |
| +m4_if([$1], [1.11.1], [], | |
| [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | |
| ]) | |
| @@ -53,24 +50,22 @@ | |
| # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | |
| # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | |
| AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | |
| -[AM_AUTOMAKE_VERSION([1.12])dnl | |
| +[AM_AUTOMAKE_VERSION([1.11.1])dnl | |
| m4_ifndef([AC_AUTOCONF_VERSION], | |
| [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |
| _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | |
| # AM_AUX_DIR_EXPAND -*- Autoconf -*- | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 2 | |
| - | |
| # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets | |
| -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to | |
| -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. | |
| +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to | |
| +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. | |
| # | |
| # Of course, Automake must honor this variable whenever it calls a | |
| # tool from the auxiliary directory. The problem is that $srcdir (and | |
| @@ -89,7 +84,7 @@ | |
| # | |
| # The reason of the latter failure is that $top_srcdir and $ac_aux_dir | |
| # are both prefixed by $srcdir. In an in-source build this is usually | |
| -# harmless because $srcdir is '.', but things will broke when you | |
| +# harmless because $srcdir is `.', but things will broke when you | |
| # start a VPATH build or use an absolute $srcdir. | |
| # | |
| # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, | |
| @@ -115,21 +110,22 @@ | |
| # AM_CONDITIONAL -*- Autoconf -*- | |
| -# Copyright (C) 1997-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 10 | |
| +# serial 9 | |
| # AM_CONDITIONAL(NAME, SHELL-CONDITION) | |
| # ------------------------------------- | |
| # Define a conditional. | |
| AC_DEFUN([AM_CONDITIONAL], | |
| -[AC_PREREQ([2.52])dnl | |
| - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], | |
| - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl | |
| +[AC_PREREQ(2.52)dnl | |
| + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], | |
| + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl | |
| AC_SUBST([$1_TRUE])dnl | |
| AC_SUBST([$1_FALSE])dnl | |
| _AM_SUBST_NOTMAKE([$1_TRUE])dnl | |
| @@ -148,15 +144,16 @@ | |
| Usually this means the macro was only invoked conditionally.]]) | |
| fi])]) | |
| -# Copyright (C) 1999-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 16 | |
| +# serial 10 | |
| -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be | |
| +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | |
| # written in clear, in which case automake, when reading aclocal.m4, | |
| # will think it sees a *use*, and therefore will trigger all it's | |
| # C support machinery. Also note that it means that autoscan, seeing | |
| @@ -179,12 +176,12 @@ | |
| AC_REQUIRE([AM_MAKE_INCLUDE])dnl | |
| AC_REQUIRE([AM_DEP_TRACK])dnl | |
| -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], | |
| - [$1], [CXX], [depcc="$CXX" am_compiler_list=], | |
| - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], | |
| - [$1], [UPC], [depcc="$UPC" am_compiler_list=], | |
| - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], | |
| - [depcc="$$1" am_compiler_list=]) | |
| +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], | |
| + [$1], CXX, [depcc="$CXX" am_compiler_list=], | |
| + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], | |
| + [$1], UPC, [depcc="$UPC" am_compiler_list=], | |
| + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], | |
| + [depcc="$$1" am_compiler_list=]) | |
| AC_CACHE_CHECK([dependency style of $depcc], | |
| [am_cv_$1_dependencies_compiler_type], | |
| @@ -192,9 +189,8 @@ | |
| # We make a subdir and do the tests there. Otherwise we can end up | |
| # making bogus files that we don't know about and never remove. For | |
| # instance it was reported that on HP-UX the gcc test will end up | |
| - # making a dummy file named 'D' -- because '-MD' means "put the output | |
| - # in D". | |
| - rm -rf conftest.dir | |
| + # making a dummy file named `D' -- because `-MD' means `put the output | |
| + # in D'. | |
| mkdir conftest.dir | |
| # Copy depcomp to subdir because otherwise we won't find it if we're | |
| # using a relative directory. | |
| @@ -233,16 +229,16 @@ | |
| : > sub/conftest.c | |
| for i in 1 2 3 4 5 6; do | |
| echo '#include "conftst'$i'.h"' >> sub/conftest.c | |
| - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with | |
| - # Solaris 10 /bin/sh. | |
| - echo '/* dummy */' > sub/conftst$i.h | |
| + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | |
| + # Solaris 8's {/usr,}/bin/sh. | |
| + touch sub/conftst$i.h | |
| done | |
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | |
| - # We check with '-c' and '-o' for the sake of the "dashmstdout" | |
| + # We check with `-c' and `-o' for the sake of the "dashmstdout" | |
| # mode. It turns out that the SunPro C++ compiler does not properly | |
| - # handle '-M -o', and we need to detect this. Also, some Intel | |
| - # versions had trouble with output in subdirs. | |
| + # handle `-M -o', and we need to detect this. Also, some Intel | |
| + # versions had trouble with output in subdirs | |
| am__obj=sub/conftest.${OBJEXT-o} | |
| am__minus_obj="-o $am__obj" | |
| case $depmode in | |
| @@ -251,16 +247,16 @@ | |
| test "$am__universal" = false || continue | |
| ;; | |
| nosideeffect) | |
| - # After this tag, mechanisms are not by side-effect, so they'll | |
| - # only be used when explicitly requested. | |
| + # after this tag, mechanisms are not by side-effect, so they'll | |
| + # only be used when explicitly requested | |
| if test "x$enable_dependency_tracking" = xyes; then | |
| continue | |
| else | |
| break | |
| fi | |
| ;; | |
| - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | |
| - # This compiler won't grok '-c -o', but also, the minuso test has | |
| + msvisualcpp | msvcmsys) | |
| + # This compiler won't grok `-c -o', but also, the minuso test has | |
| # not run yet. These depmodes are late enough in the game, and | |
| # so weak that their functioning should not be impacted. | |
| am__obj=conftest.${OBJEXT-o} | |
| @@ -308,7 +304,7 @@ | |
| # AM_SET_DEPDIR | |
| # ------------- | |
| # Choose a directory name for dependency files. | |
| -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. | |
| +# This macro is AC_REQUIREd in _AM_DEPENDENCIES | |
| AC_DEFUN([AM_SET_DEPDIR], | |
| [AC_REQUIRE([AM_SET_LEADING_DOT])dnl | |
| AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl | |
| @@ -318,34 +314,28 @@ | |
| # AM_DEP_TRACK | |
| # ------------ | |
| AC_DEFUN([AM_DEP_TRACK], | |
| -[AC_ARG_ENABLE([dependency-tracking], [dnl | |
| -AS_HELP_STRING( | |
| - [--enable-dependency-tracking], | |
| - [do not reject slow dependency extractors]) | |
| -AS_HELP_STRING( | |
| - [--disable-dependency-tracking], | |
| - [speeds up one-time build])]) | |
| +[AC_ARG_ENABLE(dependency-tracking, | |
| +[ --disable-dependency-tracking speeds up one-time build | |
| + --enable-dependency-tracking do not reject slow dependency extractors]) | |
| if test "x$enable_dependency_tracking" != xno; then | |
| am_depcomp="$ac_aux_dir/depcomp" | |
| AMDEPBACKSLASH='\' | |
| - am__nodep='_no' | |
| fi | |
| AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | |
| AC_SUBST([AMDEPBACKSLASH])dnl | |
| _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | |
| -AC_SUBST([am__nodep])dnl | |
| -_AM_SUBST_NOTMAKE([am__nodep])dnl | |
| ]) | |
| # Generate code to set up dependency tracking. -*- Autoconf -*- | |
| -# Copyright (C) 1999-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 6 | |
| +#serial 5 | |
| # _AM_OUTPUT_DEPENDENCY_COMMANDS | |
| # ------------------------------ | |
| @@ -364,7 +354,7 @@ | |
| # Strip MF so we end up with the name of the file. | |
| mf=`echo "$mf" | sed -e 's/:.*$//'` | |
| # Check whether this is an Automake generated Makefile or not. | |
| - # We used to match only the files named 'Makefile.in', but | |
| + # We used to match only the files named `Makefile.in', but | |
| # some people rename them; so instead we look at the file content. | |
| # Grep'ing the first line is not enough: some people post-process | |
| # each Makefile.in and add a new line on top of each file to say so. | |
| @@ -376,19 +366,21 @@ | |
| continue | |
| fi | |
| # Extract the definition of DEPDIR, am__include, and am__quote | |
| - # from the Makefile without running 'make'. | |
| + # from the Makefile without running `make'. | |
| DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | |
| test -z "$DEPDIR" && continue | |
| am__include=`sed -n 's/^am__include = //p' < "$mf"` | |
| test -z "am__include" && continue | |
| am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | |
| + # When using ansi2knr, U may be empty or an underscore; expand it | |
| + U=`sed -n 's/^U = //p' < "$mf"` | |
| # Find all dependency output files, they are included files with | |
| # $(DEPDIR) in their names. We invoke sed twice because it is the | |
| # simplest approach to changing $(DEPDIR) to its actual value in the | |
| # expansion. | |
| for file in `sed -n " | |
| s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | |
| - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do | |
| + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | |
| # Make sure the directory exists. | |
| test -f "$dirpart/$file" && continue | |
| fdir=`AS_DIRNAME(["$file"])` | |
| @@ -406,7 +398,7 @@ | |
| # This macro should only be invoked once -- use via AC_REQUIRE. | |
| # | |
| # This code is only required when automatic dependency tracking | |
| -# is enabled. FIXME. This creates each '.P' file that we will | |
| +# is enabled. FIXME. This creates each `.P' file that we will | |
| # need in order to bootstrap the dependency handling code. | |
| AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | |
| [AC_CONFIG_COMMANDS([depfiles], | |
| @@ -416,13 +408,14 @@ | |
| # Do all the work for Automake. -*- Autoconf -*- | |
| -# Copyright (C) 1996-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | |
| +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 18 | |
| +# serial 16 | |
| # This macro actually does too much. Some checks are only needed if | |
| # your package does certain things. But this isn't really a big deal. | |
| @@ -473,25 +466,23 @@ | |
| AC_SUBST([VERSION], [$2])], | |
| [_AM_SET_OPTIONS([$1])dnl | |
| dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | |
| -m4_if( | |
| - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), | |
| - [ok:ok],, | |
| +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, | |
| [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | |
| AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | |
| AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl | |
| _AM_IF_OPTION([no-define],, | |
| -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) | |
| - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl | |
| +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) | |
| + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl | |
| # Some tools Automake needs. | |
| AC_REQUIRE([AM_SANITY_CHECK])dnl | |
| AC_REQUIRE([AC_ARG_PROGRAM])dnl | |
| -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) | |
| -AM_MISSING_PROG([AUTOCONF], [autoconf]) | |
| -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) | |
| -AM_MISSING_PROG([AUTOHEADER], [autoheader]) | |
| -AM_MISSING_PROG([MAKEINFO], [makeinfo]) | |
| +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) | |
| +AM_MISSING_PROG(AUTOCONF, autoconf) | |
| +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) | |
| +AM_MISSING_PROG(AUTOHEADER, autoheader) | |
| +AM_MISSING_PROG(MAKEINFO, makeinfo) | |
| AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | |
| AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl | |
| AC_REQUIRE([AM_PROG_MKDIR_P])dnl | |
| @@ -505,28 +496,28 @@ | |
| [_AM_PROG_TAR([v7])])]) | |
| _AM_IF_OPTION([no-dependencies],, | |
| [AC_PROVIDE_IFELSE([AC_PROG_CC], | |
| - [_AM_DEPENDENCIES([CC])], | |
| + [_AM_DEPENDENCIES(CC)], | |
| [define([AC_PROG_CC], | |
| - defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl | |
| + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl | |
| AC_PROVIDE_IFELSE([AC_PROG_CXX], | |
| - [_AM_DEPENDENCIES([CXX])], | |
| + [_AM_DEPENDENCIES(CXX)], | |
| [define([AC_PROG_CXX], | |
| - defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl | |
| + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | |
| AC_PROVIDE_IFELSE([AC_PROG_OBJC], | |
| - [_AM_DEPENDENCIES([OBJC])], | |
| + [_AM_DEPENDENCIES(OBJC)], | |
| [define([AC_PROG_OBJC], | |
| - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl | |
| + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | |
| ]) | |
| _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl | |
| -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the | |
| -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | |
| +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the | |
| +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | |
| dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. | |
| AC_CONFIG_COMMANDS_PRE(dnl | |
| [m4_provide_if([_AM_COMPILER_EXEEXT], | |
| [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | |
| ]) | |
| -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | |
| +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | |
| dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | |
| dnl mangled by Autoconf and run in a shell conditional statement. | |
| m4_define([_AC_COMPILER_EXEEXT], | |
| @@ -554,14 +545,12 @@ | |
| done | |
| echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 8 | |
| - | |
| # AM_PROG_INSTALL_SH | |
| # ------------------ | |
| # Define $install_sh. | |
| @@ -575,24 +564,25 @@ | |
| install_sh="\${SHELL} $am_aux_dir/install-sh" | |
| esac | |
| fi | |
| -AC_SUBST([install_sh])]) | |
| +AC_SUBST(install_sh)]) | |
| # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | |
| # From Jim Meyering | |
| -# Copyright (C) 1996-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 7 | |
| +# serial 5 | |
| # AM_MAINTAINER_MODE([DEFAULT-MODE]) | |
| # ---------------------------------- | |
| # Control maintainer-specific portions of Makefiles. | |
| -# Default is to disable them, unless 'enable' is passed literally. | |
| -# For symmetry, 'disable' may be passed as well. Anyway, the user | |
| +# Default is to disable them, unless `enable' is passed literally. | |
| +# For symmetry, `disable' may be passed as well. Anyway, the user | |
| # can override the default with the --enable/--disable switch. | |
| AC_DEFUN([AM_MAINTAINER_MODE], | |
| [m4_case(m4_default([$1], [disable]), | |
| @@ -600,14 +590,13 @@ | |
| [disable], [m4_define([am_maintainer_other], [enable])], | |
| [m4_define([am_maintainer_other], [enable]) | |
| m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) | |
| -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | |
| +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) | |
| dnl maintainer-mode's default is 'disable' unless 'enable' is passed | |
| AC_ARG_ENABLE([maintainer-mode], | |
| - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], | |
| - am_maintainer_other[ make rules and dependencies not useful | |
| - (and sometimes confusing) to the casual installer])], | |
| - [USE_MAINTAINER_MODE=$enableval], | |
| - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | |
| +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful | |
| + (and sometimes confusing) to the casual installer], | |
| + [USE_MAINTAINER_MODE=$enableval], | |
| + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | |
| AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | |
| AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) | |
| MAINT=$MAINTAINER_MODE_TRUE | |
| @@ -619,13 +608,13 @@ | |
| # Check to see how 'make' treats includes. -*- Autoconf -*- | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 5 | |
| +# serial 4 | |
| # AM_MAKE_INCLUDE() | |
| # ----------------- | |
| @@ -644,7 +633,7 @@ | |
| _am_result=none | |
| # First try GNU make style include. | |
| echo "include confinc" > confmf | |
| -# Ignore all kinds of additional output from 'make'. | |
| +# Ignore all kinds of additional output from `make'. | |
| case `$am_make -s -f confmf 2> /dev/null` in #( | |
| *the\ am__doit\ target*) | |
| am__include=include | |
| @@ -671,13 +660,14 @@ | |
| # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | |
| -# Copyright (C) 1997-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 7 | |
| +# serial 6 | |
| # AM_MISSING_PROG(NAME, PROGRAM) | |
| # ------------------------------ | |
| @@ -707,21 +697,19 @@ | |
| am_missing_run="$MISSING --run " | |
| else | |
| am_missing_run= | |
| - AC_MSG_WARN(['missing' script is too old or missing]) | |
| + AC_MSG_WARN([`missing' script is too old or missing]) | |
| fi | |
| ]) | |
| -# Copyright (C) 2003-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 2 | |
| - | |
| # AM_PROG_MKDIR_P | |
| # --------------- | |
| -# Check for 'mkdir -p'. | |
| +# Check for `mkdir -p'. | |
| AC_DEFUN([AM_PROG_MKDIR_P], | |
| [AC_PREREQ([2.60])dnl | |
| AC_REQUIRE([AC_PROG_MKDIR_P])dnl | |
| @@ -741,13 +729,13 @@ | |
| # Helper functions for option handling. -*- Autoconf -*- | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 6 | |
| +# serial 4 | |
| # _AM_MANGLE_OPTION(NAME) | |
| # ----------------------- | |
| @@ -755,13 +743,13 @@ | |
| [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) | |
| # _AM_SET_OPTION(NAME) | |
| -# -------------------- | |
| +# ------------------------------ | |
| # Set option NAME. Presently that only means defining a flag for this option. | |
| AC_DEFUN([_AM_SET_OPTION], | |
| -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) | |
| +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) | |
| # _AM_SET_OPTIONS(OPTIONS) | |
| -# ------------------------ | |
| +# ---------------------------------- | |
| # OPTIONS is a space-separated list of Automake options. | |
| AC_DEFUN([_AM_SET_OPTIONS], | |
| [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | |
| @@ -774,18 +762,22 @@ | |
| # Check to make sure that the build environment is sane. -*- Autoconf -*- | |
| -# Copyright (C) 1996-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 | |
| +# Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 9 | |
| +# serial 5 | |
| # AM_SANITY_CHECK | |
| # --------------- | |
| AC_DEFUN([AM_SANITY_CHECK], | |
| [AC_MSG_CHECKING([whether build environment is sane]) | |
| +# Just in case | |
| +sleep 1 | |
| +echo timestamp > conftest.file | |
| # Reject unsafe characters in $srcdir or the absolute working directory | |
| # name. Accept space and tab only in the latter. | |
| am_lf=' | |
| @@ -796,40 +788,32 @@ | |
| esac | |
| case $srcdir in | |
| *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) | |
| - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; | |
| + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; | |
| esac | |
| -# Do 'set' in a subshell so we don't clobber the current shell's | |
| +# Do `set' in a subshell so we don't clobber the current shell's | |
| # arguments. Must try -L first in case configure is actually a | |
| # symlink; some systems play weird games with the mod time of symlinks | |
| # (eg FreeBSD returns the mod time of the symlink's containing | |
| # directory). | |
| if ( | |
| - am_has_slept=no | |
| - for am_try in 1 2; do | |
| - echo "timestamp, slept: $am_has_slept" > conftest.file | |
| - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| - if test "$[*]" = "X"; then | |
| - # -L didn't work. | |
| - set X `ls -t "$srcdir/configure" conftest.file` | |
| - fi | |
| - if test "$[*]" != "X $srcdir/configure conftest.file" \ | |
| - && test "$[*]" != "X conftest.file $srcdir/configure"; then | |
| - | |
| - # If neither matched, then we have a broken ls. This can happen | |
| - # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| - # broken ls alias from the environment. This has actually | |
| - # happened. Such a system could not be considered "sane". | |
| - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken | |
| - alias in your environment]) | |
| - fi | |
| - if test "$[2]" = conftest.file || test $am_try -eq 2; then | |
| - break | |
| - fi | |
| - # Just in case. | |
| - sleep 1 | |
| - am_has_slept=yes | |
| - done | |
| + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| + if test "$[*]" = "X"; then | |
| + # -L didn't work. | |
| + set X `ls -t "$srcdir/configure" conftest.file` | |
| + fi | |
| + rm -f conftest.file | |
| + if test "$[*]" != "X $srcdir/configure conftest.file" \ | |
| + && test "$[*]" != "X conftest.file $srcdir/configure"; then | |
| + | |
| + # If neither matched, then we have a broken ls. This can happen | |
| + # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| + # broken ls alias from the environment. This has actually | |
| + # happened. Such a system could not be considered "sane". | |
| + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken | |
| +alias in your environment]) | |
| + fi | |
| + | |
| test "$[2]" = conftest.file | |
| ) | |
| then | |
| @@ -839,61 +823,43 @@ | |
| AC_MSG_ERROR([newly created file is older than distributed files! | |
| Check your system clock]) | |
| fi | |
| -AC_MSG_RESULT([yes]) | |
| -# If we didn't sleep, we still need to ensure time stamps of config.status and | |
| -# generated files are strictly newer. | |
| -am_sleep_pid= | |
| -if grep 'slept: no' conftest.file >/dev/null 2>&1; then | |
| - ( sleep 1 ) & | |
| - am_sleep_pid=$! | |
| -fi | |
| -AC_CONFIG_COMMANDS_PRE( | |
| - [AC_MSG_CHECKING([that generated files are newer than configure]) | |
| - if test -n "$am_sleep_pid"; then | |
| - # Hide warnings about reused PIDs. | |
| - wait $am_sleep_pid 2>/dev/null | |
| - fi | |
| - AC_MSG_RESULT([done])]) | |
| -rm -f conftest.file | |
| -]) | |
| +AC_MSG_RESULT(yes)]) | |
| -# Copyright (C) 2001-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 2 | |
| - | |
| # AM_PROG_INSTALL_STRIP | |
| # --------------------- | |
| -# One issue with vendor 'install' (even GNU) is that you can't | |
| +# One issue with vendor `install' (even GNU) is that you can't | |
| # specify the program used to strip binaries. This is especially | |
| # annoying in cross-compiling environments, where the build's strip | |
| # is unlikely to handle the host's binaries. | |
| # Fortunately install-sh will honor a STRIPPROG variable, so we | |
| -# always use install-sh in "make install-strip", and initialize | |
| +# always use install-sh in `make install-strip', and initialize | |
| # STRIPPROG with the value of the STRIP variable (set by the user). | |
| AC_DEFUN([AM_PROG_INSTALL_STRIP], | |
| [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl | |
| -# Installed binaries are usually stripped using 'strip' when the user | |
| -# run "make install-strip". However 'strip' might not be the right | |
| +# Installed binaries are usually stripped using `strip' when the user | |
| +# run `make install-strip'. However `strip' might not be the right | |
| # tool to use in cross-compilation environments, therefore Automake | |
| -# will honor the 'STRIP' environment variable to overrule this program. | |
| -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. | |
| +# will honor the `STRIP' environment variable to overrule this program. | |
| +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. | |
| if test "$cross_compiling" != no; then | |
| AC_CHECK_TOOL([STRIP], [strip], :) | |
| fi | |
| INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | |
| AC_SUBST([INSTALL_STRIP_PROGRAM])]) | |
| -# Copyright (C) 2006-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 3 | |
| +# serial 2 | |
| # _AM_SUBST_NOTMAKE(VARIABLE) | |
| # --------------------------- | |
| @@ -902,24 +868,24 @@ | |
| AC_DEFUN([_AM_SUBST_NOTMAKE]) | |
| # AM_SUBST_NOTMAKE(VARIABLE) | |
| -# -------------------------- | |
| +# --------------------------- | |
| # Public sister of _AM_SUBST_NOTMAKE. | |
| AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | |
| # Check how to create a tarball. -*- Autoconf -*- | |
| -# Copyright (C) 2004-2012 Free Software Foundation, Inc. | |
| +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 3 | |
| +# serial 2 | |
| # _AM_PROG_TAR(FORMAT) | |
| # -------------------- | |
| # Check how to create a tarball in format FORMAT. | |
| -# FORMAT should be one of 'v7', 'ustar', or 'pax'. | |
| +# FORMAT should be one of `v7', `ustar', or `pax'. | |
| # | |
| # Substitute a variable $(am__tar) that is a command | |
| # writing to stdout a FORMAT-tarball containing the directory | |
| @@ -930,11 +896,10 @@ | |
| # a tarball read from stdin. | |
| # $(am__untar) < result.tar | |
| AC_DEFUN([_AM_PROG_TAR], | |
| -[# Always define AMTAR for backward compatibility. Yes, it's still used | |
| -# in the wild :-( We should find a proper way to deprecate it ... | |
| -AC_SUBST([AMTAR], ['$${TAR-tar}']) | |
| +[# Always define AMTAR for backward compatibility. | |
| +AM_MISSING_PROG([AMTAR], [tar]) | |
| m4_if([$1], [v7], | |
| - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], | |
| + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], | |
| [m4_case([$1], [ustar],, [pax],, | |
| [m4_fatal([Unknown tar format])]) | |
| AC_MSG_CHECKING([how to create a $1 tar archive]) | |
| @@ -942,7 +907,7 @@ | |
| _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | |
| _am_tools=${am_cv_prog_tar_$1-$_am_tools} | |
| # Do not fold the above two line into one, because Tru64 sh and | |
| -# Solaris sh will not grok spaces in the rhs of '-'. | |
| +# Solaris sh will not grok spaces in the rhs of `-'. | |
| for _am_tool in $_am_tools | |
| do | |
| case $_am_tool in | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libssp/config.h.in orig/gcc-4.7.0/libssp/config.h.in | |
| --- ./gcc-4.7.0/libssp/config.h.in 2015-10-18 19:59:08.000000000 -0400 | |
| +++ orig/gcc-4.7.0/libssp/config.h.in 2010-07-02 06:15:09.000000000 -0400 | |
| @@ -69,7 +69,8 @@ | |
| /* vsnprintf is present and works */ | |
| #undef HAVE_USABLE_VSNPRINTF | |
| -/* Define to the sub-directory where libtool stores uninstalled libraries. */ | |
| +/* Define to the sub-directory in which libtool stores uninstalled libraries. | |
| + */ | |
| #undef LT_OBJDIR | |
| /* Name of package */ | |
| Only in ./gcc-4.7.0/libssp: config.h.in~ | |
| diff -r '--exclude=*.cache' -u ./gcc-4.7.0/libssp/configure orig/gcc-4.7.0/libssp/configure | |
| --- ./gcc-4.7.0/libssp/configure 2015-10-18 19:59:08.127262047 -0400 | |
| +++ orig/gcc-4.7.0/libssp/configure 2011-11-21 14:22:35.000000000 -0500 | |
| @@ -607,17 +607,13 @@ | |
| enable_static | |
| enable_shared | |
| lt_host_flags | |
| -LT_SYS_LIBRARY_PATH | |
| OTOOL64 | |
| OTOOL | |
| LIPO | |
| NMEDIT | |
| DSYMUTIL | |
| -MANIFEST_TOOL | |
| RANLIB | |
| -ac_ct_AR | |
| AR | |
| -DLLTOOL | |
| OBJDUMP | |
| LN_S | |
| NM | |
| @@ -640,7 +636,6 @@ | |
| am__fastdepCC_FALSE | |
| am__fastdepCC_TRUE | |
| CCDEPMODE | |
| -am__nodep | |
| AMDEPBACKSLASH | |
| AMDEP_FALSE | |
| AMDEP_TRUE | |
| @@ -744,17 +739,14 @@ | |
| enable_static | |
| with_pic | |
| enable_fast_install | |
| -with_aix_soname | |
| with_gnu_ld | |
| -with_sysroot | |
| enable_libtool_lock | |
| ' | |
| ac_precious_vars='build_alias | |
| host_alias | |
| target_alias | |
| CPP | |
| -CPPFLAGS | |
| -LT_SYS_LIBRARY_PATH' | |
| +CPPFLAGS' | |
| # Initialize some variables set by options. | |
| @@ -1376,14 +1368,11 @@ | |
| --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | |
| --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | |
| --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory | |
| - --enable-maintainer-mode | |
| - enable make rules and dependencies not useful (and | |
| - sometimes confusing) to the casual installer | |
| + --enable-maintainer-mode enable make rules and dependencies not useful | |
| + (and sometimes confusing) to the casual installer | |
| --enable-multilib build many library versions (default) | |
| - --enable-dependency-tracking | |
| - do not reject slow dependency extractors | |
| - --disable-dependency-tracking | |
| - speeds up one-time build | |
| + --disable-dependency-tracking speeds up one-time build | |
| + --enable-dependency-tracking do not reject slow dependency extractors | |
| --disable-symvers disable symbol versioning for libssp | |
| --enable-shared[=PKGS] build shared libraries [default=yes] | |
| --enable-static[=PKGS] build static libraries [default=yes] | |
| @@ -1394,14 +1383,9 @@ | |
| Optional Packages: | |
| --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | |
| --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | |
| - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use | |
| + --with-pic 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). | |
| Some influential environment variables: | |
| CC C compiler command | |
| @@ -1412,8 +1396,6 @@ | |
| CPPFLAGS C/C++/Objective 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. | |
| @@ -2352,7 +2334,7 @@ | |
| -am__api_version='1.12' | |
| +am__api_version='1.11' | |
| # Find a good install program. We prefer a C program (faster), | |
| # so one script is as good as another. But avoid the broken or | |
| @@ -2449,6 +2431,9 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 | |
| $as_echo_n "checking whether build environment is sane... " >&6; } | |
| +# Just in case | |
| +sleep 1 | |
| +echo timestamp > conftest.file | |
| # Reject unsafe characters in $srcdir or the absolute working directory | |
| # name. Accept space and tab only in the latter. | |
| am_lf=' | |
| @@ -2459,40 +2444,32 @@ | |
| esac | |
| case $srcdir in | |
| *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | |
| - as_fn_error "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; | |
| + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; | |
| esac | |
| -# Do 'set' in a subshell so we don't clobber the current shell's | |
| +# Do `set' in a subshell so we don't clobber the current shell's | |
| # arguments. Must try -L first in case configure is actually a | |
| # symlink; some systems play weird games with the mod time of symlinks | |
| # (eg FreeBSD returns the mod time of the symlink's containing | |
| # directory). | |
| if ( | |
| - am_has_slept=no | |
| - for am_try in 1 2; do | |
| - echo "timestamp, slept: $am_has_slept" > conftest.file | |
| - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| - if test "$*" = "X"; then | |
| - # -L didn't work. | |
| - set X `ls -t "$srcdir/configure" conftest.file` | |
| - fi | |
| - if test "$*" != "X $srcdir/configure conftest.file" \ | |
| - && test "$*" != "X conftest.file $srcdir/configure"; then | |
| + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` | |
| + if test "$*" = "X"; then | |
| + # -L didn't work. | |
| + set X `ls -t "$srcdir/configure" conftest.file` | |
| + fi | |
| + rm -f conftest.file | |
| + if test "$*" != "X $srcdir/configure conftest.file" \ | |
| + && test "$*" != "X conftest.file $srcdir/configure"; then | |
| + | |
| + # If neither matched, then we have a broken ls. This can happen | |
| + # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| + # broken ls alias from the environment. This has actually | |
| + # happened. Such a system could not be considered "sane". | |
| + as_fn_error "ls -t appears to fail. Make sure there is not a broken | |
| +alias in your environment" "$LINENO" 5 | |
| + fi | |
| - # If neither matched, then we have a broken ls. This can happen | |
| - # if, for instance, CONFIG_SHELL is bash and it inherits a | |
| - # broken ls alias from the environment. This has actually | |
| - # happened. Such a system could not be considered "sane". | |
| - as_fn_error "ls -t appears to fail. Make sure there is not a broken | |
| - alias in your environment" "$LINENO" 5 | |
| - fi | |
| - if test "$2" = conftest.file || test $am_try -eq 2; then | |
| - break | |
| - fi | |
| - # Just in case. | |
| - sleep 1 | |
| - am_has_slept=yes | |
| - done | |
| test "$2" = conftest.file | |
| ) | |
| then | |
| @@ -2504,16 +2481,6 @@ | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |
| $as_echo "yes" >&6; } | |
| -# If we didn't sleep, we still need to ensure time stamps of config.status and | |
| -# generated files are strictly newer. | |
| -am_sleep_pid= | |
| -if grep 'slept: no' conftest.file >/dev/null 2>&1; then | |
| - ( sleep 1 ) & | |
| - am_sleep_pid=$! | |
| -fi | |
| - | |
| -rm -f conftest.file | |
| - | |
| test "$program_prefix" != NONE && | |
| program_transform_name="s&^&$program_prefix&;$program_transform_name" | |
| # Use a double $ so make ignores it. | |
| @@ -2540,8 +2507,8 @@ | |
| am_missing_run="$MISSING --run " | |
| else | |
| am_missing_run= | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 | |
| -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} | |
| + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 | |
| +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} | |
| fi | |
| if test x"${install_sh}" != xset; then | |
| @@ -2553,10 +2520,10 @@ | |
| esac | |
| fi | |
| -# Installed binaries are usually stripped using 'strip' when the user | |
| -# run "make install-strip". However 'strip' might not be the right | |
| +# Installed binaries are usually stripped using `strip' when the user | |
| +# run `make install-strip'. However `strip' might not be the right | |
| # tool to use in cross-compilation environments, therefore Automake | |
| -# will honor the 'STRIP' environment variable to overrule this program. | |
| +# will honor the `STRIP' environment variable to overrule this program. | |
| if test "$cross_compiling" != no; then | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | |
| @@ -2835,11 +2802,11 @@ | |
| # We need awk for the "check" target. 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}' | |
| +# Always define AMTAR for backward compatibility. | |
| + | |
| +AMTAR=${AMTAR-"${am_missing_run}tar"} | |
| -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | |
| +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' | |
| @@ -3757,7 +3724,7 @@ | |
| _am_result=none | |
| # First try GNU make style include. | |
| echo "include confinc" > confmf | |
| -# Ignore all kinds of additional output from 'make'. | |
| +# Ignore all kinds of additional output from `make'. | |
| case `$am_make -s -f confmf 2> /dev/null` in #( | |
| *the\ am__doit\ target*) | |
| am__include=include | |
| @@ -3790,7 +3757,6 @@ | |
| if test "x$enable_dependency_tracking" != xno; then | |
| am_depcomp="$ac_aux_dir/depcomp" | |
| AMDEPBACKSLASH='\' | |
| - am__nodep='_no' | |
| fi | |
| if test "x$enable_dependency_tracking" != xno; then | |
| AMDEP_TRUE= | |
| @@ -3813,9 +3779,8 @@ | |
| # We make a subdir and do the tests there. Otherwise we can end up | |
| # making bogus files that we don't know about and never remove. For | |
| # instance it was reported that on HP-UX the gcc test will end up | |
| - # making a dummy file named 'D' -- because '-MD' means "put the output | |
| - # in D". | |
| - rm -rf conftest.dir | |
| + # making a dummy file named `D' -- because `-MD' means `put the output | |
| + # in D'. | |
| mkdir conftest.dir | |
| # Copy depcomp to subdir because otherwise we won't find it if we're | |
| # using a relative directory. | |
| @@ -3849,16 +3814,16 @@ | |
| : > sub/conftest.c | |
| for i in 1 2 3 4 5 6; do | |
| echo '#include "conftst'$i'.h"' >> sub/conftest.c | |
| - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with | |
| - # Solaris 10 /bin/sh. | |
| - echo '/* dummy */' > sub/conftst$i.h | |
| + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with | |
| + # Solaris 8's {/usr,}/bin/sh. | |
| + touch sub/conftst$i.h | |
| done | |
| echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | |
| - # We check with '-c' and '-o' for the sake of the "dashmstdout" | |
| + # We check with `-c' and `-o' for the sake of the "dashmstdout" | |
| # mode. It turns out that the SunPro C++ compiler does not properly | |
| - # handle '-M -o', and we need to detect this. Also, some Intel | |
| - # versions had trouble with output in subdirs. | |
| + # handle `-M -o', and we need to detect this. Also, some Intel | |
| + # versions had trouble with output in subdirs | |
| am__obj=sub/conftest.${OBJEXT-o} | |
| am__minus_obj="-o $am__obj" | |
| case $depmode in | |
| @@ -3867,16 +3832,16 @@ | |
| test "$am__universal" = false || continue | |
| ;; | |
| nosideeffect) | |
| - # After this tag, mechanisms are not by side-effect, so they'll | |
| - # only be used when explicitly requested. | |
| + # after this tag, mechanisms are not by side-effect, so they'll | |
| + # only be used when explicitly requested | |
| if test "x$enable_dependency_tracking" = xyes; then | |
| continue | |
| else | |
| break | |
| fi | |
| ;; | |
| - msvc7 | msvc7msys | msvisualcpp | msvcmsys) | |
| - # This compiler won't grok '-c -o', but also, the minuso test has | |
| + msvisualcpp | msvcmsys) | |
| + # This compiler won't grok `-c -o', but also, the minuso test has | |
| # not run yet. These depmodes are late enough in the game, and | |
| # so weak that their functioning should not be impacted. | |
| am__obj=conftest.${OBJEXT-o} | |
| @@ -4600,8 +4565,8 @@ | |
| -macro_version='2.4.6' | |
| -macro_revision='2.4.6' | |
| +macro_version='2.2.7a' | |
| +macro_revision='1.3134' | |
| @@ -4615,7 +4580,7 @@ | |
| -ltmain=$ac_aux_dir/ltmain.sh | |
| +ltmain="$ac_aux_dir/ltmain.sh" | |
| # Backslashify metacharacters that are still active within | |
| # double-quoted strings. | |
| @@ -4641,7 +4606,7 @@ | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | |
| $as_echo_n "checking how to print strings... " >&6; } | |
| # Test print first, because it will be a builtin if present. | |
| -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | |
| +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ | |
| test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| ECHO='print -r --' | |
| elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | |
| @@ -4664,7 +4629,7 @@ | |
| $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 | |
| @@ -4857,19 +4822,19 @@ | |
| # Check whether --with-gnu-ld was given. | |
| if test "${with_gnu_ld+set}" = set; then : | |
| - withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes | |
| + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | |
| else | |
| with_gnu_ld=no | |
| fi | |
| ac_prog=ld | |
| -if test yes = "$GCC"; then | |
| +if test "$GCC" = yes; 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` ;; | |
| @@ -4883,7 +4848,7 @@ | |
| 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. | |
| @@ -4894,7 +4859,7 @@ | |
| with_gnu_ld=unknown | |
| ;; | |
| esac | |
| -elif test yes = "$with_gnu_ld"; then | |
| +elif test "$with_gnu_ld" = yes; then | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 | |
| $as_echo_n "checking for GNU ld... " >&6; } | |
| else | |
| @@ -4905,32 +4870,32 @@ | |
| $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 no != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != no && break | |
| ;; | |
| *) | |
| - test yes != "$with_gnu_ld" && break | |
| + test "$with_gnu_ld" != yes && 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; } | |
| @@ -4973,38 +4938,33 @@ | |
| 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 | |
| - # 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'*) | |
| + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in | |
| + */dev/null* | *'Invalid file or object type'*) | |
| lt_cv_path_NM="$tmp_nm -B" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in | |
| */dev/null*) | |
| lt_cv_path_NM="$tmp_nm -p" | |
| - break 2 | |
| + break | |
| ;; | |
| *) | |
| lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but | |
| @@ -5015,15 +4975,15 @@ | |
| 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 no != "$lt_cv_path_NM"; then | |
| - NM=$lt_cv_path_NM | |
| +if test "$lt_cv_path_NM" != "no"; then | |
| + NM="$lt_cv_path_NM" | |
| else | |
| # Didn't find any BSD compatible name lister, look for dumpbin. | |
| if test -n "$DUMPBIN"; then : | |
| @@ -5129,9 +5089,9 @@ | |
| fi | |
| fi | |
| - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in | |
| + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | |
| *COFF*) | |
| - DUMPBIN="$DUMPBIN -symbols -headers" | |
| + DUMPBIN="$DUMPBIN -symbols" | |
| ;; | |
| *) | |
| DUMPBIN=: | |
| @@ -5139,8 +5099,8 @@ | |
| esac | |
| fi | |
| - if test : != "$DUMPBIN"; then | |
| - NM=$DUMPBIN | |
| + if test "$DUMPBIN" != ":"; then | |
| + NM="$DUMPBIN" | |
| fi | |
| fi | |
| test -z "$NM" && NM=nm | |
| @@ -5191,7 +5151,7 @@ | |
| $as_echo_n "(cached) " >&6 | |
| else | |
| i=0 | |
| - teststring=ABCD | |
| + teststring="ABCD" | |
| case $build_os in | |
| msdosdjgpp*) | |
| @@ -5231,7 +5191,7 @@ | |
| lt_cv_sys_max_cmd_len=8192; | |
| ;; | |
| - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) | |
| + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) | |
| # 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` | |
| @@ -5250,11 +5210,6 @@ | |
| lt_cv_sys_max_cmd_len=196608 | |
| ;; | |
| - os2*) | |
| - # The test takes a long time on OS/2. | |
| - lt_cv_sys_max_cmd_len=8192 | |
| - ;; | |
| - | |
| osf*) | |
| # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | |
| # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | |
| @@ -5281,23 +5236,22 @@ | |
| ;; | |
| *) | |
| 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 | |
| + if test -n "$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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ | |
| = "X$teststring$teststring"; } >/dev/null 2>&1 && | |
| - test 17 != "$i" # 1/2 MB should be enough | |
| + test $i != 17 # 1/2 MB should be enough | |
| do | |
| i=`expr $i + 1` | |
| teststring=$teststring$teststring | |
| @@ -5315,7 +5269,7 @@ | |
| 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 | |
| @@ -5333,6 +5287,30 @@ | |
| : ${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"}, \ | |
| + = c,a/b,, \ | |
| + && 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 | |
| @@ -5364,80 +5342,6 @@ | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } | |
| -if test "${lt_cv_to_host_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| - *-*-cygwin* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | |
| - ;; | |
| - *-*-cygwin* ) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| - * ) # otherwise, assume *nix | |
| - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | |
| - ;; | |
| - esac | |
| - ;; | |
| - * ) # unhandled hosts (and "normal" native builds) | |
| - lt_cv_to_host_file_cmd=func_convert_file_noop | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_host_file_cmd=$lt_cv_to_host_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_host_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | |
| -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | |
| -if test "${lt_cv_to_tool_file_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - #assume ordinary cross tools, or native build. | |
| -lt_cv_to_tool_file_cmd=func_convert_file_noop | |
| -case $host in | |
| - *-*-mingw* ) | |
| - case $build in | |
| - *-*-mingw* ) # actually msys | |
| - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | |
| - ;; | |
| - esac | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| - | |
| -to_tool_file_cmd=$lt_cv_to_tool_file_cmd | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | |
| -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } | |
| - | |
| - | |
| - | |
| - | |
| - | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | |
| $as_echo_n "checking for $LD option to reload object files... " >&6; } | |
| if test "${lt_cv_ld_reload_flag+set}" = set; then : | |
| @@ -5454,14 +5358,9 @@ | |
| esac | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| case $host_os in | |
| - cygwin* | mingw* | pw32* | cegcc*) | |
| - if test yes != "$GCC"; then | |
| - reload_cmds=false | |
| - fi | |
| - ;; | |
| darwin*) | |
| - if test yes = "$GCC"; then | |
| - reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' | |
| + if test "$GCC" = yes; then | |
| + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | |
| else | |
| reload_cmds='$LD$reload_flag -o $output$reload_objs' | |
| fi | |
| @@ -5589,13 +5488,13 @@ | |
| # 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 | |
| -# 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. | |
| +# 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. | |
| case $host_os in | |
| aix[4-9]*) | |
| @@ -5622,12 +5521,12 @@ | |
| # 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. | |
| - if ( file / ) >/dev/null 2>&1; then | |
| + # 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 | |
| lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | |
| lt_cv_file_magic_cmd='func_win32_libid' | |
| else | |
| - # Keep this pattern in sync with the one in func_win32_libid. | |
| - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | |
| + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| fi | |
| ;; | |
| @@ -5658,6 +5557,10 @@ | |
| fi | |
| ;; | |
| +gnu*) | |
| + lt_cv_deplibs_check_method=pass_all | |
| + ;; | |
| + | |
| haiku*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -5695,8 +5598,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -# This must be glibc/ELF. | |
| -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |
| +# This must be Linux ELF. | |
| +linux* | k*bsd*-gnu | kopensolaris*-gnu) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -5718,8 +5621,8 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -openbsd* | bitrig*) | |
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then | |
| +openbsd*) | |
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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)$' | |
| @@ -5772,29 +5675,11 @@ | |
| tpf*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -os2*) | |
| - lt_cv_deplibs_check_method=pass_all | |
| - ;; | |
| esac | |
| fi | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | |
| $as_echo "$lt_cv_deplibs_check_method" >&6; } | |
| - | |
| -file_magic_glob= | |
| -want_nocaseglob=no | |
| -if test "$build" = "$host"; then | |
| - case $host_os in | |
| - mingw* | pw32*) | |
| - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | |
| - want_nocaseglob=yes | |
| - else | |
| - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | |
| - fi | |
| - ;; | |
| - esac | |
| -fi | |
| - | |
| file_magic_cmd=$lt_cv_file_magic_cmd | |
| deplibs_check_method=$lt_cv_deplibs_check_method | |
| test -z "$deplibs_check_method" && deplibs_check_method=unknown | |
| @@ -5810,162 +5695,9 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -if test -n "$ac_tool_prefix"; then | |
| - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | |
| -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$DLLTOOL"; then | |
| - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -DLLTOOL=$ac_cv_prog_DLLTOOL | |
| -if test -n "$DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | |
| -$as_echo "$DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_DLLTOOL"; then | |
| - ac_ct_DLLTOOL=$DLLTOOL | |
| - # Extract the first word of "dlltool", so it can be a program name with args. | |
| -set dummy dlltool; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_DLLTOOL"; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_DLLTOOL="dlltool" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | |
| -if test -n "$ac_ct_DLLTOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | |
| -$as_echo "$ac_ct_DLLTOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_DLLTOOL" = x; then | |
| - DLLTOOL="false" | |
| - else | |
| - case $cross_compiling:$ac_tool_warned in | |
| -yes:) | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | |
| -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | |
| -ac_tool_warned=yes ;; | |
| -esac | |
| - DLLTOOL=$ac_ct_DLLTOOL | |
| - fi | |
| -else | |
| - DLLTOOL="$ac_cv_prog_DLLTOOL" | |
| -fi | |
| - | |
| -test -z "$DLLTOOL" && DLLTOOL=dlltool | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | |
| -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } | |
| -if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - lt_cv_sharedlib_from_linklib_cmd='unknown' | |
| - | |
| -case $host_os in | |
| -cygwin* | mingw* | pw32* | cegcc*) | |
| - # 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 | |
| - ;; | |
| - *) | |
| - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | |
| - ;; | |
| - esac | |
| - ;; | |
| -*) | |
| - # fallback: assume linklib IS sharedlib | |
| - lt_cv_sharedlib_from_linklib_cmd=$ECHO | |
| - ;; | |
| -esac | |
| - | |
| -fi | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | |
| -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | |
| -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | |
| -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in ar | |
| - do | |
| - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | |
| +set dummy ${ac_tool_prefix}ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_AR+set}" = set; then : | |
| @@ -5981,7 +5713,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" | |
| + ac_cv_prog_AR="${ac_tool_prefix}ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -6001,15 +5733,11 @@ | |
| fi | |
| - test -n "$AR" && break | |
| - done | |
| fi | |
| -if test -z "$AR"; then | |
| +if test -z "$ac_cv_prog_AR"; then | |
| ac_ct_AR=$AR | |
| - for ac_prog in ar | |
| -do | |
| - # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| -set dummy $ac_prog; ac_word=$2 | |
| + # Extract the first word of "ar", so it can be a program name with args. | |
| +set dummy ar; ac_word=$2 | |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| $as_echo_n "checking for $ac_word... " >&6; } | |
| if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : | |
| @@ -6025,7 +5753,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_AR="$ac_prog" | |
| + ac_cv_prog_ac_ct_AR="ar" | |
| $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| @@ -6044,10 +5772,6 @@ | |
| $as_echo "no" >&6; } | |
| fi | |
| - | |
| - test -n "$ac_ct_AR" && break | |
| -done | |
| - | |
| if test "x$ac_ct_AR" = x; then | |
| AR="false" | |
| else | |
| @@ -6059,72 +5783,16 @@ | |
| esac | |
| AR=$ac_ct_AR | |
| fi | |
| -fi | |
| - | |
| -: ${AR=ar} | |
| -: ${AR_FLAGS=cru} | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | |
| -$as_echo_n "checking for archiver @FILE support... " >&6; } | |
| -if test "${lt_cv_ar_at_file+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| else | |
| - lt_cv_ar_at_file=no | |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
| -/* end confdefs.h. */ | |
| + AR="$ac_cv_prog_AR" | |
| +fi | |
| -int | |
| -main () | |
| -{ | |
| +test -z "$AR" && AR=ar | |
| +test -z "$AR_FLAGS" && AR_FLAGS=cru | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -if ac_fn_c_try_compile "$LINENO"; then : | |
| - echo conftest.$ac_objext > conftest.lst | |
| - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | |
| - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - 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 | |
| - (eval $lt_ar_try) 2>&5 | |
| - ac_status=$? | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | |
| - test $ac_status = 0; } | |
| - if test 0 -ne "$ac_status"; then | |
| - lt_cv_ar_at_file=@ | |
| - fi | |
| - fi | |
| - rm -f conftest.* libconftest.a | |
| -fi | |
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -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 no = "$lt_cv_ar_at_file"; then | |
| - archiver_list_spec= | |
| -else | |
| - archiver_list_spec=$lt_cv_ar_at_file | |
| -fi | |
| @@ -6337,14 +6005,14 @@ | |
| if test -n "$RANLIB"; then | |
| case $host_os in | |
| - bitrig* | openbsd*) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | |
| + openbsd*) | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" | |
| ;; | |
| *) | |
| - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" | |
| + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" | |
| ;; | |
| esac | |
| - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" | |
| + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | |
| fi | |
| case $host_os in | |
| @@ -6427,7 +6095,7 @@ | |
| symcode='[ABCDGISTW]' | |
| ;; | |
| hpux*) | |
| - if test ia64 = "$host_cpu"; then | |
| + if test "$host_cpu" = ia64; then | |
| symcode='[ABCDEGRST]' | |
| fi | |
| ;; | |
| @@ -6460,44 +6128,14 @@ | |
| 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"\ | |
| -$lt_cdecl_hook\ | |
| -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ | |
| -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" | |
| +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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"\ | |
| -$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'" | |
| +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'" | |
| # Handle CRLF in mingw tool chain | |
| opt_cr= | |
| @@ -6515,29 +6153,24 @@ | |
| # 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, | |
| - # D for any global variable and I for any imported variable. | |
| + # Fake it for dumpbin and say T for any non-static function | |
| + # and D for any global 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=\"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))}"\ | |
| +" {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))}"\ | |
| " ' prfx=^$ac_symprfx" | |
| else | |
| lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | |
| fi | |
| - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | |
| # Check to see that the pipe works correctly. | |
| pipe_works=no | |
| @@ -6579,18 +6212,6 @@ | |
| if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | |
| 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 can't be const, because runtime | |
| - relocations are performed -- see ld's documentation on pseudo-relocs. */ | |
| -# define LT_DLSYM_CONST | |
| -#elif defined __osf__ | |
| -/* This system does not cope well with relocations in const data. */ | |
| -# define LT_DLSYM_CONST | |
| -#else | |
| -# define LT_DLSYM_CONST const | |
| -#endif | |
| - | |
| #ifdef __cplusplus | |
| extern "C" { | |
| #endif | |
| @@ -6602,7 +6223,7 @@ | |
| cat <<_LT_EOF >> conftest.$ac_ext | |
| /* The mapping between symbol names and symbols. */ | |
| -LT_DLSYM_CONST struct { | |
| +const struct { | |
| const char *name; | |
| void *address; | |
| } | |
| @@ -6610,7 +6231,7 @@ | |
| { | |
| { "@PROGRAM@", (void *) 0 }, | |
| _LT_EOF | |
| - $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext | |
| cat <<\_LT_EOF >> conftest.$ac_ext | |
| {0, (void *) 0} | |
| }; | |
| @@ -6628,19 +6249,19 @@ | |
| _LT_EOF | |
| # Now try linking the two files. | |
| mv conftest.$ac_objext conftstm.$ac_objext | |
| - lt_globsym_save_LIBS=$LIBS | |
| - lt_globsym_save_CFLAGS=$CFLAGS | |
| - LIBS=conftstm.$ac_objext | |
| + lt_save_LIBS="$LIBS" | |
| + lt_save_CFLAGS="$CFLAGS" | |
| + 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 | |
| - CFLAGS=$lt_globsym_save_CFLAGS | |
| + LIBS="$lt_save_LIBS" | |
| + CFLAGS="$lt_save_CFLAGS" | |
| else | |
| echo "cannot find nm_test_func in $nlist" >&5 | |
| fi | |
| @@ -6657,7 +6278,7 @@ | |
| rm -rf conftest* conftst* | |
| # Do not use the global_symbol_pipe unless it works. | |
| - if test yes = "$pipe_works"; then | |
| + if test "$pipe_works" = yes; then | |
| break | |
| else | |
| lt_cv_sys_global_symbol_pipe= | |
| @@ -6677,18 +6298,6 @@ | |
| $as_echo "ok" >&6; } | |
| fi | |
| -# Response file support. | |
| -if test "$lt_cv_nm_interface" = "MS dumpbin"; then | |
| - nm_file_list_spec='@' | |
| -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | |
| - nm_file_list_spec='@' | |
| -fi | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| @@ -6710,146 +6319,18 @@ | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | |
| -$as_echo_n "checking for sysroot... " >&6; } | |
| - | |
| -# Check whether --with-sysroot was given. | |
| -if test "${with_sysroot+set}" = set; then : | |
| - withval=$with_sysroot; | |
| -else | |
| - with_sysroot=no | |
| +# Check whether --enable-libtool-lock was given. | |
| +if test "${enable_libtool_lock+set}" = set; then : | |
| + enableval=$enable_libtool_lock; | |
| fi | |
| - | |
| -lt_sysroot= | |
| -case $with_sysroot in #( | |
| - yes) | |
| - if test yes = "$GCC"; then | |
| - lt_sysroot=`$CC --print-sysroot 2>/dev/null` | |
| - fi | |
| - ;; #( | |
| - /*) | |
| - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | |
| - ;; #( | |
| - no|'') | |
| - ;; #( | |
| - *) | |
| - { $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 | |
| - | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | |
| -$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 test "${ac_cv_path_lt_DD+set}" = set; 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" | |
| - { test -f "$ac_path_lt_DD" && $as_test_x "$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 test "${lt_cv_truncate_bin+set}" = set; 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 no = "$enable_libtool_lock" || enable_libtool_lock=yes | |
| +test "x$enable_libtool_lock" != xno && 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 what ABI is being produced by ac_compile, and set mode | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6858,25 +6339,24 @@ | |
| 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| + # Find out which ABI we are using. | |
| 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 yes = "$lt_cv_prog_gnu_ld"; then | |
| + if test "$lt_cv_prog_gnu_ld" = yes; then | |
| case `/usr/bin/file conftest.$ac_objext` in | |
| *32-bit*) | |
| LD="${LD-ld} -melf32bsmip" | |
| @@ -6905,50 +6385,9 @@ | |
| 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*| \ | |
| +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | |
| s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | |
| - # 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. | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -6962,19 +6401,9 @@ | |
| LD="${LD-ld} -m elf_i386_fbsd" | |
| ;; | |
| x86_64-*linux*) | |
| - case `/usr/bin/file conftest.o` in | |
| - *x86-64*) | |
| - LD="${LD-ld} -m elf32_x86_64" | |
| - ;; | |
| - *) | |
| - LD="${LD-ld} -m elf_i386" | |
| - ;; | |
| - esac | |
| - ;; | |
| - powerpc64le-*linux*) | |
| - LD="${LD-ld} -m elf32lppclinux" | |
| + LD="${LD-ld} -m elf_i386" | |
| ;; | |
| - powerpc64-*linux*) | |
| + ppc64-*linux*|powerpc64-*linux*) | |
| LD="${LD-ld} -m elf32ppclinux" | |
| ;; | |
| s390x-*linux*) | |
| @@ -6993,10 +6422,7 @@ | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_x86_64" | |
| ;; | |
| - powerpcle-*linux*) | |
| - LD="${LD-ld} -m elf64lppc" | |
| - ;; | |
| - powerpc-*linux*) | |
| + ppc*-*linux*|powerpc*-*linux*) | |
| LD="${LD-ld} -m elf64ppc" | |
| ;; | |
| s390*-*linux*|s390*-*tpf*) | |
| @@ -7014,7 +6440,7 @@ | |
| *-*-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; } | |
| @@ -7057,14 +6483,13 @@ | |
| 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 yes != "$lt_cv_cc_needs_belf"; then | |
| + if test x"$lt_cv_cc_needs_belf" != x"yes"; 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 what ABI is being produced by ac_compile, and set linker | |
| - # options accordingly. | |
| +sparc*-*solaris*) | |
| + # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -7074,20 +6499,7 @@ | |
| case `/usr/bin/file conftest.o` in | |
| *64-bit*) | |
| case $lt_cv_prog_gnu_ld in | |
| - yes*) | |
| - case $host in | |
| - i?86-*-solaris*|x86_64-*-solaris*) | |
| - LD="${LD-ld} -m elf_x86_64" | |
| - ;; | |
| - sparc*-*-solaris*) | |
| - LD="${LD-ld} -m elf64_sparc" | |
| - ;; | |
| - 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 | |
| - fi | |
| - ;; | |
| + yes*) LD="${LD-ld} -m elf64_sparc" ;; | |
| *) | |
| if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | |
| LD="${LD-ld} -64" | |
| @@ -7101,124 +6513,7 @@ | |
| ;; | |
| esac | |
| -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. | |
| -set dummy ${ac_tool_prefix}mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$MANIFEST_TOOL"; then | |
| - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | |
| -if test -n "$MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | |
| -$as_echo "$MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | |
| - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | |
| - # Extract the first word of "mt", so it can be a program name with args. | |
| -set dummy mt; ac_word=$2 | |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
| -$as_echo_n "checking for $ac_word... " >&6; } | |
| -if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : | |
| - $as_echo_n "(cached) " >&6 | |
| -else | |
| - if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | |
| - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| - done | |
| -IFS=$as_save_IFS | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | |
| -if test -n "$ac_ct_MANIFEST_TOOL"; then | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | |
| -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | |
| -else | |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
| -$as_echo "no" >&6; } | |
| -fi | |
| - | |
| - if test "x$ac_ct_MANIFEST_TOOL" = x; then | |
| - MANIFEST_TOOL=":" | |
| - else | |
| - case $cross_compiling:$ac_to |
View raw
(Sorry about that, but we can’t show files that are this big right now.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment