| Index: third_party/libxslt/src/aclocal.m4
|
| diff --git a/third_party/libxslt/aclocal.m4 b/third_party/libxslt/src/aclocal.m4
|
| similarity index 75%
|
| rename from third_party/libxslt/aclocal.m4
|
| rename to third_party/libxslt/src/aclocal.m4
|
| index 05207cfdf0b4093805f6b6b54f344d7aa335aa0e..1b8890b6dabfbdd319a4039f75323ca19964954a 100644
|
| --- a/third_party/libxslt/aclocal.m4
|
| +++ b/third_party/libxslt/src/aclocal.m4
|
| @@ -1,6 +1,6 @@
|
| -# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
|
| +# generated automatically by aclocal 1.15 -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
|
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -22,9 +22,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
|
|
|
| # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
| #
|
| -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
| -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
| -# Foundation, Inc.
|
| +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
|
| # Written by Gordon Matzigkeit, 1996
|
| #
|
| # This file is free software; the Free Software Foundation gives
|
| @@ -32,36 +30,30 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
|
| # modifications, as long as this notice is preserved.
|
|
|
| m4_define([_LT_COPYING], [dnl
|
| -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
| -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
| -# Foundation, Inc.
|
| -# Written by Gordon Matzigkeit, 1996
|
| -#
|
| -# This file is part of GNU Libtool.
|
| -#
|
| -# GNU Libtool is free software; you can redistribute it and/or
|
| -# modify it under the terms of the GNU General Public License as
|
| -# published by the Free Software Foundation; either version 2 of
|
| -# the License, or (at your option) any later version.
|
| +# 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.
|
| +# As a special exception to the GNU General Public License, if you
|
| +# distribute this file as part of a program or library that is built
|
| +# using GNU Libtool, you may include this file under the same
|
| +# distribution terms that you use for the rest of that program.
|
| #
|
| -# GNU Libtool is distributed in the hope that it will be useful,
|
| -# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
| +# GNU Libtool is distributed in the hope that it will be useful, but
|
| +# WITHOUT ANY WARRANTY; without even the implied warranty of
|
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
| # GNU General Public License for more details.
|
| #
|
| # You should have received a copy of the GNU General Public License
|
| -# along with GNU Libtool; see the file COPYING. If not, a copy
|
| -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
|
| -# obtained by writing to the Free Software Foundation, Inc.,
|
| -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
| +# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
| ])
|
|
|
| -# serial 57 LT_INIT
|
| +# serial 58 LT_INIT
|
|
|
|
|
| # LT_PREREQ(VERSION)
|
| @@ -89,7 +81,7 @@ esac
|
| # LT_INIT([OPTIONS])
|
| # ------------------
|
| AC_DEFUN([LT_INIT],
|
| -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
|
| +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
|
| AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
| AC_BEFORE([$0], [LT_LANG])dnl
|
| AC_BEFORE([$0], [LT_OUTPUT])dnl
|
| @@ -113,7 +105,7 @@ dnl Parse OPTIONS
|
| _LT_SET_OPTIONS([$0], [$1])
|
|
|
| # 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'
|
| @@ -133,26 +125,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
|
| dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
|
|
|
|
|
| +# _LT_PREPARE_CC_BASENAME
|
| +# -----------------------
|
| +m4_defun([_LT_PREPARE_CC_BASENAME], [
|
| +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
|
| +func_cc_basename ()
|
| +{
|
| + for cc_temp in @S|@*""; 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-%%"`
|
| +}
|
| +])# _LT_PREPARE_CC_BASENAME
|
| +
|
| +
|
| # _LT_CC_BASENAME(CC)
|
| # -------------------
|
| -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
|
| +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
|
| +# but that macro is also expanded into generated libtool script, which
|
| +# arranges for $SED and $ECHO to be set by different means.
|
| m4_defun([_LT_CC_BASENAME],
|
| -[for cc_temp in $1""; 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-%%"`
|
| +[m4_require([_LT_PREPARE_CC_BASENAME])dnl
|
| +AC_REQUIRE([_LT_DECL_SED])dnl
|
| +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
|
| +func_cc_basename $1
|
| +cc_basename=$func_cc_basename_result
|
| ])
|
|
|
|
|
| # _LT_FILEUTILS_DEFAULTS
|
| # ----------------------
|
| # It is okay to use these file commands and assume they have been set
|
| -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
|
| +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
|
| m4_defun([_LT_FILEUTILS_DEFAULTS],
|
| [: ${CP="cp -f"}
|
| : ${MV="mv -f"}
|
| @@ -199,15 +208,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
|
| m4_require([_LT_CMD_OLD_ARCHIVE])dnl
|
| m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
|
| m4_require([_LT_WITH_SYSROOT])dnl
|
| +m4_require([_LT_CMD_TRUNCATE])dnl
|
|
|
| _LT_CONFIG_LIBTOOL_INIT([
|
| -# See if we are running on zsh, and set the options which allow our
|
| +# See if we are running on zsh, and set the options that allow our
|
| # commands through without removal of \ escapes INIT.
|
| -if test -n "\${ZSH_VERSION+set}" ; then
|
| +if test -n "\${ZSH_VERSION+set}"; then
|
| setopt NO_GLOB_SUBST
|
| fi
|
| ])
|
| -if test -n "${ZSH_VERSION+set}" ; then
|
| +if test -n "${ZSH_VERSION+set}"; then
|
| setopt NO_GLOB_SUBST
|
| fi
|
|
|
| @@ -220,7 +230,7 @@ aix3*)
|
| # AIX sometimes has problems with the GCC collect2 program. For some
|
| # reason, if we set the COLLECT_NAMES environment variable, the problems
|
| # vanish in a puff of smoke.
|
| - if test "X${COLLECT_NAMES+set}" != Xset; then
|
| + if test set != "${COLLECT_NAMES+set}"; then
|
| COLLECT_NAMES=
|
| export COLLECT_NAMES
|
| fi
|
| @@ -231,14 +241,14 @@ esac
|
| ofile=libtool
|
| can_build_shared=yes
|
|
|
| -# All known linkers require a `.a' archive for static linking (except MSVC,
|
| +# All known linkers require a '.a' archive for static linking (except MSVC,
|
| # which needs '.lib').
|
| libext=a
|
|
|
| -with_gnu_ld="$lt_cv_prog_gnu_ld"
|
| +with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
|
| -old_CC="$CC"
|
| -old_CFLAGS="$CFLAGS"
|
| +old_CC=$CC
|
| +old_CFLAGS=$CFLAGS
|
|
|
| # Set sane defaults for various variables
|
| test -z "$CC" && CC=cc
|
| @@ -291,21 +301,21 @@ no_glob_subst='s/\*/\\\*/g'
|
|
|
| # _LT_PROG_LTMAIN
|
| # ---------------
|
| -# Note that this code is called both from `configure', and `config.status'
|
| +# Note that this code is called both from 'configure', and 'config.status'
|
| # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
|
| -# `config.status' has no value for ac_aux_dir unless we are using Automake,
|
| +# 'config.status' has no value for ac_aux_dir unless we are using Automake,
|
| # so we pass a copy along to make sure it has a sensible value anyway.
|
| m4_defun([_LT_PROG_LTMAIN],
|
| [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
|
| _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
|
| -ltmain="$ac_aux_dir/ltmain.sh"
|
| +ltmain=$ac_aux_dir/ltmain.sh
|
| ])# _LT_PROG_LTMAIN
|
|
|
|
|
|
|
| # So that we can recreate a full libtool script including additional
|
| # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
|
| -# in macros and then make a single call at the end using the `libtool'
|
| +# in macros and then make a single call at the end using the 'libtool'
|
| # label.
|
|
|
|
|
| @@ -437,8 +447,8 @@ m4_define([_lt_decl_all_varnames],
|
|
|
| # _LT_CONFIG_STATUS_DECLARE([VARNAME])
|
| # ------------------------------------
|
| -# Quote a variable value, and forward it to `config.status' so that its
|
| -# declaration there will have the same value as in `configure'. VARNAME
|
| +# Quote a variable value, and forward it to 'config.status' so that its
|
| +# declaration there will have the same value as in 'configure'. VARNAME
|
| # must have a single quote delimited value for this to work.
|
| m4_define([_LT_CONFIG_STATUS_DECLARE],
|
| [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
|
| @@ -462,7 +472,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
|
| # Output comment and list of tags supported by the script
|
| m4_defun([_LT_LIBTOOL_TAGS],
|
| [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
|
| -available_tags="_LT_TAGS"dnl
|
| +available_tags='_LT_TAGS'dnl
|
| ])
|
|
|
|
|
| @@ -490,7 +500,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
|
| # _LT_LIBTOOL_CONFIG_VARS
|
| # -----------------------
|
| # Produce commented declarations of non-tagged libtool config variables
|
| -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
|
| +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
|
| # script. Tagged libtool config variables (even for the LIBTOOL CONFIG
|
| # section) are produced by _LT_LIBTOOL_TAG_VARS.
|
| m4_defun([_LT_LIBTOOL_CONFIG_VARS],
|
| @@ -516,8 +526,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
|
| # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
|
| # variables for single and double quote escaping we saved from calls
|
| # to _LT_DECL, we can put quote escaped variables declarations
|
| -# into `config.status', and then the shell code to quote escape them in
|
| -# for loops in `config.status'. Finally, any additional code accumulated
|
| +# into 'config.status', and then the shell code to quote escape them in
|
| +# for loops in 'config.status'. Finally, any additional code accumulated
|
| # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
|
| m4_defun([_LT_CONFIG_COMMANDS],
|
| [AC_PROVIDE_IFELSE([LT_OUTPUT],
|
| @@ -563,7 +573,7 @@ for var in lt_decl_all_varnames([[ \
|
| ]], lt_decl_quote_varnames); do
|
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
| *[[\\\\\\\`\\"\\\$]]*)
|
| - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
|
| + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
|
| ;;
|
| *)
|
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
| @@ -576,7 +586,7 @@ for var in lt_decl_all_varnames([[ \
|
| ]], lt_decl_dquote_varnames); do
|
| case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
| *[[\\\\\\\`\\"\\\$]]*)
|
| - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
|
| + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
|
| ;;
|
| *)
|
| eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
|
| @@ -592,7 +602,7 @@ _LT_OUTPUT_LIBTOOL_INIT
|
| # Generate a child script FILE with all initialization necessary to
|
| # reuse the environment learned by the parent script, and make the
|
| # file executable. If COMMENT is supplied, it is inserted after the
|
| -# `#!' sequence but before initialization text begins. After this
|
| +# '#!' sequence but before initialization text begins. After this
|
| # macro, additional text can be appended to FILE to form the body of
|
| # the child script. The macro ends with non-zero status if the
|
| # file could not be fully written (such as if the disk is full).
|
| @@ -614,7 +624,7 @@ AS_SHELL_SANITIZE
|
| _AS_PREPARE
|
| exec AS_MESSAGE_FD>&1
|
| _ASEOF
|
| -test $lt_write_fail = 0 && chmod +x $1[]dnl
|
| +test 0 = "$lt_write_fail" && chmod +x $1[]dnl
|
| m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
|
|
|
| # LT_OUTPUT
|
| @@ -637,7 +647,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
|
| } >&AS_MESSAGE_LOG_FD
|
|
|
| lt_cl_help="\
|
| -\`$as_me' creates a local libtool stub from the current configuration,
|
| +'$as_me' creates a local libtool stub from the current configuration,
|
| for use in further configure time tests before the real libtool is
|
| generated.
|
|
|
| @@ -659,7 +669,7 @@ Copyright (C) 2011 Free Software Foundation, Inc.
|
| This config.lt script is free software; the Free Software Foundation
|
| gives unlimited permision to copy, distribute and modify it."
|
|
|
| -while test $[#] != 0
|
| +while test 0 != $[#]
|
| do
|
| case $[1] in
|
| --version | --v* | -V )
|
| @@ -672,10 +682,10 @@ do
|
| lt_cl_silent=: ;;
|
|
|
| -*) AC_MSG_ERROR([unrecognized option: $[1]
|
| -Try \`$[0] --help' for more information.]) ;;
|
| +Try '$[0] --help' for more information.]) ;;
|
|
|
| *) AC_MSG_ERROR([unrecognized argument: $[1]
|
| -Try \`$[0] --help' for more information.]) ;;
|
| +Try '$[0] --help' for more information.]) ;;
|
| esac
|
| shift
|
| done
|
| @@ -701,7 +711,7 @@ chmod +x "$CONFIG_LT"
|
| # open by configure. Here we exec the FD to /dev/null, effectively closing
|
| # config.log, so it can be properly (re)opened and appended to by config.lt.
|
| lt_cl_success=:
|
| -test "$silent" = yes &&
|
| +test yes = "$silent" &&
|
| lt_config_lt_args="$lt_config_lt_args --quiet"
|
| exec AS_MESSAGE_LOG_FD>/dev/null
|
| $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
|
| @@ -721,32 +731,47 @@ m4_defun([_LT_CONFIG],
|
| _LT_CONFIG_SAVE_COMMANDS([
|
| m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
|
| m4_if(_LT_TAG, [C], [
|
| - # See if we are running on zsh, and set the options which allow our
|
| + # See if we are running on zsh, and set the options that allow our
|
| # commands through without removal of \ escapes.
|
| - if test -n "${ZSH_VERSION+set}" ; then
|
| + if test -n "${ZSH_VERSION+set}"; then
|
| setopt NO_GLOB_SUBST
|
| fi
|
|
|
| - cfgfile="${ofile}T"
|
| + cfgfile=${ofile}T
|
| trap "$RM \"$cfgfile\"; exit 1" 1 2 15
|
| $RM "$cfgfile"
|
|
|
| cat <<_LT_EOF >> "$cfgfile"
|
| #! $SHELL
|
| -
|
| -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
|
| -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
|
| +# Generated automatically by $as_me ($PACKAGE) $VERSION
|
| # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
| # NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
| -#
|
| +
|
| +# Provide generalized library-building support services.
|
| +# Written by Gordon Matzigkeit, 1996
|
| +
|
| _LT_COPYING
|
| _LT_LIBTOOL_TAGS
|
|
|
| +# Configured defaults for sys_lib_dlsearch_path munging.
|
| +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
|
| +
|
| # ### BEGIN LIBTOOL CONFIG
|
| _LT_LIBTOOL_CONFIG_VARS
|
| _LT_LIBTOOL_TAG_VARS
|
| # ### END LIBTOOL CONFIG
|
|
|
| +_LT_EOF
|
| +
|
| + cat <<'_LT_EOF' >> "$cfgfile"
|
| +
|
| +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
|
| +
|
| +_LT_PREPARE_MUNGE_PATH_LIST
|
| +_LT_PREPARE_CC_BASENAME
|
| +
|
| +# ### END FUNCTIONS SHARED WITH CONFIGURE
|
| +
|
| _LT_EOF
|
|
|
| case $host_os in
|
| @@ -755,7 +780,7 @@ _LT_EOF
|
| # AIX sometimes has problems with the GCC collect2 program. For some
|
| # reason, if we set the COLLECT_NAMES environment variable, the problems
|
| # vanish in a puff of smoke.
|
| -if test "X${COLLECT_NAMES+set}" != Xset; then
|
| +if test set != "${COLLECT_NAMES+set}"; then
|
| COLLECT_NAMES=
|
| export COLLECT_NAMES
|
| fi
|
| @@ -772,8 +797,6 @@ _LT_EOF
|
| sed '$q' "$ltmain" >> "$cfgfile" \
|
| || (rm -f "$cfgfile"; exit 1)
|
|
|
| - _LT_PROG_REPLACE_SHELLFNS
|
| -
|
| mv -f "$cfgfile" "$ofile" ||
|
| (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
|
| chmod +x "$ofile"
|
| @@ -791,7 +814,6 @@ _LT_EOF
|
| [m4_if([$1], [], [
|
| PACKAGE='$PACKAGE'
|
| VERSION='$VERSION'
|
| - TIMESTAMP='$TIMESTAMP'
|
| RM='$RM'
|
| ofile='$ofile'], [])
|
| ])dnl /_LT_CONFIG_SAVE_COMMANDS
|
| @@ -988,7 +1010,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
|
|
| AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
|
| [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
|
| @@ -1006,7 +1028,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
| cat conftest.err >&AS_MESSAGE_LOG_FD
|
| # Otherwise, if the output was created with a 0 exit code from
|
| # the compiler, it worked.
|
| - elif test -f libconftest.dylib && test $_lt_result -eq 0; then
|
| + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
|
| lt_cv_apple_cc_single_mod=yes
|
| else
|
| cat conftest.err >&AS_MESSAGE_LOG_FD
|
| @@ -1024,7 +1046,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
| AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
|
| [lt_cv_ld_exported_symbols_list=yes],
|
| [lt_cv_ld_exported_symbols_list=no])
|
| - LDFLAGS="$save_LDFLAGS"
|
| + LDFLAGS=$save_LDFLAGS
|
| ])
|
|
|
| AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
|
| @@ -1046,7 +1068,7 @@ _LT_EOF
|
| _lt_result=$?
|
| if test -s conftest.err && $GREP force_load conftest.err; then
|
| cat conftest.err >&AS_MESSAGE_LOG_FD
|
| - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
|
| + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
|
| lt_cv_ld_force_load=yes
|
| else
|
| cat conftest.err >&AS_MESSAGE_LOG_FD
|
| @@ -1056,32 +1078,32 @@ _LT_EOF
|
| ])
|
| case $host_os in
|
| rhapsody* | darwin1.[[012]])
|
| - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
|
| + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
|
| darwin1.*)
|
| - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
| + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
| darwin*) # darwin 5.x on
|
| # if running on 10.5 or later, the deployment target defaults
|
| # to the OS version, if on x86, and 10.4, the deployment
|
| # target defaults to 10.4. Don't you love it?
|
| case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
| 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
|
| - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
| - 10.[[012]]*)
|
| - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
| + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
| + 10.[[012]][[,.]]*)
|
| + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
| 10.*)
|
| - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
| + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
| esac
|
| ;;
|
| esac
|
| - if test "$lt_cv_apple_cc_single_mod" = "yes"; then
|
| + if test yes = "$lt_cv_apple_cc_single_mod"; then
|
| _lt_dar_single_mod='$single_module'
|
| fi
|
| - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
|
| - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
|
| + if test yes = "$lt_cv_ld_exported_symbols_list"; then
|
| + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
|
| else
|
| - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
| + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
|
| fi
|
| - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
|
| + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
|
| _lt_dsymutil='~$DSYMUTIL $lib || :'
|
| else
|
| _lt_dsymutil=
|
| @@ -1101,29 +1123,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
|
| _LT_TAGVAR(hardcode_direct, $1)=no
|
| _LT_TAGVAR(hardcode_automatic, $1)=yes
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
| - if test "$lt_cv_ld_force_load" = "yes"; then
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
|
| + if test yes = "$lt_cv_ld_force_load"; then
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
|
| m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
|
| [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
|
| else
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)=''
|
| fi
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
|
| case $cc_basename in
|
| - ifort*) _lt_dar_can_shared=yes ;;
|
| + ifort*|nagfor*) _lt_dar_can_shared=yes ;;
|
| *) _lt_dar_can_shared=$GCC ;;
|
| esac
|
| - if test "$_lt_dar_can_shared" = "yes"; then
|
| + if test yes = "$_lt_dar_can_shared"; then
|
| output_verbose_link_cmd=func_echo_all
|
| - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
|
| - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)="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}"
|
| - _LT_TAGVAR(module_expsym_cmds, $1)="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}"
|
| + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
|
| + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="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"
|
| + _LT_TAGVAR(module_expsym_cmds, $1)="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"
|
| m4_if([$1], [CXX],
|
| -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
|
| - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
|
| +[ if test yes != "$lt_cv_apple_cc_single_mod"; then
|
| + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
|
| fi
|
| ],[])
|
| else
|
| @@ -1143,7 +1165,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
|
| # Allow to override them for all tags through lt_cv_aix_libpath.
|
| m4_defun([_LT_SYS_MODULE_PATH_AIX],
|
| [m4_require([_LT_DECL_SED])dnl
|
| -if test "${lt_cv_aix_libpath+set}" = set; then
|
| +if test set = "${lt_cv_aix_libpath+set}"; then
|
| aix_libpath=$lt_cv_aix_libpath
|
| else
|
| AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
|
| @@ -1161,7 +1183,7 @@ else
|
| _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
|
| fi],[])
|
| if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
|
| - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
|
| + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
|
| fi
|
| ])
|
| aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
|
| @@ -1181,8 +1203,8 @@ m4_define([_LT_SHELL_INIT],
|
| # -----------------------
|
| # Find how we can fake an echo command that does not interpret backslash.
|
| # In particular, with Autoconf 2.60 or later we add some code to the start
|
| -# of the generated configure script which will find a shell with a builtin
|
| -# printf (which we can use as an echo command).
|
| +# of the generated configure script that will find a shell with a builtin
|
| +# printf (that we can use as an echo command).
|
| m4_defun([_LT_PROG_ECHO_BACKSLASH],
|
| [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
| ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
|
| @@ -1210,10 +1232,10 @@ fi
|
| # Invoke $ECHO with all args, space-separated.
|
| func_echo_all ()
|
| {
|
| - $ECHO "$*"
|
| + $ECHO "$*"
|
| }
|
|
|
| -case "$ECHO" in
|
| +case $ECHO in
|
| printf*) AC_MSG_RESULT([printf]) ;;
|
| print*) AC_MSG_RESULT([print -r]) ;;
|
| *) AC_MSG_RESULT([cat]) ;;
|
| @@ -1239,16 +1261,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
|
| AC_DEFUN([_LT_WITH_SYSROOT],
|
| [AC_MSG_CHECKING([for sysroot])
|
| AC_ARG_WITH([sysroot],
|
| -[ --with-sysroot[=DIR] Search for dependent libraries within DIR
|
| - (or the compiler's sysroot if not specified).],
|
| +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
|
| + [Search for dependent libraries within DIR (or the compiler's sysroot
|
| + if not specified).])],
|
| [], [with_sysroot=no])
|
|
|
| dnl lt_sysroot will always be passed unquoted. We quote it here
|
| dnl in case the user passed a directory name.
|
| lt_sysroot=
|
| -case ${with_sysroot} in #(
|
| +case $with_sysroot in #(
|
| yes)
|
| - if test "$GCC" = yes; then
|
| + if test yes = "$GCC"; then
|
| lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
| fi
|
| ;; #(
|
| @@ -1258,14 +1281,14 @@ case ${with_sysroot} in #(
|
| no|'')
|
| ;; #(
|
| *)
|
| - AC_MSG_RESULT([${with_sysroot}])
|
| + AC_MSG_RESULT([$with_sysroot])
|
| AC_MSG_ERROR([The sysroot must be an absolute path.])
|
| ;;
|
| esac
|
|
|
| AC_MSG_RESULT([${lt_sysroot:-no}])
|
| _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
|
| -[dependent libraries, and in which our libraries should be installed.])])
|
| +[dependent libraries, and where our libraries should be installed.])])
|
|
|
| # _LT_ENABLE_LOCK
|
| # ---------------
|
| @@ -1273,31 +1296,33 @@ m4_defun([_LT_ENABLE_LOCK],
|
| [AC_ARG_ENABLE([libtool-lock],
|
| [AS_HELP_STRING([--disable-libtool-lock],
|
| [avoid locking (might break parallel builds)])])
|
| -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
| +test no = "$enable_libtool_lock" || enable_libtool_lock=yes
|
|
|
| # Some flags need to be propagated to the compiler or linker for good
|
| # libtool support.
|
| case $host in
|
| ia64-*-hpux*)
|
| - # Find out which ABI we are using.
|
| + # Find out what ABI is being produced by ac_compile, and set mode
|
| + # options accordingly.
|
| echo 'int i;' > conftest.$ac_ext
|
| if AC_TRY_EVAL(ac_compile); then
|
| case `/usr/bin/file conftest.$ac_objext` in
|
| *ELF-32*)
|
| - HPUX_IA64_MODE="32"
|
| + HPUX_IA64_MODE=32
|
| ;;
|
| *ELF-64*)
|
| - HPUX_IA64_MODE="64"
|
| + HPUX_IA64_MODE=64
|
| ;;
|
| esac
|
| fi
|
| rm -rf conftest*
|
| ;;
|
| *-*-irix6*)
|
| - # Find out which ABI we are using.
|
| + # Find out what ABI is being produced by ac_compile, and set linker
|
| + # options accordingly.
|
| echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
|
| if AC_TRY_EVAL(ac_compile); then
|
| - if test "$lt_cv_prog_gnu_ld" = yes; then
|
| + if test yes = "$lt_cv_prog_gnu_ld"; then
|
| case `/usr/bin/file conftest.$ac_objext` in
|
| *32-bit*)
|
| LD="${LD-ld} -melf32bsmip"
|
| @@ -1326,9 +1351,46 @@ ia64-*-hpux*)
|
| rm -rf conftest*
|
| ;;
|
|
|
| +mips64*-*linux*)
|
| + # Find out what ABI is being produced by ac_compile, and set linker
|
| + # options accordingly.
|
| + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
|
| + if AC_TRY_EVAL(ac_compile); then
|
| + emul=elf
|
| + case `/usr/bin/file conftest.$ac_objext` in
|
| + *32-bit*)
|
| + emul="${emul}32"
|
| + ;;
|
| + *64-bit*)
|
| + emul="${emul}64"
|
| + ;;
|
| + esac
|
| + case `/usr/bin/file conftest.$ac_objext` in
|
| + *MSB*)
|
| + emul="${emul}btsmip"
|
| + ;;
|
| + *LSB*)
|
| + emul="${emul}ltsmip"
|
| + ;;
|
| + esac
|
| + case `/usr/bin/file conftest.$ac_objext` in
|
| + *N32*)
|
| + emul="${emul}n32"
|
| + ;;
|
| + esac
|
| + LD="${LD-ld} -m $emul"
|
| + fi
|
| + rm -rf conftest*
|
| + ;;
|
| +
|
| x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
|
| s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| - # Find out which ABI we are using.
|
| + # Find out what ABI is being produced by ac_compile, and set linker
|
| + # options accordingly. Note that the listed cases only cover the
|
| + # situations where additional linker options are needed (such as when
|
| + # doing 32-bit compilation for a host where ld defaults to 64-bit, or
|
| + # vice versa); the common cases where no linker options are needed do
|
| + # not appear in the list.
|
| echo 'int i;' > conftest.$ac_ext
|
| if AC_TRY_EVAL(ac_compile); then
|
| case `/usr/bin/file conftest.o` in
|
| @@ -1347,10 +1409,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| ;;
|
| esac
|
| ;;
|
| - powerpc64le-*)
|
| + powerpc64le-*linux*)
|
| LD="${LD-ld} -m elf32lppclinux"
|
| ;;
|
| - powerpc64-*)
|
| + powerpc64-*linux*)
|
| LD="${LD-ld} -m elf32ppclinux"
|
| ;;
|
| s390x-*linux*)
|
| @@ -1369,10 +1431,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| x86_64-*linux*)
|
| LD="${LD-ld} -m elf_x86_64"
|
| ;;
|
| - powerpcle-*)
|
| + powerpcle-*linux*)
|
| LD="${LD-ld} -m elf64lppc"
|
| ;;
|
| - powerpc-*)
|
| + powerpc-*linux*)
|
| LD="${LD-ld} -m elf64ppc"
|
| ;;
|
| s390*-*linux*|s390*-*tpf*)
|
| @@ -1390,19 +1452,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
|
| *-*-sco3.2v5*)
|
| # On SCO OpenServer 5, we need -belf to get full-featured binaries.
|
| - SAVE_CFLAGS="$CFLAGS"
|
| + SAVE_CFLAGS=$CFLAGS
|
| CFLAGS="$CFLAGS -belf"
|
| AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
|
| [AC_LANG_PUSH(C)
|
| AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
|
| AC_LANG_POP])
|
| - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
|
| + if test yes != "$lt_cv_cc_needs_belf"; then
|
| # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
|
| - CFLAGS="$SAVE_CFLAGS"
|
| + CFLAGS=$SAVE_CFLAGS
|
| fi
|
| ;;
|
| *-*solaris*)
|
| - # Find out which ABI we are using.
|
| + # Find out what ABI is being produced by ac_compile, and set linker
|
| + # options accordingly.
|
| echo 'int i;' > conftest.$ac_ext
|
| if AC_TRY_EVAL(ac_compile); then
|
| case `/usr/bin/file conftest.o` in
|
| @@ -1410,7 +1473,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| case $lt_cv_prog_gnu_ld in
|
| yes*)
|
| case $host in
|
| - i?86-*-solaris*)
|
| + i?86-*-solaris*|x86_64-*-solaris*)
|
| LD="${LD-ld} -m elf_x86_64"
|
| ;;
|
| sparc*-*-solaris*)
|
| @@ -1419,7 +1482,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| esac
|
| # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
|
| if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
|
| - LD="${LD-ld}_sol2"
|
| + LD=${LD-ld}_sol2
|
| fi
|
| ;;
|
| *)
|
| @@ -1435,7 +1498,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
| ;;
|
| esac
|
|
|
| -need_locks="$enable_libtool_lock"
|
| +need_locks=$enable_libtool_lock
|
| ])# _LT_ENABLE_LOCK
|
|
|
|
|
| @@ -1454,11 +1517,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
|
| [echo conftest.$ac_objext > conftest.lst
|
| lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
|
| AC_TRY_EVAL([lt_ar_try])
|
| - if test "$ac_status" -eq 0; then
|
| + if test 0 -eq "$ac_status"; then
|
| # Ensure the archiver fails upon bogus file names.
|
| rm -f conftest.$ac_objext libconftest.a
|
| AC_TRY_EVAL([lt_ar_try])
|
| - if test "$ac_status" -ne 0; then
|
| + if test 0 -ne "$ac_status"; then
|
| lt_cv_ar_at_file=@
|
| fi
|
| fi
|
| @@ -1466,7 +1529,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
|
| ])
|
| ])
|
|
|
| -if test "x$lt_cv_ar_at_file" = xno; then
|
| +if test no = "$lt_cv_ar_at_file"; then
|
| archiver_list_spec=
|
| else
|
| archiver_list_spec=$lt_cv_ar_at_file
|
| @@ -1497,7 +1560,7 @@ old_postuninstall_cmds=
|
|
|
| if test -n "$RANLIB"; then
|
| case $host_os in
|
| - openbsd*)
|
| + bitrig* | openbsd*)
|
| old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
|
| ;;
|
| *)
|
| @@ -1533,7 +1596,7 @@ AC_CACHE_CHECK([$1], [$2],
|
| [$2=no
|
| m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
|
| echo "$lt_simple_compile_test_code" > conftest.$ac_ext
|
| - lt_compiler_flag="$3"
|
| + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
|
| # Insert the option either (1) after the last *FLAGS variable, or
|
| # (2) before a word containing "conftest.", or (3) at the end.
|
| # Note that $ac_compile itself does not contain backslashes and begins
|
| @@ -1560,7 +1623,7 @@ AC_CACHE_CHECK([$1], [$2],
|
| $RM conftest*
|
| ])
|
|
|
| -if test x"[$]$2" = xyes; then
|
| +if test yes = "[$]$2"; then
|
| m4_if([$5], , :, [$5])
|
| else
|
| m4_if([$6], , :, [$6])
|
| @@ -1582,7 +1645,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
|
| m4_require([_LT_DECL_SED])dnl
|
| AC_CACHE_CHECK([$1], [$2],
|
| [$2=no
|
| - save_LDFLAGS="$LDFLAGS"
|
| + save_LDFLAGS=$LDFLAGS
|
| LDFLAGS="$LDFLAGS $3"
|
| echo "$lt_simple_link_test_code" > conftest.$ac_ext
|
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
|
| @@ -1601,10 +1664,10 @@ AC_CACHE_CHECK([$1], [$2],
|
| fi
|
| fi
|
| $RM -r conftest*
|
| - LDFLAGS="$save_LDFLAGS"
|
| + LDFLAGS=$save_LDFLAGS
|
| ])
|
|
|
| -if test x"[$]$2" = xyes; then
|
| +if test yes = "[$]$2"; then
|
| m4_if([$4], , :, [$4])
|
| else
|
| m4_if([$5], , :, [$5])
|
| @@ -1625,7 +1688,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
|
| AC_MSG_CHECKING([the maximum length of command line arguments])
|
| AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
| i=0
|
| - teststring="ABCD"
|
| + teststring=ABCD
|
|
|
| case $build_os in
|
| msdosdjgpp*)
|
| @@ -1665,7 +1728,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
| lt_cv_sys_max_cmd_len=8192;
|
| ;;
|
|
|
| - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
|
| + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
|
| # This has been around since 386BSD, at least. Likely further.
|
| if test -x /sbin/sysctl; then
|
| lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
| @@ -1716,22 +1779,22 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
| *)
|
| lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
|
| if test -n "$lt_cv_sys_max_cmd_len" && \
|
| - test undefined != "$lt_cv_sys_max_cmd_len"; then
|
| + test undefined != "$lt_cv_sys_max_cmd_len"; then
|
| lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
| lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
|
| else
|
| # Make teststring a little bigger before we do anything with it.
|
| # a 1K string should be a reasonable start.
|
| - for i in 1 2 3 4 5 6 7 8 ; do
|
| + for i in 1 2 3 4 5 6 7 8; do
|
| teststring=$teststring$teststring
|
| done
|
| SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
|
| # If test is not a shell built-in, we'll probably end up computing a
|
| # maximum length that is only half of the actual maximum length, but
|
| # we can't tell.
|
| - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
|
| + while { test X`env echo "$teststring$teststring" 2>/dev/null` \
|
| = "X$teststring$teststring"; } >/dev/null 2>&1 &&
|
| - test $i != 17 # 1/2 MB should be enough
|
| + test 17 != "$i" # 1/2 MB should be enough
|
| do
|
| i=`expr $i + 1`
|
| teststring=$teststring$teststring
|
| @@ -1747,7 +1810,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
| ;;
|
| esac
|
| ])
|
| -if test -n $lt_cv_sys_max_cmd_len ; then
|
| +if test -n "$lt_cv_sys_max_cmd_len"; then
|
| AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
|
| else
|
| AC_MSG_RESULT(none)
|
| @@ -1775,7 +1838,7 @@ m4_defun([_LT_HEADER_DLFCN],
|
| # ----------------------------------------------------------------
|
| m4_defun([_LT_TRY_DLOPEN_SELF],
|
| [m4_require([_LT_HEADER_DLFCN])dnl
|
| -if test "$cross_compiling" = yes; then :
|
| +if test yes = "$cross_compiling"; then :
|
| [$4]
|
| else
|
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
| @@ -1822,9 +1885,9 @@ else
|
| # endif
|
| #endif
|
|
|
| -/* When -fvisbility=hidden is used, assume the code has been annotated
|
| +/* When -fvisibility=hidden is used, assume the code has been annotated
|
| correspondingly for the symbols needed. */
|
| -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
| +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
| int fnord () __attribute__((visibility("default")));
|
| #endif
|
|
|
| @@ -1850,7 +1913,7 @@ int main ()
|
| return status;
|
| }]
|
| _LT_EOF
|
| - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
|
| + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
|
| (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
|
| lt_status=$?
|
| case x$lt_status in
|
| @@ -1871,7 +1934,7 @@ rm -fr conftest*
|
| # ------------------
|
| AC_DEFUN([LT_SYS_DLOPEN_SELF],
|
| [m4_require([_LT_HEADER_DLFCN])dnl
|
| -if test "x$enable_dlopen" != xyes; then
|
| +if test yes != "$enable_dlopen"; then
|
| enable_dlopen=unknown
|
| enable_dlopen_self=unknown
|
| enable_dlopen_self_static=unknown
|
| @@ -1881,44 +1944,52 @@ else
|
|
|
| case $host_os in
|
| beos*)
|
| - lt_cv_dlopen="load_add_on"
|
| + lt_cv_dlopen=load_add_on
|
| lt_cv_dlopen_libs=
|
| lt_cv_dlopen_self=yes
|
| ;;
|
|
|
| mingw* | pw32* | cegcc*)
|
| - lt_cv_dlopen="LoadLibrary"
|
| + lt_cv_dlopen=LoadLibrary
|
| lt_cv_dlopen_libs=
|
| ;;
|
|
|
| cygwin*)
|
| - lt_cv_dlopen="dlopen"
|
| + lt_cv_dlopen=dlopen
|
| lt_cv_dlopen_libs=
|
| ;;
|
|
|
| darwin*)
|
| - # if libdl is installed we need to link against it
|
| + # if libdl is installed we need to link against it
|
| AC_CHECK_LIB([dl], [dlopen],
|
| - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
|
| - lt_cv_dlopen="dyld"
|
| + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
|
| + lt_cv_dlopen=dyld
|
| lt_cv_dlopen_libs=
|
| lt_cv_dlopen_self=yes
|
| ])
|
| ;;
|
|
|
| + 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_CHECK_FUNC([shl_load],
|
| - [lt_cv_dlopen="shl_load"],
|
| + [lt_cv_dlopen=shl_load],
|
| [AC_CHECK_LIB([dld], [shl_load],
|
| - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
|
| + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
|
| [AC_CHECK_FUNC([dlopen],
|
| - [lt_cv_dlopen="dlopen"],
|
| + [lt_cv_dlopen=dlopen],
|
| [AC_CHECK_LIB([dl], [dlopen],
|
| - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
|
| + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
|
| [AC_CHECK_LIB([svld], [dlopen],
|
| - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
|
| + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
|
| [AC_CHECK_LIB([dld], [dld_link],
|
| - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
|
| + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
|
| ])
|
| ])
|
| ])
|
| @@ -1927,21 +1998,21 @@ else
|
| ;;
|
| esac
|
|
|
| - if test "x$lt_cv_dlopen" != xno; then
|
| - enable_dlopen=yes
|
| - else
|
| + if test no = "$lt_cv_dlopen"; then
|
| enable_dlopen=no
|
| + else
|
| + enable_dlopen=yes
|
| fi
|
|
|
| case $lt_cv_dlopen in
|
| dlopen)
|
| - save_CPPFLAGS="$CPPFLAGS"
|
| - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
|
| + save_CPPFLAGS=$CPPFLAGS
|
| + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
|
|
|
| - save_LDFLAGS="$LDFLAGS"
|
| + save_LDFLAGS=$LDFLAGS
|
| wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
|
|
|
| - save_LIBS="$LIBS"
|
| + save_LIBS=$LIBS
|
| LIBS="$lt_cv_dlopen_libs $LIBS"
|
|
|
| AC_CACHE_CHECK([whether a program can dlopen itself],
|
| @@ -1951,7 +2022,7 @@ else
|
| lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
|
| ])
|
|
|
| - if test "x$lt_cv_dlopen_self" = xyes; then
|
| + if test yes = "$lt_cv_dlopen_self"; then
|
| wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
|
| AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
|
| lt_cv_dlopen_self_static, [dnl
|
| @@ -1961,9 +2032,9 @@ else
|
| ])
|
| fi
|
|
|
| - CPPFLAGS="$save_CPPFLAGS"
|
| - LDFLAGS="$save_LDFLAGS"
|
| - LIBS="$save_LIBS"
|
| + CPPFLAGS=$save_CPPFLAGS
|
| + LDFLAGS=$save_LDFLAGS
|
| + LIBS=$save_LIBS
|
| ;;
|
| esac
|
|
|
| @@ -2055,8 +2126,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
|
| m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
| _LT_COMPILER_C_O([$1])
|
|
|
| -hard_links="nottested"
|
| -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
|
| +hard_links=nottested
|
| +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
|
| # do not overwrite the value of need_locks provided by the user
|
| AC_MSG_CHECKING([if we can lock with hard links])
|
| hard_links=yes
|
| @@ -2066,8 +2137,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
|
| ln conftest.a conftest.b 2>&5 || hard_links=no
|
| ln conftest.a conftest.b 2>/dev/null && hard_links=no
|
| AC_MSG_RESULT([$hard_links])
|
| - if test "$hard_links" = no; then
|
| - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
|
| + if test no = "$hard_links"; then
|
| + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
|
| need_locks=warn
|
| fi
|
| else
|
| @@ -2094,8 +2165,8 @@ objdir=$lt_cv_objdir
|
| _LT_DECL([], [objdir], [0],
|
| [The name of the directory that contains temporary libtool files])dnl
|
| m4_pattern_allow([LT_OBJDIR])dnl
|
| -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
|
| - [Define to the sub-directory in which libtool stores uninstalled libraries.])
|
| +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
|
| + [Define to the sub-directory where libtool stores uninstalled libraries.])
|
| ])# _LT_CHECK_OBJDIR
|
|
|
|
|
| @@ -2107,15 +2178,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
|
| _LT_TAGVAR(hardcode_action, $1)=
|
| if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
|
| test -n "$_LT_TAGVAR(runpath_var, $1)" ||
|
| - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
|
| + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
|
|
|
| # We can hardcode non-existent directories.
|
| - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
|
| + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
|
| # If the only mechanism to avoid hardcoding is shlibpath_var, we
|
| # have to relink, otherwise we might link with an installed library
|
| # when we should be linking with a yet-to-be-installed one
|
| - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
|
| - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
|
| + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
|
| + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
|
| # Linking always hardcodes the temporary library directory.
|
| _LT_TAGVAR(hardcode_action, $1)=relink
|
| else
|
| @@ -2129,12 +2200,12 @@ else
|
| fi
|
| AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
|
|
|
| -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
|
| - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
|
| +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
|
| + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
|
| # Fast installation is not supported
|
| enable_fast_install=no
|
| -elif test "$shlibpath_overrides_runpath" = yes ||
|
| - test "$enable_shared" = no; then
|
| +elif test yes = "$shlibpath_overrides_runpath" ||
|
| + test no = "$enable_shared"; then
|
| # Fast installation is not necessary
|
| enable_fast_install=needless
|
| fi
|
| @@ -2158,7 +2229,7 @@ else
|
| # FIXME - insert some real tests, host_os isn't really good enough
|
| case $host_os in
|
| darwin*)
|
| - if test -n "$STRIP" ; then
|
| + if test -n "$STRIP"; then
|
| striplib="$STRIP -x"
|
| old_striplib="$STRIP -S"
|
| AC_MSG_RESULT([yes])
|
| @@ -2176,6 +2247,47 @@ _LT_DECL([], [striplib], [1])
|
| ])# _LT_CMD_STRIPLIB
|
|
|
|
|
| +# _LT_PREPARE_MUNGE_PATH_LIST
|
| +# ---------------------------
|
| +# Make sure func_munge_path_list() is defined correctly.
|
| +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
|
| +[[# 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@S|@2 in
|
| + x)
|
| + ;;
|
| + *:)
|
| + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
|
| + ;;
|
| + x:*)
|
| + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
|
| + ;;
|
| + *::*)
|
| + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
|
| + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
|
| + ;;
|
| + *)
|
| + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
|
| + ;;
|
| + esac
|
| +}
|
| +]])# _LT_PREPARE_PATH_LIST
|
| +
|
| +
|
| # _LT_SYS_DYNAMIC_LINKER([TAG])
|
| # -----------------------------
|
| # PORTME Fill in your ld.so characteristics
|
| @@ -2186,17 +2298,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
| m4_require([_LT_DECL_OBJDUMP])dnl
|
| m4_require([_LT_DECL_SED])dnl
|
| m4_require([_LT_CHECK_SHELL_FEATURES])dnl
|
| +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
|
| AC_MSG_CHECKING([dynamic linker characteristics])
|
| m4_if([$1],
|
| [], [
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| case $host_os in
|
| - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
|
| - *) lt_awk_arg="/^libraries:/" ;;
|
| + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
|
| + *) lt_awk_arg='/^libraries:/' ;;
|
| esac
|
| case $host_os in
|
| - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
|
| - *) lt_sed_strip_eq="s,=/,/,g" ;;
|
| + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
|
| + *) lt_sed_strip_eq='s|=/|/|g' ;;
|
| esac
|
| lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
|
| case $lt_search_path_spec in
|
| @@ -2212,28 +2325,35 @@ if test "$GCC" = yes; then
|
| ;;
|
| esac
|
| # Ok, now we have the path, separated by spaces, we can step through it
|
| - # and add multilib dir if necessary.
|
| + # and add multilib dir if necessary...
|
| lt_tmp_lt_search_path_spec=
|
| - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
| + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
| + # ...but if some path component already ends with the multilib dir we assume
|
| + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
|
| + case "$lt_multi_os_dir; $lt_search_path_spec " in
|
| + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
|
| + lt_multi_os_dir=
|
| + ;;
|
| + esac
|
| for lt_sys_path in $lt_search_path_spec; do
|
| - if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
| - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
| - else
|
| + if test -d "$lt_sys_path$lt_multi_os_dir"; then
|
| + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
|
| + elif test -n "$lt_multi_os_dir"; then
|
| test -d "$lt_sys_path" && \
|
| lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
| fi
|
| done
|
| lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
|
| -BEGIN {RS=" "; FS="/|\n";} {
|
| - lt_foo="";
|
| - lt_count=0;
|
| +BEGIN {RS = " "; FS = "/|\n";} {
|
| + lt_foo = "";
|
| + lt_count = 0;
|
| for (lt_i = NF; lt_i > 0; lt_i--) {
|
| if ($lt_i != "" && $lt_i != ".") {
|
| if ($lt_i == "..") {
|
| lt_count++;
|
| } else {
|
| if (lt_count == 0) {
|
| - lt_foo="/" $lt_i lt_foo;
|
| + lt_foo = "/" $lt_i lt_foo;
|
| } else {
|
| lt_count--;
|
| }
|
| @@ -2247,7 +2367,7 @@ BEGIN {RS=" "; FS="/|\n";} {
|
| # for these hosts.
|
| case $host_os in
|
| mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
|
| - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
|
| + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
|
| esac
|
| sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
|
| else
|
| @@ -2256,7 +2376,7 @@ fi])
|
| library_names_spec=
|
| libname_spec='lib$name'
|
| soname_spec=
|
| -shrext_cmds=".so"
|
| +shrext_cmds=.so
|
| postinstall_cmds=
|
| postuninstall_cmds=
|
| finish_cmds=
|
| @@ -2273,14 +2393,17 @@ hardcode_into_libs=no
|
| # flags to be left without arguments
|
| need_version=unknown
|
|
|
| +AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
|
| +[User-defined run-time library search path.])
|
| +
|
| case $host_os in
|
| aix3*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
|
| shlibpath_var=LIBPATH
|
|
|
| # AIX 3 has no versioning support, so we append a major version to the name.
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| ;;
|
|
|
| aix[[4-9]]*)
|
| @@ -2288,41 +2411,91 @@ aix[[4-9]]*)
|
| need_lib_prefix=no
|
| need_version=no
|
| hardcode_into_libs=yes
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 supports IA64
|
| - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
|
| + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| else
|
| # With GCC up to 2.95.x, collect2 would create an import file
|
| # for dependence libraries. The import file would start with
|
| - # the line `#! .'. This would cause the generated library to
|
| - # depend on `.', always an invalid library. This was fixed in
|
| + # the line '#! .'. This would cause the generated library to
|
| + # depend on '.', always an invalid library. This was fixed in
|
| # development snapshots of GCC prior to 3.0.
|
| case $host_os in
|
| aix4 | aix4.[[01]] | aix4.[[01]].*)
|
| if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
|
| echo ' yes '
|
| - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
|
| + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
|
| :
|
| else
|
| can_build_shared=no
|
| fi
|
| ;;
|
| esac
|
| - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
|
| + # Using Import Files as archive members, it is possible to support
|
| + # filename-based versioning of shared library archives on AIX. While
|
| + # this would work for both with and without runtime linking, it will
|
| + # prevent static linking of such archives. So we do filename-based
|
| + # shared library versioning with .so extension only, which is used
|
| + # when both runtime linking and shared linking is enabled.
|
| + # Unfortunately, runtime linking may impact performance, so we do
|
| + # not want this to be the default eventually. Also, we use the
|
| + # versioned .so libs for executables only if there is the -brtl
|
| + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
|
| + # To allow for filename-based versioning support, we need to create
|
| + # libNAME.so.V as an archive file, containing:
|
| + # *) an Import File, referring to the versioned filename of the
|
| + # archive as well as the shared archive member, telling the
|
| + # bitwidth (32 or 64) of that shared object, and providing the
|
| + # list of exported symbols of that shared object, eventually
|
| + # decorated with the 'weak' keyword
|
| + # *) the shared object with the F_LOADONLY flag set, to really avoid
|
| + # it being seen by the linker.
|
| + # At run time we better use the real file rather than another symlink,
|
| + # but for link time we create the symlink libNAME.so -> libNAME.so.V
|
| +
|
| + case $with_aix_soname,$aix_use_runtimelinking in
|
| + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
|
| # soname into executable. Probably we can add versioning support to
|
| # collect2, so additional links can be useful in future.
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| + aix,yes) # traditional libtool
|
| + dynamic_linker='AIX unversionable lib.so'
|
| # If using run time linking (on AIX 4.2 or later) use lib<name>.so
|
| # instead of lib<name>.a to let people know that these are not
|
| # typical AIX shared libraries.
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - else
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + ;;
|
| + aix,no) # traditional AIX only
|
| + dynamic_linker='AIX lib.a[(]lib.so.V[)]'
|
| # We preserve .a as extension for shared libraries through AIX4.2
|
| # and later when we are not doing run time linking.
|
| - library_names_spec='${libname}${release}.a $libname.a'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - fi
|
| + library_names_spec='$libname$release.a $libname.a'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| + ;;
|
| + svr4,*) # full svr4 only
|
| + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
|
| + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
|
| + # We do not specify a path in Import Files, so LIBPATH fires.
|
| + shlibpath_overrides_runpath=yes
|
| + ;;
|
| + *,yes) # both, prefer svr4
|
| + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
|
| + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
|
| + # unpreferred sharedlib libNAME.a needs extra handling
|
| + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
|
| + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
|
| + # We do not specify a path in Import Files, so LIBPATH fires.
|
| + shlibpath_overrides_runpath=yes
|
| + ;;
|
| + *,no) # both, prefer aix
|
| + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
|
| + library_names_spec='$libname$release.a $libname.a'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
|
| + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
|
| + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
|
| + ;;
|
| + esac
|
| shlibpath_var=LIBPATH
|
| fi
|
| ;;
|
| @@ -2332,18 +2505,18 @@ amigaos*)
|
| powerpc)
|
| # Since July 2007 AmigaOS4 officially supports .so libraries.
|
| # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| ;;
|
| m68k)
|
| library_names_spec='$libname.ixlibrary $libname.a'
|
| # Create ${libname}_ixlibrary.a entries in /sys/libs.
|
| - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
| + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
| ;;
|
| esac
|
| ;;
|
|
|
| beos*)
|
| - library_names_spec='${libname}${shared_ext}'
|
| + library_names_spec='$libname$shared_ext'
|
| dynamic_linker="$host_os ld.so"
|
| shlibpath_var=LIBRARY_PATH
|
| ;;
|
| @@ -2351,8 +2524,8 @@ beos*)
|
| bsdi[[45]]*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
|
| @@ -2364,7 +2537,7 @@ bsdi[[45]]*)
|
|
|
| cygwin* | mingw* | pw32* | cegcc*)
|
| version_type=windows
|
| - shrext_cmds=".dll"
|
| + shrext_cmds=.dll
|
| need_version=no
|
| need_lib_prefix=no
|
|
|
| @@ -2373,8 +2546,8 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| # gcc
|
| library_names_spec='$libname.dll.a'
|
| # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
| - postinstall_cmds='base_file=`basename \${file}`~
|
| - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
|
| + postinstall_cmds='base_file=`basename \$file`~
|
| + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
|
| dldir=$destdir/`dirname \$dlpath`~
|
| test -d \$dldir || mkdir -p \$dldir~
|
| $install_prog $dir/$dlname \$dldir/$dlname~
|
| @@ -2390,17 +2563,17 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| case $host_os in
|
| cygwin*)
|
| # Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
| - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
| + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
| m4_if([$1], [],[
|
| sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
| ;;
|
| mingw* | cegcc*)
|
| # MinGW DLLs use traditional 'lib' prefix
|
| - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
| + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
| ;;
|
| pw32*)
|
| # pw32 DLLs use 'pw' prefix rather than 'lib'
|
| - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
| + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
| ;;
|
| esac
|
| dynamic_linker='Win32 ld.exe'
|
| @@ -2409,8 +2582,8 @@ m4_if([$1], [],[
|
| *,cl*)
|
| # Native MSVC
|
| libname_spec='$name'
|
| - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
| - library_names_spec='${libname}.dll.lib'
|
| + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
| + library_names_spec='$libname.dll.lib'
|
|
|
| case $build_os in
|
| mingw*)
|
| @@ -2437,7 +2610,7 @@ m4_if([$1], [],[
|
| sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
| ;;
|
| *)
|
| - sys_lib_search_path_spec="$LIB"
|
| + sys_lib_search_path_spec=$LIB
|
| if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
|
| # It is most probably a Windows format PATH.
|
| sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
| @@ -2450,8 +2623,8 @@ m4_if([$1], [],[
|
| esac
|
|
|
| # DLL is installed to $(libdir)/../bin by postinstall_cmds
|
| - postinstall_cmds='base_file=`basename \${file}`~
|
| - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
|
| + postinstall_cmds='base_file=`basename \$file`~
|
| + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
|
| dldir=$destdir/`dirname \$dlpath`~
|
| test -d \$dldir || mkdir -p \$dldir~
|
| $install_prog $dir/$dlname \$dldir/$dlname'
|
| @@ -2464,7 +2637,7 @@ m4_if([$1], [],[
|
|
|
| *)
|
| # Assume MSVC wrapper
|
| - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
|
| + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
|
| dynamic_linker='Win32 ld.exe'
|
| ;;
|
| esac
|
| @@ -2477,8 +2650,8 @@ darwin* | rhapsody*)
|
| version_type=darwin
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
| - soname_spec='${libname}${release}${major}$shared_ext'
|
| + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
|
| + soname_spec='$libname$release$major$shared_ext'
|
| shlibpath_overrides_runpath=yes
|
| shlibpath_var=DYLD_LIBRARY_PATH
|
| shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
| @@ -2491,8 +2664,8 @@ dgux*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| ;;
|
|
|
| @@ -2510,12 +2683,13 @@ freebsd* | dragonfly*)
|
| version_type=freebsd-$objformat
|
| case $version_type in
|
| freebsd-elf*)
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| need_version=no
|
| need_lib_prefix=no
|
| ;;
|
| freebsd-*)
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
| need_version=yes
|
| ;;
|
| esac
|
| @@ -2545,10 +2719,10 @@ haiku*)
|
| need_lib_prefix=no
|
| need_version=no
|
| dynamic_linker="$host_os runtime_loader"
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LIBRARY_PATH
|
| - shlibpath_overrides_runpath=yes
|
| + shlibpath_overrides_runpath=no
|
| sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
|
| hardcode_into_libs=yes
|
| ;;
|
| @@ -2566,14 +2740,15 @@ hpux9* | hpux10* | hpux11*)
|
| dynamic_linker="$host_os dld.so"
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - if test "X$HPUX_IA64_MODE" = X32; then
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| + if test 32 = "$HPUX_IA64_MODE"; then
|
| sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
|
| + sys_lib_dlsearch_path_spec=/usr/lib/hpux32
|
| else
|
| sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
|
| + sys_lib_dlsearch_path_spec=/usr/lib/hpux64
|
| fi
|
| - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| ;;
|
| hppa*64*)
|
| shrext_cmds='.sl'
|
| @@ -2581,8 +2756,8 @@ hpux9* | hpux10* | hpux11*)
|
| dynamic_linker="$host_os dld.sl"
|
| shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
| shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
|
| sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| ;;
|
| @@ -2591,8 +2766,8 @@ hpux9* | hpux10* | hpux11*)
|
| dynamic_linker="$host_os dld.sl"
|
| shlibpath_var=SHLIB_PATH
|
| shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| ;;
|
| esac
|
| # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
|
| @@ -2605,8 +2780,8 @@ interix[[3-9]]*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| @@ -2617,7 +2792,7 @@ irix5* | irix6* | nonstopux*)
|
| case $host_os in
|
| nonstopux*) version_type=nonstopux ;;
|
| *)
|
| - if test "$lt_cv_prog_gnu_ld" = yes; then
|
| + if test yes = "$lt_cv_prog_gnu_ld"; then
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| else
|
| version_type=irix
|
| @@ -2625,8 +2800,8 @@ irix5* | irix6* | nonstopux*)
|
| esac
|
| need_lib_prefix=no
|
| need_version=no
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
|
| case $host_os in
|
| irix5* | nonstopux*)
|
| libsuff= shlibsuff=
|
| @@ -2645,8 +2820,8 @@ irix5* | irix6* | nonstopux*)
|
| esac
|
| shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
|
| shlibpath_overrides_runpath=no
|
| - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
|
| - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
|
| + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
|
| + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
|
| hardcode_into_libs=yes
|
| ;;
|
|
|
| @@ -2655,13 +2830,33 @@ linux*oldld* | linux*aout* | linux*coff*)
|
| dynamic_linker=no
|
| ;;
|
|
|
| +linux*android*)
|
| + version_type=none # Android doesn't support versioned libraries.
|
| + need_lib_prefix=no
|
| + need_version=no
|
| + library_names_spec='$libname$release$shared_ext'
|
| + soname_spec='$libname$release$shared_ext'
|
| + finish_cmds=
|
| + shlibpath_var=LD_LIBRARY_PATH
|
| + shlibpath_overrides_runpath=yes
|
| +
|
| + # This implies no fast_install, which is unacceptable.
|
| + # Some rework will be needed to allow for fast_install
|
| + # before this can be enabled.
|
| + hardcode_into_libs=yes
|
| +
|
| + dynamic_linker='Android linker'
|
| + # Don't embed -rpath directories since the linker doesn't support them.
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
| + ;;
|
| +
|
| # This must be glibc/ELF.
|
| linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| @@ -2686,7 +2881,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| # before this can be enabled.
|
| hardcode_into_libs=yes
|
|
|
| - # Append ld.so.conf contents to the search path
|
| + # Ideally, we could use ldconfig to report *all* directores which are
|
| + # searched for libraries, however this is still not possible. Aside from not
|
| + # being certain /sbin/ldconfig is available, command
|
| + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
|
| + # even though it is searched at run-time. Try to do the best guess by
|
| + # appending ld.so.conf contents (and includes) to the search path.
|
| if test -f /etc/ld.so.conf; then
|
| lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
| sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
| @@ -2701,29 +2901,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| dynamic_linker='GNU/Linux ld.so'
|
| ;;
|
|
|
| -netbsdelf*-gnu)
|
| - version_type=linux
|
| - need_lib_prefix=no
|
| - need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - shlibpath_var=LD_LIBRARY_PATH
|
| - shlibpath_overrides_runpath=no
|
| - hardcode_into_libs=yes
|
| - dynamic_linker='NetBSD ld.elf_so'
|
| - ;;
|
| -
|
| netbsd*)
|
| version_type=sunos
|
| need_lib_prefix=no
|
| need_version=no
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
| finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
| dynamic_linker='NetBSD (a.out) ld.so'
|
| else
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| dynamic_linker='NetBSD ld.elf_so'
|
| fi
|
| shlibpath_var=LD_LIBRARY_PATH
|
| @@ -2733,7 +2921,7 @@ netbsd*)
|
|
|
| newsos6)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes
|
| ;;
|
| @@ -2742,58 +2930,68 @@ newsos6)
|
| version_type=qnx
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| hardcode_into_libs=yes
|
| dynamic_linker='ldqnx.so'
|
| ;;
|
|
|
| -openbsd*)
|
| +openbsd* | bitrig*)
|
| version_type=sunos
|
| - sys_lib_dlsearch_path_spec="/usr/lib"
|
| + sys_lib_dlsearch_path_spec=/usr/lib
|
| need_lib_prefix=no
|
| - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
|
| - case $host_os in
|
| - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
|
| - *) need_version=no ;;
|
| - esac
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
| - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
| - shlibpath_var=LD_LIBRARY_PATH
|
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
| - case $host_os in
|
| - openbsd2.[[89]] | openbsd2.[[89]].*)
|
| - shlibpath_overrides_runpath=no
|
| - ;;
|
| - *)
|
| - shlibpath_overrides_runpath=yes
|
| - ;;
|
| - esac
|
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
|
| + need_version=no
|
| else
|
| - shlibpath_overrides_runpath=yes
|
| + need_version=yes
|
| fi
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
| + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
| + shlibpath_var=LD_LIBRARY_PATH
|
| + shlibpath_overrides_runpath=yes
|
| ;;
|
|
|
| os2*)
|
| libname_spec='$name'
|
| - shrext_cmds=".dll"
|
| + version_type=windows
|
| + shrext_cmds=.dll
|
| + need_version=no
|
| need_lib_prefix=no
|
| - library_names_spec='$libname${shared_ext} $libname.a'
|
| + # OS/2 can only load a DLL with a base name of 8 characters or less.
|
| + soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
|
| + v=$($ECHO $release$versuffix | tr -d .-);
|
| + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
|
| + $ECHO $n$v`$shared_ext'
|
| + library_names_spec='${libname}_dll.$libext'
|
| dynamic_linker='OS/2 ld.exe'
|
| - shlibpath_var=LIBPATH
|
| + shlibpath_var=BEGINLIBPATH
|
| + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
| + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| + postinstall_cmds='base_file=`basename \$file`~
|
| + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
|
| + dldir=$destdir/`dirname \$dlpath`~
|
| + test -d \$dldir || mkdir -p \$dldir~
|
| + $install_prog $dir/$dlname \$dldir/$dlname~
|
| + chmod a+x \$dldir/$dlname~
|
| + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
|
| + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
|
| + fi'
|
| + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
|
| + dlpath=$dir/\$dldll~
|
| + $RM \$dlpath'
|
| ;;
|
|
|
| osf3* | osf4* | osf5*)
|
| version_type=osf
|
| need_lib_prefix=no
|
| need_version=no
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
|
| - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
|
| + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
| ;;
|
|
|
| rdos*)
|
| @@ -2804,8 +3002,8 @@ solaris*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes
|
| hardcode_into_libs=yes
|
| @@ -2815,11 +3013,11 @@ solaris*)
|
|
|
| sunos4*)
|
| version_type=sunos
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
| finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes
|
| - if test "$with_gnu_ld" = yes; then
|
| + if test yes = "$with_gnu_ld"; then
|
| need_lib_prefix=no
|
| fi
|
| need_version=yes
|
| @@ -2827,8 +3025,8 @@ sunos4*)
|
|
|
| sysv4 | sysv4.3*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| case $host_vendor in
|
| sni)
|
| @@ -2849,24 +3047,24 @@ sysv4 | sysv4.3*)
|
| ;;
|
|
|
| sysv4*MP*)
|
| - if test -d /usr/nec ;then
|
| + if test -d /usr/nec; then
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
|
| - soname_spec='$libname${shared_ext}.$major'
|
| + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
|
| + soname_spec='$libname$shared_ext.$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| fi
|
| ;;
|
|
|
| sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
|
| - version_type=freebsd-elf
|
| + version_type=sco
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=yes
|
| hardcode_into_libs=yes
|
| - if test "$with_gnu_ld" = yes; then
|
| + if test yes = "$with_gnu_ld"; then
|
| sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
|
| else
|
| sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
|
| @@ -2884,7 +3082,7 @@ tpf*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| need_lib_prefix=no
|
| need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| shlibpath_overrides_runpath=no
|
| hardcode_into_libs=yes
|
| @@ -2892,8 +3090,8 @@ tpf*)
|
|
|
| uts4*)
|
| version_type=linux # correct to gnu/linux during the next big refactor
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
| + soname_spec='$libname$release$shared_ext$major'
|
| shlibpath_var=LD_LIBRARY_PATH
|
| ;;
|
|
|
| @@ -2902,20 +3100,30 @@ uts4*)
|
| ;;
|
| esac
|
| AC_MSG_RESULT([$dynamic_linker])
|
| -test "$dynamic_linker" = no && can_build_shared=no
|
| +test no = "$dynamic_linker" && can_build_shared=no
|
|
|
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
|
| fi
|
|
|
| -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
|
| - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
|
| +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
|
| + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
|
| fi
|
| -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
|
| - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
|
| +
|
| +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
|
| + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
|
| fi
|
|
|
| +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
|
| +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
|
| +
|
| +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
|
| +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
|
| +
|
| +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
|
| +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
|
| +
|
| _LT_DECL([], [variables_saved_for_relink], [1],
|
| [Variables whose values should be saved in libtool wrapper scripts and
|
| restored at link time])
|
| @@ -2948,39 +3156,41 @@ _LT_DECL([], [hardcode_into_libs], [0],
|
| [Whether we should hardcode library paths into libraries])
|
| _LT_DECL([], [sys_lib_search_path_spec], [2],
|
| [Compile-time system search path for libraries])
|
| -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
|
| - [Run-time system search path for libraries])
|
| +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
|
| + [Detected run-time system search path for libraries])
|
| +_LT_DECL([], [configure_time_lt_sys_library_path], [2],
|
| + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
|
| ])# _LT_SYS_DYNAMIC_LINKER
|
|
|
|
|
| # _LT_PATH_TOOL_PREFIX(TOOL)
|
| # --------------------------
|
| -# find a file program which can recognize shared library
|
| +# find a file program that can recognize shared library
|
| AC_DEFUN([_LT_PATH_TOOL_PREFIX],
|
| [m4_require([_LT_DECL_EGREP])dnl
|
| AC_MSG_CHECKING([for $1])
|
| AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
|
| [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
|
| dnl $ac_dummy forces splitting on constant user-supplied paths.
|
| dnl POSIX.2 word splitting is done only on the output of word expansions,
|
| dnl not every word. This closes a longstanding sh security hole.
|
| ac_dummy="m4_if([$2], , $PATH, [$2])"
|
| 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/$1; then
|
| - lt_cv_path_MAGIC_CMD="$ac_dir/$1"
|
| + if test -f "$ac_dir/$1"; then
|
| + lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
|
| 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
|
| :
|
| @@ -3003,11 +3213,11 @@ _LT_EOF
|
| break
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| - MAGIC_CMD="$lt_save_MAGIC_CMD"
|
| + IFS=$lt_save_ifs
|
| + MAGIC_CMD=$lt_save_MAGIC_CMD
|
| ;;
|
| esac])
|
| -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
|
| +MAGIC_CMD=$lt_cv_path_MAGIC_CMD
|
| if test -n "$MAGIC_CMD"; then
|
| AC_MSG_RESULT($MAGIC_CMD)
|
| else
|
| @@ -3025,7 +3235,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
|
|
|
| # _LT_PATH_MAGIC
|
| # --------------
|
| -# find a file program which can recognize a shared library
|
| +# find a file program that can recognize a shared library
|
| m4_defun([_LT_PATH_MAGIC],
|
| [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
|
| if test -z "$lt_cv_path_MAGIC_CMD"; then
|
| @@ -3052,16 +3262,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
|
| AC_ARG_WITH([gnu-ld],
|
| [AS_HELP_STRING([--with-gnu-ld],
|
| [assume the C compiler uses GNU ld @<:@default=no@:>@])],
|
| - [test "$withval" = no || with_gnu_ld=yes],
|
| + [test no = "$withval" || with_gnu_ld=yes],
|
| [with_gnu_ld=no])dnl
|
|
|
| ac_prog=ld
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| # Check if gcc -print-prog-name=ld gives a path.
|
| AC_MSG_CHECKING([for ld used by $CC])
|
| 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` ;;
|
| @@ -3075,7 +3285,7 @@ if test "$GCC" = yes; then
|
| 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.
|
| @@ -3086,37 +3296,37 @@ if test "$GCC" = yes; then
|
| with_gnu_ld=unknown
|
| ;;
|
| esac
|
| -elif test "$with_gnu_ld" = yes; then
|
| +elif test yes = "$with_gnu_ld"; then
|
| AC_MSG_CHECKING([for GNU ld])
|
| else
|
| AC_MSG_CHECKING([for non-GNU ld])
|
| fi
|
| AC_CACHE_VAL(lt_cv_path_LD,
|
| [if test -z "$LD"; then
|
| - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
| + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
|
| for ac_dir in $PATH; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| test -z "$ac_dir" && ac_dir=.
|
| if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
| - lt_cv_path_LD="$ac_dir/$ac_prog"
|
| + lt_cv_path_LD=$ac_dir/$ac_prog
|
| # Check to see if the program is GNU ld. I'd rather use --version,
|
| # but apparently some variants of GNU ld only accept -v.
|
| # Break only if it was the GNU/non-GNU ld that we prefer.
|
| case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
|
| *GNU* | *'with BFD'*)
|
| - test "$with_gnu_ld" != no && break
|
| + test no != "$with_gnu_ld" && break
|
| ;;
|
| *)
|
| - test "$with_gnu_ld" != yes && break
|
| + test yes != "$with_gnu_ld" && break
|
| ;;
|
| esac
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| else
|
| - lt_cv_path_LD="$LD" # Let the user override the test with a path.
|
| + lt_cv_path_LD=$LD # Let the user override the test with a path.
|
| fi])
|
| -LD="$lt_cv_path_LD"
|
| +LD=$lt_cv_path_LD
|
| if test -n "$LD"; then
|
| AC_MSG_RESULT($LD)
|
| else
|
| @@ -3170,13 +3380,13 @@ esac
|
| reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
| case $host_os in
|
| cygwin* | mingw* | pw32* | cegcc*)
|
| - if test "$GCC" != yes; then
|
| + if test yes != "$GCC"; then
|
| reload_cmds=false
|
| fi
|
| ;;
|
| darwin*)
|
| - if test "$GCC" = yes; then
|
| - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
|
| + if test yes = "$GCC"; then
|
| + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
|
| else
|
| reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
| fi
|
| @@ -3187,6 +3397,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
|
| ])# _LT_CMD_RELOAD
|
|
|
|
|
| +# _LT_PATH_DD
|
| +# -----------
|
| +# find a working dd
|
| +m4_defun([_LT_PATH_DD],
|
| +[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
|
| +[printf 0123456789abcdef0123456789abcdef >conftest.i
|
| +cat conftest.i conftest.i >conftest2.i
|
| +: ${lt_DD:=$DD}
|
| +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
|
| +[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])
|
| +rm -f conftest.i conftest2.i conftest.out])
|
| +])# _LT_PATH_DD
|
| +
|
| +
|
| +# _LT_CMD_TRUNCATE
|
| +# ----------------
|
| +# find command to truncate a binary pipe
|
| +m4_defun([_LT_CMD_TRUNCATE],
|
| +[m4_require([_LT_PATH_DD])
|
| +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
|
| +[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"])
|
| +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
|
| + [Command to truncate a binary pipe])
|
| +])# _LT_CMD_TRUNCATE
|
| +
|
| +
|
| # _LT_CHECK_MAGIC_METHOD
|
| # ----------------------
|
| # how to check for library dependencies
|
| @@ -3202,13 +3449,13 @@ lt_cv_deplibs_check_method='unknown'
|
| # Need to set the preceding variable on all platforms that support
|
| # interlibrary dependencies.
|
| # 'none' -- dependencies not supported.
|
| -# `unknown' -- same as none, but documents that we really don't know.
|
| +# 'unknown' -- same as none, but documents that we really don't know.
|
| # 'pass_all' -- all dependencies passed with no checks.
|
| # 'test_compile' -- check by making test program.
|
| # 'file_magic [[regex]]' -- check by looking for files in library path
|
| -# which responds to the $file_magic_cmd with a given extended regex.
|
| -# If you have `file' or equivalent on your system and you're not sure
|
| -# whether `pass_all' will *always* work, you probably want this one.
|
| +# that responds to the $file_magic_cmd with a given extended regex.
|
| +# If you have 'file' or equivalent on your system and you're not sure
|
| +# whether 'pass_all' will *always* work, you probably want this one.
|
|
|
| case $host_os in
|
| aix[[4-9]]*)
|
| @@ -3235,8 +3482,7 @@ mingw* | pw32*)
|
| # Base MSYS/MinGW do not provide the 'file' command needed by
|
| # func_win32_libid shell function, so use a weaker test based on 'objdump',
|
| # unless we find 'file', for example because we are cross-compiling.
|
| - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
|
| - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
|
| + if ( file / ) >/dev/null 2>&1; then
|
| lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
| lt_cv_file_magic_cmd='func_win32_libid'
|
| else
|
| @@ -3314,7 +3560,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
|
|
| -netbsd* | netbsdelf*-gnu)
|
| +netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
| lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
| else
|
| @@ -3332,8 +3578,8 @@ newos6*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
|
|
| -openbsd*)
|
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
| +openbsd* | bitrig*)
|
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
|
| lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
|
| else
|
| lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
| @@ -3386,6 +3632,9 @@ sysv4 | sysv4.3*)
|
| tpf*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
| +os2*)
|
| + lt_cv_deplibs_check_method=pass_all
|
| + ;;
|
| esac
|
| ])
|
|
|
| @@ -3426,33 +3675,38 @@ AC_DEFUN([LT_PATH_NM],
|
| AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
|
| [if test -n "$NM"; then
|
| # Let the user override the test.
|
| - lt_cv_path_NM="$NM"
|
| + lt_cv_path_NM=$NM
|
| else
|
| - lt_nm_to_check="${ac_tool_prefix}nm"
|
| + lt_nm_to_check=${ac_tool_prefix}nm
|
| if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
|
| lt_nm_to_check="$lt_nm_to_check nm"
|
| fi
|
| for lt_tmp_nm in $lt_nm_to_check; do
|
| - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
| + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
|
| for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| test -z "$ac_dir" && ac_dir=.
|
| - tmp_nm="$ac_dir/$lt_tmp_nm"
|
| - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
|
| + tmp_nm=$ac_dir/$lt_tmp_nm
|
| + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
|
| # Check to see if the nm accepts a BSD-compat flag.
|
| - # Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
| + # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
|
| # nm: unknown option "B" ignored
|
| # Tru64's nm complains that /dev/null is an invalid object file
|
| - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
|
| - */dev/null* | *'Invalid file or object type'*)
|
| + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
|
| + case $build_os in
|
| + mingw*) lt_bad_file=conftest.nm/nofile ;;
|
| + *) lt_bad_file=/dev/null ;;
|
| + esac
|
| + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
|
| + *$lt_bad_file* | *'Invalid file or object type'*)
|
| lt_cv_path_NM="$tmp_nm -B"
|
| - break
|
| + break 2
|
| ;;
|
| *)
|
| case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
|
| */dev/null*)
|
| lt_cv_path_NM="$tmp_nm -p"
|
| - break
|
| + break 2
|
| ;;
|
| *)
|
| lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
|
| @@ -3463,21 +3717,21 @@ else
|
| esac
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| done
|
| : ${lt_cv_path_NM=no}
|
| fi])
|
| -if test "$lt_cv_path_NM" != "no"; then
|
| - NM="$lt_cv_path_NM"
|
| +if test no != "$lt_cv_path_NM"; then
|
| + NM=$lt_cv_path_NM
|
| else
|
| # Didn't find any BSD compatible name lister, look for dumpbin.
|
| if test -n "$DUMPBIN"; then :
|
| # Let the user override the test.
|
| else
|
| AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
|
| - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
|
| + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
|
| *COFF*)
|
| - DUMPBIN="$DUMPBIN -symbols"
|
| + DUMPBIN="$DUMPBIN -symbols -headers"
|
| ;;
|
| *)
|
| DUMPBIN=:
|
| @@ -3485,8 +3739,8 @@ else
|
| esac
|
| fi
|
| AC_SUBST([DUMPBIN])
|
| - if test "$DUMPBIN" != ":"; then
|
| - NM="$DUMPBIN"
|
| + if test : != "$DUMPBIN"; then
|
| + NM=$DUMPBIN
|
| fi
|
| fi
|
| test -z "$NM" && NM=nm
|
| @@ -3532,8 +3786,8 @@ lt_cv_sharedlib_from_linklib_cmd,
|
|
|
| case $host_os in
|
| cygwin* | mingw* | pw32* | cegcc*)
|
| - # two different shell functions defined in ltmain.sh
|
| - # decide which to use based on capabilities of $DLLTOOL
|
| + # two different shell functions defined in ltmain.sh;
|
| + # decide which one to use based on capabilities of $DLLTOOL
|
| case `$DLLTOOL --help 2>&1` in
|
| *--identify-strict*)
|
| lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
|
| @@ -3545,7 +3799,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| ;;
|
| *)
|
| # fallback: assume linklib IS sharedlib
|
| - lt_cv_sharedlib_from_linklib_cmd="$ECHO"
|
| + lt_cv_sharedlib_from_linklib_cmd=$ECHO
|
| ;;
|
| esac
|
| ])
|
| @@ -3572,13 +3826,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool
|
| lt_cv_path_mainfest_tool=yes
|
| fi
|
| rm -f conftest*])
|
| -if test "x$lt_cv_path_mainfest_tool" != xyes; then
|
| +if test yes != "$lt_cv_path_mainfest_tool"; then
|
| MANIFEST_TOOL=:
|
| fi
|
| _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
|
| ])# _LT_PATH_MANIFEST_TOOL
|
|
|
|
|
| +# _LT_DLL_DEF_P([FILE])
|
| +# ---------------------
|
| +# True iff FILE is a Windows DLL '.def' file.
|
| +# Keep in sync with func_dll_def_p in the libtool script
|
| +AC_DEFUN([_LT_DLL_DEF_P],
|
| +[dnl
|
| + test DEF = "`$SED -n dnl
|
| + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
|
| + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
|
| + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
|
| + -e q dnl Only consider the first "real" line
|
| + $1`" dnl
|
| +])# _LT_DLL_DEF_P
|
| +
|
| +
|
| # LT_LIB_M
|
| # --------
|
| # check for math library
|
| @@ -3590,11 +3859,11 @@ case $host in
|
| # These system don't have libm, or don't need it
|
| ;;
|
| *-ncr-sysv4.3*)
|
| - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
|
| + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
|
| AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
|
| ;;
|
| *)
|
| - AC_CHECK_LIB(m, cos, LIBM="-lm")
|
| + AC_CHECK_LIB(m, cos, LIBM=-lm)
|
| ;;
|
| esac
|
| AC_SUBST([LIBM])
|
| @@ -3613,7 +3882,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
|
|
|
| _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
|
|
|
| -if test "$GCC" = yes; then
|
| +if test yes = "$GCC"; then
|
| case $cc_basename in
|
| nvcc*)
|
| _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
|
| @@ -3665,7 +3934,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
| symcode='[[ABCDGISTW]]'
|
| ;;
|
| hpux*)
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| symcode='[[ABCDEGRST]]'
|
| fi
|
| ;;
|
| @@ -3698,14 +3967,44 @@ case `$NM -V 2>&1` in
|
| symcode='[[ABCDGIRSTW]]' ;;
|
| esac
|
|
|
| +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
|
| + # Gets list of data symbols to import.
|
| + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
|
| + # Adjust the below global symbol transforms to fixup imported variables.
|
| + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
|
| + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
|
| + lt_c_name_lib_hook="\
|
| + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
|
| + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
|
| +else
|
| + # Disable hooks by default.
|
| + lt_cv_sys_global_symbol_to_import=
|
| + lt_cdecl_hook=
|
| + lt_c_name_hook=
|
| + lt_c_name_lib_hook=
|
| +fi
|
| +
|
| # Transform an extracted symbol line into a proper C declaration.
|
| # Some systems (esp. on ia64) link data and code symbols differently,
|
| # so use this general approach.
|
| -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
|
| +lt_cv_sys_global_symbol_to_cdecl="sed -n"\
|
| +$lt_cdecl_hook\
|
| +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
|
| +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
|
|
|
| # Transform an extracted symbol line into symbol name and symbol address
|
| -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
|
| -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
|
| +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
|
| +$lt_c_name_hook\
|
| +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
|
| +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
|
| +
|
| +# Transform an extracted symbol line into symbol name with lib prefix and
|
| +# symbol address.
|
| +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
|
| +$lt_c_name_lib_hook\
|
| +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
|
| +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
|
| +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
|
|
|
| # Handle CRLF in mingw tool chain
|
| opt_cr=
|
| @@ -3723,21 +4022,24 @@ for ac_symprfx in "" "_"; do
|
|
|
| # Write the raw and C identifiers.
|
| if test "$lt_cv_nm_interface" = "MS dumpbin"; then
|
| - # Fake it for dumpbin and say T for any non-static function
|
| - # and D for any global variable.
|
| + # Fake it for dumpbin and say T for any non-static function,
|
| + # D for any global variable and I for any imported variable.
|
| # Also find C++ and __fastcall symbols from MSVC++,
|
| # which start with @ or ?.
|
| lt_cv_sys_global_symbol_pipe="$AWK ['"\
|
| " {last_section=section; section=\$ 3};"\
|
| " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
|
| " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
|
| +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
|
| +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
|
| +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
|
| " \$ 0!~/External *\|/{next};"\
|
| " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
|
| " {if(hide[section]) next};"\
|
| -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
|
| -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
|
| -" s[1]~/^[@?]/{print s[1], s[1]; next};"\
|
| -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
|
| +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
|
| +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
|
| +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
|
| +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
|
| " ' prfx=^$ac_symprfx]"
|
| else
|
| lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
|
| @@ -3777,11 +4079,11 @@ _LT_EOF
|
| if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
|
| cat <<_LT_EOF > conftest.$ac_ext
|
| /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
|
| -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
|
| -/* DATA imports from DLLs on WIN32 con't be const, because runtime
|
| +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
|
| +/* DATA imports from DLLs on WIN32 can't be const, because runtime
|
| relocations are performed -- see ld's documentation on pseudo-relocs. */
|
| # define LT@&t@_DLSYM_CONST
|
| -#elif defined(__osf__)
|
| +#elif defined __osf__
|
| /* This system does not cope well with relocations in const data. */
|
| # define LT@&t@_DLSYM_CONST
|
| #else
|
| @@ -3807,7 +4109,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] =
|
| {
|
| { "@PROGRAM@", (void *) 0 },
|
| _LT_EOF
|
| - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
|
| + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
|
| cat <<\_LT_EOF >> conftest.$ac_ext
|
| {0, (void *) 0}
|
| };
|
| @@ -3827,9 +4129,9 @@ _LT_EOF
|
| mv conftest.$ac_objext conftstm.$ac_objext
|
| lt_globsym_save_LIBS=$LIBS
|
| lt_globsym_save_CFLAGS=$CFLAGS
|
| - LIBS="conftstm.$ac_objext"
|
| + LIBS=conftstm.$ac_objext
|
| CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
|
| - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
|
| + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
|
| pipe_works=yes
|
| fi
|
| LIBS=$lt_globsym_save_LIBS
|
| @@ -3850,7 +4152,7 @@ _LT_EOF
|
| rm -rf conftest* conftst*
|
|
|
| # Do not use the global_symbol_pipe unless it works.
|
| - if test "$pipe_works" = yes; then
|
| + if test yes = "$pipe_works"; then
|
| break
|
| else
|
| lt_cv_sys_global_symbol_pipe=
|
| @@ -3877,12 +4179,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
|
| [Take the output of nm and produce a listing of raw symbols and C names])
|
| _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
|
| [Transform the output of nm in a proper C declaration])
|
| +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
|
| + [Transform the output of nm into a list of symbols to manually relocate])
|
| _LT_DECL([global_symbol_to_c_name_address],
|
| [lt_cv_sys_global_symbol_to_c_name_address], [1],
|
| [Transform the output of nm in a C name address pair])
|
| _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
|
| [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
|
| [Transform the output of nm in a C name address pair when lib prefix is needed])
|
| +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
|
| + [The name lister interface])
|
| _LT_DECL([], [nm_file_list_spec], [1],
|
| [Specify filename containing input files for $NM])
|
| ]) # _LT_CMD_GLOBAL_SYMBOLS
|
| @@ -3898,17 +4204,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
|
|
|
| m4_if([$1], [CXX], [
|
| # C++ specific cases for pic, static, wl, etc.
|
| - if test "$GXX" = yes; then
|
| + if test yes = "$GXX"; then
|
| _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
|
|
| case $host_os in
|
| aix*)
|
| # All AIX code is PIC.
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 now supports IA64 processor
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
| fi
|
| + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
| ;;
|
|
|
| amigaos*)
|
| @@ -3919,8 +4226,8 @@ m4_if([$1], [CXX], [
|
| ;;
|
| 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_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
| ;;
|
| esac
|
| @@ -3936,6 +4243,11 @@ m4_if([$1], [CXX], [
|
| # (--disable-auto-import) libraries
|
| m4_if([$1], [GCJ], [],
|
| [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
| + case $host_os in
|
| + os2*)
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
|
| + ;;
|
| + esac
|
| ;;
|
| darwin* | rhapsody*)
|
| # PIC is the default on this platform
|
| @@ -3985,7 +4297,7 @@ m4_if([$1], [CXX], [
|
| case $host_os in
|
| aix[[4-9]]*)
|
| # All AIX code is PIC.
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 now supports IA64 processor
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
| else
|
| @@ -4026,14 +4338,14 @@ m4_if([$1], [CXX], [
|
| case $cc_basename in
|
| CC*)
|
| _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
|
| - if test "$host_cpu" != ia64; then
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
|
| + if test ia64 != "$host_cpu"; then
|
| _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
|
| fi
|
| ;;
|
| aCC*)
|
| _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
|
| case $host_cpu in
|
| hppa*64*|ia64*)
|
| # +Z the default
|
| @@ -4070,7 +4382,7 @@ m4_if([$1], [CXX], [
|
| _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
| ;;
|
| ecpc* )
|
| - # old Intel C++ for x86_64 which still supported -KPIC.
|
| + # old Intel C++ for x86_64, which still supported -KPIC.
|
| _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
| @@ -4126,7 +4438,7 @@ m4_if([$1], [CXX], [
|
| ;;
|
| esac
|
| ;;
|
| - netbsd* | netbsdelf*-gnu)
|
| + netbsd*)
|
| ;;
|
| *qnx* | *nto*)
|
| # QNX uses GNU C++, but need to define -shared option too, otherwise
|
| @@ -4215,17 +4527,18 @@ m4_if([$1], [CXX], [
|
| fi
|
| ],
|
| [
|
| - if test "$GCC" = yes; then
|
| + if test yes = "$GCC"; then
|
| _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
|
|
| case $host_os in
|
| aix*)
|
| # All AIX code is PIC.
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 now supports IA64 processor
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
| fi
|
| + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
| ;;
|
|
|
| amigaos*)
|
| @@ -4236,8 +4549,8 @@ m4_if([$1], [CXX], [
|
| ;;
|
| 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_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
| ;;
|
| esac
|
| @@ -4254,6 +4567,11 @@ m4_if([$1], [CXX], [
|
| # (--disable-auto-import) libraries
|
| m4_if([$1], [GCJ], [],
|
| [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
| + case $host_os in
|
| + os2*)
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
|
| + ;;
|
| + esac
|
| ;;
|
|
|
| darwin* | rhapsody*)
|
| @@ -4324,7 +4642,7 @@ m4_if([$1], [CXX], [
|
| case $host_os in
|
| aix*)
|
| _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # AIX 5 now supports IA64 processor
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
| else
|
| @@ -4332,11 +4650,30 @@ m4_if([$1], [CXX], [
|
| fi
|
| ;;
|
|
|
| + darwin* | rhapsody*)
|
| + # PIC is the default on this platform
|
| + # Common symbols not allowed in MH_DYLIB files
|
| + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
|
| + case $cc_basename in
|
| + nagfor*)
|
| + # NAG Fortran compiler
|
| + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
|
| + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='-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).
|
| m4_if([$1], [GCJ], [],
|
| [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
| + case $host_os in
|
| + os2*)
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
|
| + ;;
|
| + esac
|
| ;;
|
|
|
| hpux9* | hpux10* | hpux11*)
|
| @@ -4352,7 +4689,7 @@ m4_if([$1], [CXX], [
|
| ;;
|
| esac
|
| # Is there a better lt_prog_compiler_static that works with the bundled CC?
|
| - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
|
| ;;
|
|
|
| irix5* | irix6* | nonstopux*)
|
| @@ -4363,7 +4700,7 @@ m4_if([$1], [CXX], [
|
|
|
| linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
| case $cc_basename in
|
| - # old Intel for x86_64 which still supported -KPIC.
|
| + # old Intel for x86_64, which still supported -KPIC.
|
| ecc*)
|
| _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
| @@ -4388,6 +4725,12 @@ m4_if([$1], [CXX], [
|
| _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
| ;;
|
| + tcc*)
|
| + # Fabrice Bellard et al's Tiny C Compiler
|
| + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
| + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
| + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
| + ;;
|
| pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
|
| # Portland Group compilers (*not* the Pentium gcc compiler,
|
| # which looks to be a dead project)
|
| @@ -4485,7 +4828,7 @@ m4_if([$1], [CXX], [
|
| ;;
|
|
|
| sysv4*MP*)
|
| - if test -d /usr/nec ;then
|
| + if test -d /usr/nec; then
|
| _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
|
| _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
| fi
|
| @@ -4514,7 +4857,7 @@ m4_if([$1], [CXX], [
|
| fi
|
| ])
|
| case $host_os in
|
| - # For platforms which do not support PIC, -DPIC is meaningless:
|
| + # For platforms that do not support PIC, -DPIC is meaningless:
|
| *djgpp*)
|
| _LT_TAGVAR(lt_prog_compiler_pic, $1)=
|
| ;;
|
| @@ -4580,17 +4923,21 @@ m4_if([$1], [CXX], [
|
| case $host_os in
|
| aix[[4-9]]*)
|
| # If we're using GNU nm, then we don't want the "-C" option.
|
| - # -C means demangle to AIX nm, but means don't demangle with GNU nm
|
| - # Also, AIX nm treats weak defined symbols like other global defined
|
| - # symbols, whereas GNU nm marks them as "W".
|
| + # -C means demangle to GNU nm, but means don't demangle to AIX nm.
|
| + # Without the "-l" option, or with the "-B" option, AIX nm treats
|
| + # weak defined symbols like other global defined symbols, whereas
|
| + # GNU nm marks them as "W".
|
| + # While the 'weak' keyword is ignored in the Export File, we need
|
| + # it in the Import File for the 'aix-soname' feature, so we have
|
| + # to replace the "-B" option with "-P" for AIX nm.
|
| if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
| - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
| + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
|
| else
|
| - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
| + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
|
| fi
|
| ;;
|
| pw32*)
|
| - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
| + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
|
| ;;
|
| cygwin* | mingw* | cegcc*)
|
| case $cc_basename in
|
| @@ -4603,9 +4950,6 @@ m4_if([$1], [CXX], [
|
| ;;
|
| esac
|
| ;;
|
| - linux* | k*bsd*-gnu | gnu*)
|
| - _LT_TAGVAR(link_all_deplibs, $1)=no
|
| - ;;
|
| *)
|
| _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
| ;;
|
| @@ -4639,9 +4983,9 @@ m4_if([$1], [CXX], [
|
| # included in the symbol list
|
| _LT_TAGVAR(include_expsyms, $1)=
|
| # 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'.
|
| _LT_TAGVAR(exclude_expsyms, $1)=['_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
|
| @@ -4657,7 +5001,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
| # FIXME: the MSVC++ port hasn't been tested in a loooong time
|
| # When not using gcc, we currently assume that we are using
|
| # Microsoft Visual C++.
|
| - if test "$GCC" != yes; then
|
| + if test yes != "$GCC"; then
|
| with_gnu_ld=no
|
| fi
|
| ;;
|
| @@ -4665,12 +5009,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
| # we just hope/assume this is gcc and not c89 (= MSVC++)
|
| with_gnu_ld=yes
|
| ;;
|
| - openbsd*)
|
| + openbsd* | bitrig*)
|
| with_gnu_ld=no
|
| ;;
|
| - linux* | k*bsd*-gnu | gnu*)
|
| - _LT_TAGVAR(link_all_deplibs, $1)=no
|
| - ;;
|
| esac
|
|
|
| _LT_TAGVAR(ld_shlibs, $1)=yes
|
| @@ -4678,7 +5019,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
| # On some targets, GNU ld is compatible enough with the native linker
|
| # that we're better off using the native interface for both.
|
| lt_use_gnu_ld_interface=no
|
| - if test "$with_gnu_ld" = yes; then
|
| + if test yes = "$with_gnu_ld"; then
|
| case $host_os in
|
| aix*)
|
| # The AIX port of GNU ld has always aspired to compatibility
|
| @@ -4700,24 +5041,24 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
| esac
|
| fi
|
|
|
| - if test "$lt_use_gnu_ld_interface" = yes; then
|
| + if test yes = "$lt_use_gnu_ld_interface"; then
|
| # If archive_cmds runs LD, not CC, wlarc should be empty
|
| - wlarc='${wl}'
|
| + wlarc='$wl'
|
|
|
| # Set some defaults for GNU ld with shared library support. These
|
| # are reset later if shared libraries are not supported. Putting them
|
| # here allows them to be overridden if necessary.
|
| runpath_var=LD_RUN_PATH
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$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
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
|
| else
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)=
|
| fi
|
| supports_anon_versioning=no
|
| - case `$LD -v 2>&1` in
|
| + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
|
| *GNU\ gold*) supports_anon_versioning=yes ;;
|
| *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
|
| *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
|
| @@ -4730,7 +5071,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
| case $host_os in
|
| aix[[3-9]]*)
|
| # On AIX/PPC, the GNU linker is very broken
|
| - if test "$host_cpu" != ia64; then
|
| + if test ia64 != "$host_cpu"; then
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| cat <<_LT_EOF 1>&2
|
|
|
| @@ -4749,7 +5090,7 @@ _LT_EOF
|
| case $host_cpu in
|
| powerpc)
|
| # see comment about AmigaOS4 .so support
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)=''
|
| ;;
|
| m68k)
|
| @@ -4765,7 +5106,7 @@ _LT_EOF
|
| _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
| # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
| # support --undefined. This deserves some investigation. FIXME
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| fi
|
| @@ -4775,7 +5116,7 @@ _LT_EOF
|
| # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
| # as there is no search path for DLLs.
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
|
| _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
| _LT_TAGVAR(always_export_symbols, $1)=no
|
| _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
| @@ -4783,61 +5124,89 @@ _LT_EOF
|
| _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
|
|
|
| if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$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...
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$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...
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
|
| + cp $export_symbols $output_objdir/$soname.def;
|
| + else
|
| + echo EXPORTS > $output_objdir/$soname.def;
|
| + cat $export_symbols >> $output_objdir/$soname.def;
|
| + fi~
|
| + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| fi
|
| ;;
|
|
|
| haiku*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| ;;
|
|
|
| + os2*)
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
| + _LT_TAGVAR(hardcode_minus_L, $1)=yes
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
| + shrext_cmds=.dll
|
| + _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$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'
|
| + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
|
| + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
| + ;;
|
| +
|
| interix[[3-9]]*)
|
| _LT_TAGVAR(hardcode_direct, $1)=no
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$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.
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
| ;;
|
|
|
| gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
| tmp_diet=no
|
| - if test "$host_os" = linux-dietlibc; then
|
| + if test linux-dietlibc = "$host_os"; then
|
| case $cc_basename in
|
| diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
|
| esac
|
| fi
|
| if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
|
| - && test "$tmp_diet" = no
|
| + && test no = "$tmp_diet"
|
| then
|
| tmp_addflag=' $pic_flag'
|
| tmp_sharedflag='-shared'
|
| case $cc_basename,$host_cpu in
|
| pgcc*) # Portland Group C compiler
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$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
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$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' ;;
|
| @@ -4848,42 +5217,47 @@ _LT_EOF
|
| lf95*) # Lahey Fortran 8.1
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)=
|
| 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
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$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'
|
| _LT_TAGVAR(compiler_needs_object, $1)=yes
|
| ;;
|
| esac
|
| case `$CC -V 2>&1 | sed 5q` in
|
| *Sun\ C*) # Sun C 5.9
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$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'
|
| _LT_TAGVAR(compiler_needs_object, $1)=yes
|
| tmp_sharedflag='-G' ;;
|
| *Sun\ F*) # Sun Fortran 8.3
|
| tmp_sharedflag='-G' ;;
|
| esac
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
|
| - if test "x$supports_anon_versioning" = xyes; then
|
| + if test yes = "$supports_anon_versioning"; then
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='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*)
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
|
| + ;;
|
| xlf* | bgf* | bgxlf* | mpixlf*)
|
| # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
|
| - if test "x$supports_anon_versioning" = xyes; then
|
| + if test yes = "$supports_anon_versioning"; then
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
|
| - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
| - echo "local: *; };" >> $output_objdir/$libname.ver~
|
| - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
|
| + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
| + echo "local: *; };" >> $output_objdir/$libname.ver~
|
| + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
|
| fi
|
| ;;
|
| esac
|
| @@ -4892,13 +5266,13 @@ _LT_EOF
|
| fi
|
| ;;
|
|
|
| - netbsd* | netbsdelf*-gnu)
|
| + netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
| wlarc=
|
| else
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| fi
|
| ;;
|
|
|
| @@ -4916,8 +5290,8 @@ _LT_EOF
|
|
|
| _LT_EOF
|
| elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| fi
|
| @@ -4929,7 +5303,7 @@ _LT_EOF
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| cat <<_LT_EOF 1>&2
|
|
|
| -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
|
| +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
|
| *** reliably create shared libraries on SCO systems. Therefore, libtool
|
| *** is disabling shared libraries support. We urge you to upgrade GNU
|
| *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
|
| @@ -4944,9 +5318,9 @@ _LT_EOF
|
| # DT_RUNPATH tag from executables and libraries. But doing so
|
| # requires that you compile everything twice, which is a pain.
|
| if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| fi
|
| @@ -4963,15 +5337,15 @@ _LT_EOF
|
|
|
| *)
|
| if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| fi
|
| ;;
|
| esac
|
|
|
| - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
|
| + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
|
| runpath_var=
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
| _LT_TAGVAR(export_dynamic_flag_spec, $1)=
|
| @@ -4987,7 +5361,7 @@ _LT_EOF
|
| # Note: this linker hardcodes the directories in LIBPATH if there
|
| # are no directories specified by -L.
|
| _LT_TAGVAR(hardcode_minus_L, $1)=yes
|
| - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
|
| + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
|
| # Neither direct hardcoding nor static linking is supported with a
|
| # broken collect2.
|
| _LT_TAGVAR(hardcode_direct, $1)=unsupported
|
| @@ -4995,34 +5369,57 @@ _LT_EOF
|
| ;;
|
|
|
| aix[[4-9]]*)
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # On IA64, the linker does run time linking by default, so we don't
|
| # have to do anything special.
|
| aix_use_runtimelinking=no
|
| exp_sym_flag='-Bexport'
|
| - no_entry_flag=""
|
| + no_entry_flag=
|
| else
|
| # If we're using GNU nm, then we don't want the "-C" option.
|
| - # -C means demangle to AIX nm, but means don't demangle with GNU nm
|
| - # Also, AIX nm treats weak defined symbols like other global
|
| - # defined symbols, whereas GNU nm marks them as "W".
|
| + # -C means demangle to GNU nm, but means don't demangle to AIX nm.
|
| + # Without the "-l" option, or with the "-B" option, AIX nm treats
|
| + # weak defined symbols like other global defined symbols, whereas
|
| + # GNU nm marks them as "W".
|
| + # While the 'weak' keyword is ignored in the Export File, we need
|
| + # it in the Import File for the 'aix-soname' feature, so we have
|
| + # to replace the "-B" option with "-P" for AIX nm.
|
| if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
|
| - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
| + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
|
| else
|
| - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
|
| + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
|
| fi
|
| aix_use_runtimelinking=no
|
|
|
| # Test if we are trying to use run time linking or normal
|
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
| - # need to do runtime linking.
|
| + # have runtime linking enabled, and use it for executables.
|
| + # For shared libraries, we enable/disable runtime linking
|
| + # depending on the kind of the shared library created -
|
| + # when "with_aix_soname,aix_use_runtimelinking" is:
|
| + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
|
| + # "aix,yes" lib.so shared, rtl:yes, for executables
|
| + # lib.a static archive
|
| + # "both,no" lib.so.V(shr.o) shared, rtl:yes
|
| + # lib.a(lib.so.V) shared, rtl:no, for executables
|
| + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
|
| + # lib.a(lib.so.V) shared, rtl:no
|
| + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
|
| + # lib.a static archive
|
| case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
|
| for ld_flag in $LDFLAGS; do
|
| - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
| + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
|
| aix_use_runtimelinking=yes
|
| break
|
| fi
|
| done
|
| + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
|
| + # With aix-soname=svr4, we create the lib.so.V shared archives only,
|
| + # so we don't have lib.a shared libs to link our executables.
|
| + # We have to force runtime linking in this case.
|
| + aix_use_runtimelinking=yes
|
| + LDFLAGS="$LDFLAGS -Wl,-brtl"
|
| + fi
|
| ;;
|
| esac
|
|
|
| @@ -5041,13 +5438,21 @@ _LT_EOF
|
| _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
|
| + _LT_TAGVAR(file_list_spec, $1)='$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.
|
| + _LT_TAGVAR(hardcode_direct, $1)=no
|
| + _LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
| + ;;
|
| + esac
|
|
|
| - if test "$GCC" = yes; then
|
| + if test yes = "$GCC"; then
|
| case $host_os in aix4.[[012]]|aix4.[[012]].*)
|
| # We only want to do this on AIX 4.2 and lower, the check
|
| # below for broken collect2 doesn't work under 4.3+
|
| - collect2name=`${CC} -print-prog-name=collect2`
|
| + collect2name=`$CC -print-prog-name=collect2`
|
| if test -f "$collect2name" &&
|
| strings "$collect2name" | $GREP resolve_lib_name >/dev/null
|
| then
|
| @@ -5066,62 +5471,80 @@ _LT_EOF
|
| ;;
|
| esac
|
| shared_flag='-shared'
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| - shared_flag="$shared_flag "'${wl}-G'
|
| + if test yes = "$aix_use_runtimelinking"; then
|
| + shared_flag="$shared_flag "'$wl-G'
|
| fi
|
| - _LT_TAGVAR(link_all_deplibs, $1)=no
|
| + # Need to ensure runtime linking is disabled for the traditional
|
| + # shared library, or the linker may eventually find shared libraries
|
| + # /with/ Import File - we do not want to mix them.
|
| + shared_flag_aix='-shared'
|
| + shared_flag_svr4='-shared $wl-G'
|
| else
|
| # not using gcc
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
| # chokes on -Wl,-G. The following line is correct:
|
| shared_flag='-G'
|
| else
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| - shared_flag='${wl}-G'
|
| + if test yes = "$aix_use_runtimelinking"; then
|
| + shared_flag='$wl-G'
|
| else
|
| - shared_flag='${wl}-bM:SRE'
|
| + shared_flag='$wl-bM:SRE'
|
| fi
|
| + shared_flag_aix='$wl-bM:SRE'
|
| + shared_flag_svr4='$wl-G'
|
| fi
|
| fi
|
|
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$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.
|
| _LT_TAGVAR(always_export_symbols, $1)=yes
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
|
| # Warning - without using the other runtime loading flags (-brtl),
|
| # -berok will link without error, but may produce a broken library.
|
| _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
|
| # Determine the default libpath from the value encoded in an
|
| # empty executable.
|
| _LT_SYS_MODULE_PATH_AIX([$1])
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$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"
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
|
| else
|
| - if test "$host_cpu" = ia64; then
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
|
| + if test ia64 = "$host_cpu"; then
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
|
| _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)="\$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"
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="\$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.
|
| _LT_SYS_MODULE_PATH_AIX([$1])
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$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.
|
| - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
|
| - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
|
| - if test "$with_gnu_ld" = yes; then
|
| + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
|
| + if test yes = "$with_gnu_ld"; then
|
| # We only use this code for GNU lds that support --whole-archive.
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
|
| else
|
| # Exported symbols can be pulled into shared objects from archives
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
|
| fi
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
|
| - # This is similar to how AIX traditionally builds its shared libraries.
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)="\$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'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$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.
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$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
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$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
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
|
| + fi
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
|
| fi
|
| fi
|
| ;;
|
| @@ -5130,7 +5553,7 @@ _LT_EOF
|
| case $host_cpu in
|
| powerpc)
|
| # see comment about AmigaOS4 .so support
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)=''
|
| ;;
|
| m68k)
|
| @@ -5160,16 +5583,17 @@ _LT_EOF
|
| # Tell ltmain to make .lib files, not .a files.
|
| libext=lib
|
| # Tell ltmain to make .dll files, not .so files.
|
| - shrext_cmds=".dll"
|
| + shrext_cmds=.dll
|
| # FIXME: Setting linknames here is a bad hack.
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
| - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
|
| - else
|
| - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
|
| - fi~
|
| - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
|
| - linknames='
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$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, $1)='true'
|
| _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
| @@ -5178,18 +5602,18 @@ _LT_EOF
|
| # Don't use ranlib
|
| _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
|
| _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
|
| - lt_tool_outputfile="@TOOL_OUTPUT@"~
|
| - case $lt_outputfile in
|
| - *.exe|*.EXE) ;;
|
| - *)
|
| - lt_outputfile="$lt_outputfile.exe"
|
| - lt_tool_outputfile="$lt_tool_outputfile.exe"
|
| - ;;
|
| - esac~
|
| - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
|
| - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
|
| - $RM "$lt_outputfile.manifest";
|
| - fi'
|
| + lt_tool_outputfile="@TOOL_OUTPUT@"~
|
| + case $lt_outputfile in
|
| + *.exe|*.EXE) ;;
|
| + *)
|
| + lt_outputfile=$lt_outputfile.exe
|
| + lt_tool_outputfile=$lt_tool_outputfile.exe
|
| + ;;
|
| + esac~
|
| + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
|
| + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
|
| + $RM "$lt_outputfile.manifest";
|
| + fi'
|
| ;;
|
| *)
|
| # Assume MSVC wrapper
|
| @@ -5198,7 +5622,7 @@ _LT_EOF
|
| # Tell ltmain to make .lib files, not .a files.
|
| libext=lib
|
| # Tell ltmain to make .dll files, not .so files.
|
| - shrext_cmds=".dll"
|
| + shrext_cmds=.dll
|
| # FIXME: Setting linknames here is a bad hack.
|
| _LT_TAGVAR(archive_cmds, $1)='$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.
|
| @@ -5248,33 +5672,33 @@ _LT_EOF
|
| ;;
|
|
|
| hpux9*)
|
| - if test "$GCC" = yes; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
| + if test yes = "$GCC"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
|
| else
|
| - _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
|
| fi
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
| _LT_TAGVAR(hardcode_direct, $1)=yes
|
|
|
| # hardcode_minus_L: Not really in the search PATH,
|
| # but as the default location of the library.
|
| _LT_TAGVAR(hardcode_minus_L, $1)=yes
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
|
| ;;
|
|
|
| hpux10*)
|
| - if test "$GCC" = yes && test "$with_gnu_ld" = no; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
| + if test yes,no = "$GCC,$with_gnu_ld"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
| else
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
|
| fi
|
| - if test "$with_gnu_ld" = no; then
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
| + if test no = "$with_gnu_ld"; then
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
| _LT_TAGVAR(hardcode_direct, $1)=yes
|
| _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
|
| # hardcode_minus_L: Not really in the search PATH,
|
| # but as the default location of the library.
|
| _LT_TAGVAR(hardcode_minus_L, $1)=yes
|
| @@ -5282,25 +5706,25 @@ _LT_EOF
|
| ;;
|
|
|
| hpux11*)
|
| - if test "$GCC" = yes && test "$with_gnu_ld" = no; then
|
| + if test yes,no = "$GCC,$with_gnu_ld"; then
|
| case $host_cpu in
|
| hppa*64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| ia64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| *)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| esac
|
| else
|
| case $host_cpu in
|
| hppa*64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| ia64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| *)
|
| m4_if($1, [], [
|
| @@ -5308,14 +5732,14 @@ _LT_EOF
|
| # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
|
| _LT_LINKER_OPTION([if $CC understands -b],
|
| _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
|
| - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
|
| + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
|
| [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
|
| - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
|
| + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
|
| ;;
|
| esac
|
| fi
|
| - if test "$with_gnu_ld" = no; then
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
| + if test no = "$with_gnu_ld"; then
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
| case $host_cpu in
|
| @@ -5326,7 +5750,7 @@ _LT_EOF
|
| *)
|
| _LT_TAGVAR(hardcode_direct, $1)=yes
|
| _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
|
|
|
| # hardcode_minus_L: Not really in the search PATH,
|
| # but as the default location of the library.
|
| @@ -5337,16 +5761,16 @@ _LT_EOF
|
| ;;
|
|
|
| irix5* | irix6* | nonstopux*)
|
| - if test "$GCC" = yes; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
| + if test yes = "$GCC"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
|
| # Try to use the -exported_symbol ld option, if it does not
|
| # work, assume that -exports_file does not work either and
|
| # implicitly export all symbols.
|
| # This should be the same for all languages, so no per-tag cache variable.
|
| AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
|
| [lt_cv_irix_exported_symbol],
|
| - [save_LDFLAGS="$LDFLAGS"
|
| - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
|
| + [save_LDFLAGS=$LDFLAGS
|
| + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
|
| AC_LINK_IFELSE(
|
| [AC_LANG_SOURCE(
|
| [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
|
| @@ -5359,22 +5783,32 @@ _LT_EOF
|
| end]])])],
|
| [lt_cv_irix_exported_symbol=yes],
|
| [lt_cv_irix_exported_symbol=no])
|
| - LDFLAGS="$save_LDFLAGS"])
|
| - if test "$lt_cv_irix_exported_symbol" = yes; then
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$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'
|
| + LDFLAGS=$save_LDFLAGS])
|
| + if test yes = "$lt_cv_irix_exported_symbol"; then
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
|
| fi
|
| else
|
| - _LT_TAGVAR(archive_cmds, $1)='$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'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$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
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
| _LT_TAGVAR(inherit_rpath, $1)=yes
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| ;;
|
|
|
| - netbsd* | netbsdelf*-gnu)
|
| + linux*)
|
| + case $cc_basename in
|
| + tcc*)
|
| + # Fabrice Bellard et al's Tiny C Compiler
|
| + _LT_TAGVAR(ld_shlibs, $1)=yes
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
| + ;;
|
| + esac
|
| + ;;
|
| +
|
| + netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
| else
|
| @@ -5388,7 +5822,7 @@ _LT_EOF
|
| newsos6)
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
| _LT_TAGVAR(hardcode_direct, $1)=yes
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| ;;
|
| @@ -5396,27 +5830,19 @@ _LT_EOF
|
| *nto* | *qnx*)
|
| ;;
|
|
|
| - openbsd*)
|
| + openbsd* | bitrig*)
|
| if test -f /usr/libexec/ld.so; then
|
| _LT_TAGVAR(hardcode_direct, $1)=yes
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
| - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
| + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
|
| _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
|
| else
|
| - case $host_os in
|
| - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
| - ;;
|
| - *)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| - ;;
|
| - esac
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| fi
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| @@ -5427,33 +5853,53 @@ _LT_EOF
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
| _LT_TAGVAR(hardcode_minus_L, $1)=yes
|
| _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
| - _LT_TAGVAR(archive_cmds, $1)='$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'
|
| - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
|
| + shrext_cmds=.dll
|
| + _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$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'
|
| + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
|
| + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
| ;;
|
|
|
| osf3*)
|
| - if test "$GCC" = yes; then
|
| - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
| + if test yes = "$GCC"; then
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
|
| + _LT_TAGVAR(archive_cmds, $1)='$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
|
| _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
|
| - _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$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
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
| ;;
|
|
|
| osf4* | osf5*) # as osf3* with the addition of -msym flag
|
| - if test "$GCC" = yes; then
|
| - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
| - _LT_TAGVAR(archive_cmds, $1)='$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'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + if test yes = "$GCC"; then
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
|
| + _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| else
|
| _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
|
| - _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$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'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='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
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
| @@ -5464,24 +5910,24 @@ _LT_EOF
|
|
|
| solaris*)
|
| _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
|
| - if test "$GCC" = yes; then
|
| - wlarc='${wl}'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + if test yes = "$GCC"; then
|
| + wlarc='$wl'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
| - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
|
| + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
|
| else
|
| case `$CC -V 2>&1` in
|
| *"Compilers 5.0"*)
|
| wlarc=''
|
| - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='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}'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + wlarc='$wl'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='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
|
| @@ -5491,11 +5937,11 @@ _LT_EOF
|
| solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
|
| *)
|
| # The compiler driver will combine and reorder linker options,
|
| - # but understands `-z linker_flag'. GCC discards it without `$wl',
|
| + # but understands '-z linker_flag'. GCC discards it without '$wl',
|
| # but is careful enough not to reorder.
|
| # Supported since Solaris 2.6 (maybe 2.5.1?)
|
| - if test "$GCC" = yes; then
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
|
| + if test yes = "$GCC"; then
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
|
| else
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
|
| fi
|
| @@ -5505,10 +5951,10 @@ _LT_EOF
|
| ;;
|
|
|
| sunos4*)
|
| - if test "x$host_vendor" = xsequent; then
|
| + if test sequent = "$host_vendor"; then
|
| # Use $CC to link under sequent, because it throws in some extra .o
|
| # files that make .init and .fini sections work.
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
|
| else
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
|
| fi
|
| @@ -5557,43 +6003,43 @@ _LT_EOF
|
| ;;
|
|
|
| sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
|
| - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
|
| + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| runpath_var='LD_RUN_PATH'
|
|
|
| - if test "$GCC" = yes; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + if test yes = "$GCC"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| else
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| fi
|
| ;;
|
|
|
| sysv5* | sco3.2v5* | sco5v6*)
|
| - # Note: We can NOT use -z defs as we might desire, because we do not
|
| + # Note: We CANNOT use -z defs as we might desire, because we do not
|
| # link with -lc, and that would cause any symbols used from libc to
|
| # always be unresolved, which means just about no library would
|
| # ever link correctly. If we're not using GNU ld we use -z text
|
| # though, which does catch some bad symbols but isn't as heavy-handed
|
| # as -z defs.
|
| - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
|
| - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
|
| + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
|
| + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
|
| runpath_var='LD_RUN_PATH'
|
|
|
| - if test "$GCC" = yes; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + if test yes = "$GCC"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| else
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| fi
|
| ;;
|
|
|
| @@ -5608,17 +6054,17 @@ _LT_EOF
|
| ;;
|
| esac
|
|
|
| - if test x$host_vendor = xsni; then
|
| + if test sni = "$host_vendor"; then
|
| case $host in
|
| sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
|
| ;;
|
| esac
|
| fi
|
| fi
|
| ])
|
| AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
|
| -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
|
| +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
|
|
|
| _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
|
|
|
| @@ -5635,7 +6081,7 @@ x|xyes)
|
| # Assume -lc should be added
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
|
|
|
| - if test "$enable_shared" = yes && test "$GCC" = yes; then
|
| + if test yes,yes = "$GCC,$enable_shared"; then
|
| case $_LT_TAGVAR(archive_cmds, $1) in
|
| *'~'*)
|
| # FIXME: we may have to deal with multi-command sequences.
|
| @@ -5715,12 +6161,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
|
| _LT_TAGDECL([], [hardcode_libdir_separator], [1],
|
| [Whether we need a single "-rpath" flag with a separated argument])
|
| _LT_TAGDECL([], [hardcode_direct], [0],
|
| - [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])
|
| _LT_TAGDECL([], [hardcode_direct_absolute], [0],
|
| - [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])
|
| _LT_TAGDECL([], [hardcode_minus_L], [0],
|
| [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
|
| @@ -5761,10 +6207,10 @@ dnl [Compiler flag to generate thread safe objects])
|
| # ------------------------
|
| # Ensure that the configuration variables for a C compiler are suitably
|
| # defined. These variables are subsequently used by _LT_CONFIG to write
|
| -# the compiler configuration to `libtool'.
|
| +# the compiler configuration to 'libtool'.
|
| m4_defun([_LT_LANG_C_CONFIG],
|
| [m4_require([_LT_DECL_EGREP])dnl
|
| -lt_save_CC="$CC"
|
| +lt_save_CC=$CC
|
| AC_LANG_PUSH(C)
|
|
|
| # Source file extension for C test sources.
|
| @@ -5800,18 +6246,18 @@ if test -n "$compiler"; then
|
| LT_SYS_DLOPEN_SELF
|
| _LT_CMD_STRIPLIB
|
|
|
| - # Report which library types will actually be built
|
| + # Report what library types will actually be built
|
| AC_MSG_CHECKING([if libtool supports shared libraries])
|
| AC_MSG_RESULT([$can_build_shared])
|
|
|
| AC_MSG_CHECKING([whether to build shared libraries])
|
| - test "$can_build_shared" = "no" && enable_shared=no
|
| + test no = "$can_build_shared" && enable_shared=no
|
|
|
| # On AIX, shared libraries and static libraries use the same namespace, and
|
| # are all built from PIC.
|
| case $host_os in
|
| aix3*)
|
| - test "$enable_shared" = yes && enable_static=no
|
| + test yes = "$enable_shared" && enable_static=no
|
| if test -n "$RANLIB"; then
|
| archive_cmds="$archive_cmds~\$RANLIB \$lib"
|
| postinstall_cmds='$RANLIB $lib'
|
| @@ -5819,8 +6265,12 @@ if test -n "$compiler"; then
|
| ;;
|
|
|
| aix[[4-9]]*)
|
| - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
| - test "$enable_shared" = yes && enable_static=no
|
| + if test ia64 != "$host_cpu"; then
|
| + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
|
| + yes,aix,yes) ;; # shared object as lib.so file only
|
| + yes,svr4,*) ;; # shared object as lib.so archive member only
|
| + yes,*) enable_static=no ;; # shared object in lib.a archive as well
|
| + esac
|
| fi
|
| ;;
|
| esac
|
| @@ -5828,13 +6278,13 @@ if test -n "$compiler"; then
|
|
|
| AC_MSG_CHECKING([whether to build static libraries])
|
| # Make sure either enable_shared or enable_static is yes.
|
| - test "$enable_shared" = yes || enable_static=yes
|
| + test yes = "$enable_shared" || enable_static=yes
|
| AC_MSG_RESULT([$enable_static])
|
|
|
| _LT_CONFIG($1)
|
| fi
|
| AC_LANG_POP
|
| -CC="$lt_save_CC"
|
| +CC=$lt_save_CC
|
| ])# _LT_LANG_C_CONFIG
|
|
|
|
|
| @@ -5842,14 +6292,14 @@ CC="$lt_save_CC"
|
| # --------------------------
|
| # Ensure that the configuration variables for a C++ compiler are suitably
|
| # defined. These variables are subsequently used by _LT_CONFIG to write
|
| -# the compiler configuration to `libtool'.
|
| +# the compiler configuration to 'libtool'.
|
| m4_defun([_LT_LANG_CXX_CONFIG],
|
| [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
| m4_require([_LT_DECL_EGREP])dnl
|
| m4_require([_LT_PATH_MANIFEST_TOOL])dnl
|
| -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
|
| - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
|
| - (test "X$CXX" != "Xg++"))) ; then
|
| +if test -n "$CXX" && ( test no != "$CXX" &&
|
| + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
|
| + (test g++ != "$CXX"))); then
|
| AC_PROG_CXXCPP
|
| else
|
| _lt_caught_CXX_error=yes
|
| @@ -5891,7 +6341,7 @@ _LT_TAGVAR(objext, $1)=$objext
|
| # the CXX 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 "$_lt_caught_CXX_error" != yes; then
|
| +if test yes != "$_lt_caught_CXX_error"; then
|
| # Code to be used in simple compile tests
|
| lt_simple_compile_test_code="int some_variable = 0;"
|
|
|
| @@ -5933,35 +6383,35 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| if test -n "$compiler"; then
|
| # We don't want -fno-exception when compiling C++ code, so set the
|
| # no_builtin_flag separately
|
| - if test "$GXX" = yes; then
|
| + if test yes = "$GXX"; then
|
| _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
|
| else
|
| _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
|
| fi
|
|
|
| - if test "$GXX" = yes; then
|
| + if test yes = "$GXX"; then
|
| # Set up default GNU C++ configuration
|
|
|
| LT_PATH_LD
|
|
|
| # Check if GNU C++ uses GNU ld as the underlying linker, since the
|
| # archiving commands below assume that GNU ld is being used.
|
| - if test "$with_gnu_ld" = yes; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
| + if test yes = "$with_gnu_ld"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
|
|
|
| # If archive_cmds runs LD, not CC, wlarc should be empty
|
| # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
|
| # investigate it a little bit more. (MM)
|
| - wlarc='${wl}'
|
| + wlarc='$wl'
|
|
|
| # ancient GNU ld didn't support --whole-archive et. al.
|
| if eval "`$CC -print-prog-name=ld` --help 2>&1" |
|
| $GREP 'no-whole-archive' > /dev/null; then
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
|
| else
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)=
|
| fi
|
| @@ -5997,18 +6447,30 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| ;;
|
| aix[[4-9]]*)
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # On IA64, the linker does run time linking by default, so we don't
|
| # have to do anything special.
|
| aix_use_runtimelinking=no
|
| exp_sym_flag='-Bexport'
|
| - no_entry_flag=""
|
| + no_entry_flag=
|
| else
|
| aix_use_runtimelinking=no
|
|
|
| # Test if we are trying to use run time linking or normal
|
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
| - # need to do runtime linking.
|
| + # have runtime linking enabled, and use it for executables.
|
| + # For shared libraries, we enable/disable runtime linking
|
| + # depending on the kind of the shared library created -
|
| + # when "with_aix_soname,aix_use_runtimelinking" is:
|
| + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
|
| + # "aix,yes" lib.so shared, rtl:yes, for executables
|
| + # lib.a static archive
|
| + # "both,no" lib.so.V(shr.o) shared, rtl:yes
|
| + # lib.a(lib.so.V) shared, rtl:no, for executables
|
| + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
|
| + # lib.a(lib.so.V) shared, rtl:no
|
| + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
|
| + # lib.a static archive
|
| case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
|
| for ld_flag in $LDFLAGS; do
|
| case $ld_flag in
|
| @@ -6018,6 +6480,13 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| ;;
|
| esac
|
| 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
|
|
|
| @@ -6036,13 +6505,21 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
|
| + _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
|
| + case $with_aix_soname,$aix_use_runtimelinking in
|
| + aix,*) ;; # no import file
|
| + svr4,* | *,yes) # use import file
|
| + # The Import File defines what to hardcode.
|
| + _LT_TAGVAR(hardcode_direct, $1)=no
|
| + _LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
| + ;;
|
| + esac
|
|
|
| - if test "$GXX" = yes; then
|
| + if test yes = "$GXX"; 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
|
| @@ -6060,64 +6537,84 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| fi
|
| esac
|
| shared_flag='-shared'
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| - shared_flag="$shared_flag "'${wl}-G'
|
| + if test yes = "$aix_use_runtimelinking"; then
|
| + shared_flag=$shared_flag' $wl-G'
|
| fi
|
| + # Need to ensure runtime linking is disabled for the traditional
|
| + # shared library, or the linker may eventually find shared libraries
|
| + # /with/ Import File - we do not want to mix them.
|
| + shared_flag_aix='-shared'
|
| + shared_flag_svr4='-shared $wl-G'
|
| else
|
| # not using gcc
|
| - if test "$host_cpu" = ia64; then
|
| + if test ia64 = "$host_cpu"; then
|
| # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
|
| # chokes on -Wl,-G. The following line is correct:
|
| shared_flag='-G'
|
| else
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| - shared_flag='${wl}-G'
|
| + if test yes = "$aix_use_runtimelinking"; then
|
| + shared_flag='$wl-G'
|
| else
|
| - shared_flag='${wl}-bM:SRE'
|
| + shared_flag='$wl-bM:SRE'
|
| fi
|
| + shared_flag_aix='$wl-bM:SRE'
|
| + shared_flag_svr4='$wl-G'
|
| fi
|
| fi
|
|
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$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.
|
| _LT_TAGVAR(always_export_symbols, $1)=yes
|
| - if test "$aix_use_runtimelinking" = yes; then
|
| + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
|
| # Warning - without using the other runtime loading flags (-brtl),
|
| # -berok will link without error, but may produce a broken library.
|
| - _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
|
| + # The "-G" linker flag allows undefined symbols.
|
| + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
|
| # Determine the default libpath from the value encoded in an empty
|
| # executable.
|
| _LT_SYS_MODULE_PATH_AIX([$1])
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
|
|
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$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"
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
|
| else
|
| - if test "$host_cpu" = ia64; then
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
|
| + if test ia64 = "$host_cpu"; then
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
|
| _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)="\$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"
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="\$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.
|
| _LT_SYS_MODULE_PATH_AIX([$1])
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$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.
|
| - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
|
| - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
|
| - if test "$with_gnu_ld" = yes; then
|
| + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
|
| + if test yes = "$with_gnu_ld"; then
|
| # We only use this code for GNU lds that support --whole-archive.
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
|
| else
|
| # Exported symbols can be pulled into shared objects from archives
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
|
| fi
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
|
| - # This is similar to how AIX traditionally builds its shared
|
| - # libraries.
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)="\$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'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$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. Need -bnortl late, we may have -brtl in LDFLAGS.
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$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
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$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
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
|
| + fi
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
|
| fi
|
| fi
|
| ;;
|
| @@ -6127,7 +6624,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
| # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
| # support --undefined. This deserves some investigation. FIXME
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| fi
|
| @@ -6155,57 +6652,58 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # Tell ltmain to make .lib files, not .a files.
|
| libext=lib
|
| # Tell ltmain to make .dll files, not .so files.
|
| - shrext_cmds=".dll"
|
| + shrext_cmds=.dll
|
| # FIXME: Setting linknames here is a bad hack.
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
|
| - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
|
| - else
|
| - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
|
| - fi~
|
| - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
|
| - linknames='
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$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, $1)='true'
|
| _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
| # Don't use ranlib
|
| _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
|
| _LT_TAGVAR(postlink_cmds, $1)='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~
|
| - func_to_tool_file "$lt_outputfile"~
|
| - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
|
| - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
|
| - $RM "$lt_outputfile.manifest";
|
| - fi'
|
| + lt_tool_outputfile="@TOOL_OUTPUT@"~
|
| + case $lt_outputfile in
|
| + *.exe|*.EXE) ;;
|
| + *)
|
| + lt_outputfile=$lt_outputfile.exe
|
| + lt_tool_outputfile=$lt_tool_outputfile.exe
|
| + ;;
|
| + esac~
|
| + func_to_tool_file "$lt_outputfile"~
|
| + 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'
|
| ;;
|
| *)
|
| # g++
|
| # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
|
| # as there is no search path for DLLs.
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
|
| _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
| _LT_TAGVAR(always_export_symbols, $1)=no
|
| _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
| if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $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...
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='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 -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $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...
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$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 -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
|
| else
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| fi
|
| @@ -6216,6 +6714,34 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| _LT_DARWIN_LINKER_FEATURES($1)
|
| ;;
|
|
|
| + os2*)
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
| + _LT_TAGVAR(hardcode_minus_L, $1)=yes
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
| + shrext_cmds=.dll
|
| + _LT_TAGVAR(archive_cmds, $1)='$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'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$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'
|
| + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
|
| + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
| + ;;
|
| +
|
| dgux*)
|
| case $cc_basename in
|
| ec++*)
|
| @@ -6251,14 +6777,14 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| ;;
|
|
|
| haiku*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| ;;
|
|
|
| hpux9*)
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
|
| _LT_TAGVAR(hardcode_direct, $1)=yes
|
| _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
|
| # but as the default
|
| @@ -6270,7 +6796,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| ;;
|
| aCC*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
|
| # Commands to make compiler produce verbose output that lists
|
| # what "hidden" libraries, object files and flags are used when
|
| # linking a shared library.
|
| @@ -6279,11 +6805,11 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # explicitly linking system object files so we need to strip them
|
| # from the output so that they don't get included in the library
|
| # dependencies.
|
| - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
| + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
| ;;
|
| *)
|
| - if test "$GXX" = yes; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
|
| + if test yes = "$GXX"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
|
| else
|
| # FIXME: insert proper C++ library support
|
| _LT_TAGVAR(ld_shlibs, $1)=no
|
| @@ -6293,15 +6819,15 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| ;;
|
|
|
| hpux10*|hpux11*)
|
| - if test $with_gnu_ld = no; then
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
| + if test no = "$with_gnu_ld"; then
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
| case $host_cpu in
|
| hppa*64*|ia64*)
|
| ;;
|
| *)
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
|
| ;;
|
| esac
|
| fi
|
| @@ -6327,13 +6853,13 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| aCC*)
|
| case $host_cpu in
|
| hppa*64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| ;;
|
| ia64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| ;;
|
| *)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| ;;
|
| esac
|
| # Commands to make compiler produce verbose output that lists
|
| @@ -6344,20 +6870,20 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # explicitly linking system object files so we need to strip them
|
| # from the output so that they don't get included in the library
|
| # dependencies.
|
| - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
| + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
| ;;
|
| *)
|
| - if test "$GXX" = yes; then
|
| - if test $with_gnu_ld = no; then
|
| + if test yes = "$GXX"; then
|
| + if test no = "$with_gnu_ld"; then
|
| case $host_cpu in
|
| hppa*64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| ;;
|
| ia64*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| ;;
|
| *)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| ;;
|
| esac
|
| fi
|
| @@ -6372,22 +6898,22 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| interix[[3-9]]*)
|
| _LT_TAGVAR(hardcode_direct, $1)=no
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$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.
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='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'
|
| ;;
|
| irix5* | irix6*)
|
| case $cc_basename in
|
| CC*)
|
| # SGI C++
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
|
|
|
| # Archives containing C++ object files must be created using
|
| # "CC -ar", where "CC" is the IRIX C++ compiler. This is
|
| @@ -6396,17 +6922,17 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
|
| ;;
|
| *)
|
| - if test "$GXX" = yes; then
|
| - if test "$with_gnu_ld" = no; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
| + if test yes = "$GXX"; then
|
| + if test no = "$with_gnu_ld"; then
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $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
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
|
| fi
|
| fi
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| ;;
|
| esac
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
| _LT_TAGVAR(inherit_rpath, $1)=yes
|
| ;;
|
| @@ -6419,8 +6945,8 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # KCC will only create a shared library if the output file
|
| # ends with ".so" (or ".sl" for HP-UX), so rename the library
|
| # to its proper name (with version) after linking.
|
| - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
|
| # Commands to make compiler produce verbose output that lists
|
| # what "hidden" libraries, object files and flags are used when
|
| # linking a shared library.
|
| @@ -6429,10 +6955,10 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # explicitly linking system object files so we need to strip them
|
| # from the output so that they don't get included in the library
|
| # dependencies.
|
| - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
| + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
|
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
|
|
|
| # Archives containing C++ object files must be created using
|
| # "CC -Bstatic", where "CC" is the KAI C++ compiler.
|
| @@ -6446,59 +6972,59 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # earlier do not add the objects themselves.
|
| case `$CC -V 2>&1` in
|
| *"Version 7."*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| ;;
|
| *) # Version 8.0 or newer
|
| tmp_idyn=
|
| case $host_cpu in
|
| ia64*) tmp_idyn=' -i_dynamic';;
|
| esac
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| ;;
|
| esac
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
|
| ;;
|
| pgCC* | pgcpp*)
|
| # Portland Group C++ compiler
|
| case `$CC -V` in
|
| *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
|
| _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
|
| - rm -rf $tpldir~
|
| - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
| - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
| + rm -rf $tpldir~
|
| + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
| + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
| _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
|
| - rm -rf $tpldir~
|
| - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
| - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
| - $RANLIB $oldlib'
|
| + rm -rf $tpldir~
|
| + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
| + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
| + $RANLIB $oldlib'
|
| _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
|
| - rm -rf $tpldir~
|
| - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
| - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
| + rm -rf $tpldir~
|
| + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
| + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
|
| - rm -rf $tpldir~
|
| - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
| - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
| + rm -rf $tpldir~
|
| + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
| + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| ;;
|
| *) # Version 6 and above use weak symbols
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
| ;;
|
| esac
|
|
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$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'
|
| ;;
|
| cxx*)
|
| # Compaq C++
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
|
|
|
| runpath_var=LD_RUN_PATH
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
| @@ -6512,18 +7038,18 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # explicitly linking system object files so we need to strip them
|
| # from the output so that they don't get included in the library
|
| # dependencies.
|
| - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
|
| + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
|
| ;;
|
| xl* | mpixl* | bgxl*)
|
| # IBM XL 8.0 on PPC, with GNU ld
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
| - if test "x$supports_anon_versioning" = xyes; then
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
| + if test yes = "$supports_anon_versioning"; then
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
|
| - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
| - echo "local: *; };" >> $output_objdir/$libname.ver~
|
| - $CC -qmkshrobj $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 -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
|
| fi
|
| ;;
|
| *)
|
| @@ -6531,10 +7057,10 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| *Sun\ C*)
|
| # Sun C++ 5.9
|
| _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$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'
|
| _LT_TAGVAR(compiler_needs_object, $1)=yes
|
|
|
| # Not sure whether something based on
|
| @@ -6592,22 +7118,17 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| _LT_TAGVAR(ld_shlibs, $1)=yes
|
| ;;
|
|
|
| - openbsd2*)
|
| - # C++ shared libraries are fairly broken
|
| - _LT_TAGVAR(ld_shlibs, $1)=no
|
| - ;;
|
| -
|
| - openbsd*)
|
| + openbsd* | bitrig*)
|
| if test -f /usr/libexec/ld.so; then
|
| _LT_TAGVAR(hardcode_direct, $1)=yes
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
| _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
|
| fi
|
| output_verbose_link_cmd=func_echo_all
|
| else
|
| @@ -6623,9 +7144,9 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # KCC will only create a shared library if the output file
|
| # ends with ".so" (or ".sl" for HP-UX), so rename the library
|
| # to its proper name (with version) after linking.
|
| - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
|
|
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
| # Archives containing C++ object files must be created using
|
| @@ -6643,17 +7164,17 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| cxx*)
|
| case $host in
|
| osf3*)
|
| - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| ;;
|
| *)
|
| _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
|
| - echo "-hidden">> $lib.exp~
|
| - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
|
| - $RM $lib.exp'
|
| + echo "-hidden">> $lib.exp~
|
| + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
|
| + $RM $lib.exp'
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
| ;;
|
| esac
|
| @@ -6668,21 +7189,21 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # explicitly linking system object files so we need to strip them
|
| # from the output so that they don't get included in the library
|
| # dependencies.
|
| - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
| + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
| ;;
|
| *)
|
| - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
|
| - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
| + if test yes,no = "$GXX,$with_gnu_ld"; then
|
| + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
|
| case $host in
|
| osf3*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $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'
|
| ;;
|
| *)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $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'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $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'
|
| ;;
|
| esac
|
|
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
| # Commands to make compiler produce verbose output that lists
|
| @@ -6728,9 +7249,9 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| # Sun C++ 4.2, 5.x and Centerline C++
|
| _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
|
| _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
| - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
| + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
|
|
| _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| @@ -6738,7 +7259,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
|
| *)
|
| # The compiler driver will combine and reorder linker options,
|
| - # but understands `-z linker_flag'.
|
| + # but understands '-z linker_flag'.
|
| # Supported since Solaris 2.6 (maybe 2.5.1?)
|
| _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
|
| ;;
|
| @@ -6755,30 +7276,30 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| ;;
|
| gcx*)
|
| # Green Hills C++ Compiler
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
|
|
|
| # The C++ compiler must be used to create the archive.
|
| _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
|
| ;;
|
| *)
|
| # GNU C++ compiler with Solaris linker
|
| - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
|
| - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
|
| + if test yes,no = "$GXX,$with_gnu_ld"; then
|
| + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
|
| if $CC --version | $GREP -v '^2\.7' > /dev/null; then
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
| - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
| + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
|
|
| # Commands to make compiler produce verbose output that lists
|
| # what "hidden" libraries, object files and flags are used when
|
| # linking a shared library.
|
| output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
| else
|
| - # g++ 2.7 appears to require `-G' NOT `-shared' on this
|
| + # g++ 2.7 appears to require '-G' NOT '-shared' on this
|
| # platform.
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
|
| _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
|
| - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
| + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
|
|
|
| # Commands to make compiler produce verbose output that lists
|
| # what "hidden" libraries, object files and flags are used when
|
| @@ -6786,11 +7307,11 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
| fi
|
|
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
|
| case $host_os in
|
| solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
|
| *)
|
| - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
|
| + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
|
| ;;
|
| esac
|
| fi
|
| @@ -6799,52 +7320,52 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| ;;
|
|
|
| sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
|
| - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
|
| + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| runpath_var='LD_RUN_PATH'
|
|
|
| case $cc_basename in
|
| CC*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| *)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| esac
|
| ;;
|
|
|
| sysv5* | sco3.2v5* | sco5v6*)
|
| - # Note: We can NOT use -z defs as we might desire, because we do not
|
| + # Note: We CANNOT use -z defs as we might desire, because we do not
|
| # link with -lc, and that would cause any symbols used from libc to
|
| # always be unresolved, which means just about no library would
|
| # ever link correctly. If we're not using GNU ld we use -z text
|
| # though, which does catch some bad symbols but isn't as heavy-handed
|
| # as -z defs.
|
| - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
|
| - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
|
| + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
|
| + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
|
| _LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
| _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
| - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
|
| + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
|
| _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
|
| + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
|
| runpath_var='LD_RUN_PATH'
|
|
|
| case $cc_basename in
|
| CC*)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
|
| - '"$_LT_TAGVAR(old_archive_cmds, $1)"
|
| + '"$_LT_TAGVAR(old_archive_cmds, $1)"
|
| _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
|
| - '"$_LT_TAGVAR(reload_cmds, $1)"
|
| + '"$_LT_TAGVAR(reload_cmds, $1)"
|
| ;;
|
| *)
|
| - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
|
| ;;
|
| esac
|
| ;;
|
| @@ -6875,10 +7396,10 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| esac
|
|
|
| AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
|
| - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
|
| + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
|
|
|
| - _LT_TAGVAR(GCC, $1)="$GXX"
|
| - _LT_TAGVAR(LD, $1)="$LD"
|
| + _LT_TAGVAR(GCC, $1)=$GXX
|
| + _LT_TAGVAR(LD, $1)=$LD
|
|
|
| ## CAVEAT EMPTOR:
|
| ## There is no encapsulation within the following macros, do not change
|
| @@ -6905,7 +7426,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
| lt_cv_path_LD=$lt_save_path_LD
|
| lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
|
| lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
|
| -fi # test "$_lt_caught_CXX_error" != yes
|
| +fi # test yes != "$_lt_caught_CXX_error"
|
|
|
| AC_LANG_POP
|
| ])# _LT_LANG_CXX_CONFIG
|
| @@ -6927,13 +7448,14 @@ AC_REQUIRE([_LT_DECL_SED])
|
| AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
|
| 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}\$%%"`;;
|
| + case @S|@2 in
|
| + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
|
| + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
|
| esac
|
| } # func_stripname_cnf
|
| ])# _LT_FUNC_STRIPNAME_CNF
|
|
|
| +
|
| # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
|
| # ---------------------------------
|
| # Figure out "hidden" library dependencies from verbose
|
| @@ -7017,13 +7539,13 @@ if AC_TRY_EVAL(ac_compile); then
|
| pre_test_object_deps_done=no
|
|
|
| for p in `eval "$output_verbose_link_cmd"`; do
|
| - case ${prev}${p} in
|
| + case $prev$p in
|
|
|
| -L* | -R* | -l*)
|
| # Some compilers place space between "-{L,R}" and the path.
|
| # Remove the space.
|
| - if test $p = "-L" ||
|
| - test $p = "-R"; then
|
| + if test x-L = "$p" ||
|
| + test x-R = "$p"; then
|
| prev=$p
|
| continue
|
| fi
|
| @@ -7039,16 +7561,16 @@ if AC_TRY_EVAL(ac_compile); then
|
| case $p in
|
| =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
|
| esac
|
| - if test "$pre_test_object_deps_done" = no; then
|
| - case ${prev} in
|
| + if test no = "$pre_test_object_deps_done"; then
|
| + case $prev 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 "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
|
| - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
|
| + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
|
| else
|
| - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
|
| + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
|
| fi
|
| ;;
|
| # The "-l" case would never come before the object being
|
| @@ -7056,9 +7578,9 @@ if AC_TRY_EVAL(ac_compile); then
|
| esac
|
| else
|
| if test -z "$_LT_TAGVAR(postdeps, $1)"; then
|
| - _LT_TAGVAR(postdeps, $1)="${prev}${p}"
|
| + _LT_TAGVAR(postdeps, $1)=$prev$p
|
| else
|
| - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
|
| + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
|
| fi
|
| fi
|
| prev=
|
| @@ -7073,15 +7595,15 @@ if AC_TRY_EVAL(ac_compile); then
|
| continue
|
| fi
|
|
|
| - if test "$pre_test_object_deps_done" = no; then
|
| + if test no = "$pre_test_object_deps_done"; then
|
| if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
|
| - _LT_TAGVAR(predep_objects, $1)="$p"
|
| + _LT_TAGVAR(predep_objects, $1)=$p
|
| else
|
| _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
|
| fi
|
| else
|
| if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
|
| - _LT_TAGVAR(postdep_objects, $1)="$p"
|
| + _LT_TAGVAR(postdep_objects, $1)=$p
|
| else
|
| _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
|
| fi
|
| @@ -7112,51 +7634,6 @@ interix[[3-9]]*)
|
| _LT_TAGVAR(postdep_objects,$1)=
|
| _LT_TAGVAR(postdeps,$1)=
|
| ;;
|
| -
|
| -linux*)
|
| - case `$CC -V 2>&1 | sed 5q` in
|
| - *Sun\ C*)
|
| - # Sun C++ 5.9
|
| -
|
| - # The more standards-conforming stlport4 library is
|
| - # incompatible with the Cstd library. Avoid specifying
|
| - # it if it's in CXXFLAGS. Ignore libCrun as
|
| - # -library=stlport4 depends on it.
|
| - case " $CXX $CXXFLAGS " in
|
| - *" -library=stlport4 "*)
|
| - solaris_use_stlport4=yes
|
| - ;;
|
| - esac
|
| -
|
| - if test "$solaris_use_stlport4" != yes; then
|
| - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
|
| - fi
|
| - ;;
|
| - esac
|
| - ;;
|
| -
|
| -solaris*)
|
| - case $cc_basename in
|
| - CC* | sunCC*)
|
| - # The more standards-conforming stlport4 library is
|
| - # incompatible with the Cstd library. Avoid specifying
|
| - # it if it's in CXXFLAGS. Ignore libCrun as
|
| - # -library=stlport4 depends on it.
|
| - case " $CXX $CXXFLAGS " in
|
| - *" -library=stlport4 "*)
|
| - solaris_use_stlport4=yes
|
| - ;;
|
| - esac
|
| -
|
| - # Adding this requires a known-good setup of shared libraries for
|
| - # Sun compiler versions before 5.6, else PIC objects from an old
|
| - # archive will be linked into the output, leading to subtle bugs.
|
| - if test "$solaris_use_stlport4" != yes; then
|
| - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
|
| - fi
|
| - ;;
|
| - esac
|
| - ;;
|
| esac
|
| ])
|
|
|
| @@ -7165,7 +7642,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
|
| esac
|
| _LT_TAGVAR(compiler_lib_search_dirs, $1)=
|
| if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
|
| - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
|
| + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
|
| fi
|
| _LT_TAGDECL([], [compiler_lib_search_dirs], [1],
|
| [The directories searched by this compiler when creating a shared library])
|
| @@ -7185,10 +7662,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
|
| # --------------------------
|
| # Ensure that the configuration variables for a Fortran 77 compiler are
|
| # suitably defined. These variables are subsequently used by _LT_CONFIG
|
| -# to write the compiler configuration to `libtool'.
|
| +# to write the compiler configuration to 'libtool'.
|
| m4_defun([_LT_LANG_F77_CONFIG],
|
| [AC_LANG_PUSH(Fortran 77)
|
| -if test -z "$F77" || test "X$F77" = "Xno"; then
|
| +if test -z "$F77" || test no = "$F77"; then
|
| _lt_disable_F77=yes
|
| fi
|
|
|
| @@ -7225,7 +7702,7 @@ _LT_TAGVAR(objext, $1)=$objext
|
| # the F77 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 "$_lt_disable_F77" != yes; then
|
| +if test yes != "$_lt_disable_F77"; then
|
| # Code to be used in simple compile tests
|
| lt_simple_compile_test_code="\
|
| subroutine t
|
| @@ -7247,7 +7724,7 @@ if test "$_lt_disable_F77" != yes; then
|
| _LT_LINKER_BOILERPLATE
|
|
|
| # 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=${F77-"f77"}
|
| @@ -7261,21 +7738,25 @@ if test "$_lt_disable_F77" != yes; then
|
| AC_MSG_RESULT([$can_build_shared])
|
|
|
| AC_MSG_CHECKING([whether to build shared libraries])
|
| - test "$can_build_shared" = "no" && enable_shared=no
|
| + test no = "$can_build_shared" && enable_shared=no
|
|
|
| # On AIX, shared libraries and static libraries use the same namespace, and
|
| # are all built from PIC.
|
| case $host_os in
|
| aix3*)
|
| - test "$enable_shared" = yes && enable_static=no
|
| + test yes = "$enable_shared" && enable_static=no
|
| if test -n "$RANLIB"; then
|
| archive_cmds="$archive_cmds~\$RANLIB \$lib"
|
| postinstall_cmds='$RANLIB $lib'
|
| fi
|
| ;;
|
| aix[[4-9]]*)
|
| - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
| - test "$enable_shared" = yes && enable_static=no
|
| + if test ia64 != "$host_cpu"; then
|
| + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
|
| + yes,aix,yes) ;; # shared object as lib.so file only
|
| + yes,svr4,*) ;; # shared object as lib.so archive member only
|
| + yes,*) enable_static=no ;; # shared object in lib.a archive as well
|
| + esac
|
| fi
|
| ;;
|
| esac
|
| @@ -7283,11 +7764,11 @@ if test "$_lt_disable_F77" != yes; then
|
|
|
| AC_MSG_CHECKING([whether to build static libraries])
|
| # Make sure either enable_shared or enable_static is yes.
|
| - test "$enable_shared" = yes || enable_static=yes
|
| + test yes = "$enable_shared" || enable_static=yes
|
| AC_MSG_RESULT([$enable_static])
|
|
|
| - _LT_TAGVAR(GCC, $1)="$G77"
|
| - _LT_TAGVAR(LD, $1)="$LD"
|
| + _LT_TAGVAR(GCC, $1)=$G77
|
| + _LT_TAGVAR(LD, $1)=$LD
|
|
|
| ## CAVEAT EMPTOR:
|
| ## There is no encapsulation within the following macros, do not change
|
| @@ -7304,9 +7785,9 @@ if test "$_lt_disable_F77" != yes; then
|
| fi # test -n "$compiler"
|
|
|
| GCC=$lt_save_GCC
|
| - CC="$lt_save_CC"
|
| - CFLAGS="$lt_save_CFLAGS"
|
| -fi # test "$_lt_disable_F77" != yes
|
| + CC=$lt_save_CC
|
| + CFLAGS=$lt_save_CFLAGS
|
| +fi # test yes != "$_lt_disable_F77"
|
|
|
| AC_LANG_POP
|
| ])# _LT_LANG_F77_CONFIG
|
| @@ -7316,11 +7797,11 @@ AC_LANG_POP
|
| # -------------------------
|
| # Ensure that the configuration variables for a Fortran compiler are
|
| # suitably defined. These variables are subsequently used by _LT_CONFIG
|
| -# to write the compiler configuration to `libtool'.
|
| +# to write the compiler configuration to 'libtool'.
|
| m4_defun([_LT_LANG_FC_CONFIG],
|
| [AC_LANG_PUSH(Fortran)
|
|
|
| -if test -z "$FC" || test "X$FC" = "Xno"; then
|
| +if test -z "$FC" || test no = "$FC"; then
|
| _lt_disable_FC=yes
|
| fi
|
|
|
| @@ -7357,7 +7838,7 @@ _LT_TAGVAR(objext, $1)=$objext
|
| # 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 "$_lt_disable_FC" != yes; then
|
| +if test yes != "$_lt_disable_FC"; then
|
| # Code to be used in simple compile tests
|
| lt_simple_compile_test_code="\
|
| subroutine t
|
| @@ -7379,7 +7860,7 @@ if test "$_lt_disable_FC" != yes; then
|
| _LT_LINKER_BOILERPLATE
|
|
|
| # 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"}
|
| @@ -7395,21 +7876,25 @@ if test "$_lt_disable_FC" != yes; then
|
| AC_MSG_RESULT([$can_build_shared])
|
|
|
| AC_MSG_CHECKING([whether to build shared libraries])
|
| - test "$can_build_shared" = "no" && enable_shared=no
|
| + test no = "$can_build_shared" && enable_shared=no
|
|
|
| # On AIX, shared libraries and static libraries use the same namespace, and
|
| # are all built from PIC.
|
| case $host_os in
|
| aix3*)
|
| - test "$enable_shared" = yes && enable_static=no
|
| + test yes = "$enable_shared" && enable_static=no
|
| if test -n "$RANLIB"; then
|
| archive_cmds="$archive_cmds~\$RANLIB \$lib"
|
| postinstall_cmds='$RANLIB $lib'
|
| fi
|
| ;;
|
| aix[[4-9]]*)
|
| - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
| - test "$enable_shared" = yes && enable_static=no
|
| + if test ia64 != "$host_cpu"; then
|
| + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
|
| + yes,aix,yes) ;; # shared object as lib.so file only
|
| + yes,svr4,*) ;; # shared object as lib.so archive member only
|
| + yes,*) enable_static=no ;; # shared object in lib.a archive as well
|
| + esac
|
| fi
|
| ;;
|
| esac
|
| @@ -7417,11 +7902,11 @@ if test "$_lt_disable_FC" != yes; then
|
|
|
| AC_MSG_CHECKING([whether to build static libraries])
|
| # Make sure either enable_shared or enable_static is yes.
|
| - test "$enable_shared" = yes || enable_static=yes
|
| + test yes = "$enable_shared" || enable_static=yes
|
| AC_MSG_RESULT([$enable_static])
|
|
|
| - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
|
| - _LT_TAGVAR(LD, $1)="$LD"
|
| + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
|
| + _LT_TAGVAR(LD, $1)=$LD
|
|
|
| ## CAVEAT EMPTOR:
|
| ## There is no encapsulation within the following macros, do not change
|
| @@ -7441,7 +7926,7 @@ if test "$_lt_disable_FC" != yes; then
|
| GCC=$lt_save_GCC
|
| CC=$lt_save_CC
|
| CFLAGS=$lt_save_CFLAGS
|
| -fi # test "$_lt_disable_FC" != yes
|
| +fi # test yes != "$_lt_disable_FC"
|
|
|
| AC_LANG_POP
|
| ])# _LT_LANG_FC_CONFIG
|
| @@ -7451,7 +7936,7 @@ AC_LANG_POP
|
| # --------------------------
|
| # Ensure that the configuration variables for the GNU Java Compiler compiler
|
| # are suitably defined. These variables are subsequently used by _LT_CONFIG
|
| -# to write the compiler configuration to `libtool'.
|
| +# to write the compiler configuration to 'libtool'.
|
| m4_defun([_LT_LANG_GCJ_CONFIG],
|
| [AC_REQUIRE([LT_PROG_GCJ])dnl
|
| AC_LANG_SAVE
|
| @@ -7485,7 +7970,7 @@ CC=${GCJ-"gcj"}
|
| CFLAGS=$GCJFLAGS
|
| compiler=$CC
|
| _LT_TAGVAR(compiler, $1)=$CC
|
| -_LT_TAGVAR(LD, $1)="$LD"
|
| +_LT_TAGVAR(LD, $1)=$LD
|
| _LT_CC_BASENAME([$compiler])
|
|
|
| # GCJ did not exist at the time GCC didn't implicitly link libc in.
|
| @@ -7518,7 +8003,7 @@ CFLAGS=$lt_save_CFLAGS
|
| # --------------------------
|
| # Ensure that the configuration variables for the GNU Go compiler
|
| # are suitably defined. These variables are subsequently used by _LT_CONFIG
|
| -# to write the compiler configuration to `libtool'.
|
| +# to write the compiler configuration to 'libtool'.
|
| m4_defun([_LT_LANG_GO_CONFIG],
|
| [AC_REQUIRE([LT_PROG_GO])dnl
|
| AC_LANG_SAVE
|
| @@ -7552,7 +8037,7 @@ CC=${GOC-"gccgo"}
|
| CFLAGS=$GOFLAGS
|
| compiler=$CC
|
| _LT_TAGVAR(compiler, $1)=$CC
|
| -_LT_TAGVAR(LD, $1)="$LD"
|
| +_LT_TAGVAR(LD, $1)=$LD
|
| _LT_CC_BASENAME([$compiler])
|
|
|
| # Go did not exist at the time GCC didn't implicitly link libc in.
|
| @@ -7585,7 +8070,7 @@ CFLAGS=$lt_save_CFLAGS
|
| # -------------------------
|
| # Ensure that the configuration variables for the Windows resource compiler
|
| # are suitably defined. These variables are subsequently used by _LT_CONFIG
|
| -# to write the compiler configuration to `libtool'.
|
| +# to write the compiler configuration to 'libtool'.
|
| m4_defun([_LT_LANG_RC_CONFIG],
|
| [AC_REQUIRE([LT_PROG_RC])dnl
|
| AC_LANG_SAVE
|
| @@ -7601,7 +8086,7 @@ _LT_TAGVAR(objext, $1)=$objext
|
| lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
|
|
|
| # Code to be used in simple link tests
|
| -lt_simple_link_test_code="$lt_simple_compile_test_code"
|
| +lt_simple_link_test_code=$lt_simple_compile_test_code
|
|
|
| # ltmain only uses $CC for tagged configurations so make sure $CC is set.
|
| _LT_TAG_COMPILER
|
| @@ -7611,7 +8096,7 @@ _LT_COMPILER_BOILERPLATE
|
| _LT_LINKER_BOILERPLATE
|
|
|
| # Allow CC to be a program name with arguments.
|
| -lt_save_CC="$CC"
|
| +lt_save_CC=$CC
|
| lt_save_CFLAGS=$CFLAGS
|
| lt_save_GCC=$GCC
|
| GCC=
|
| @@ -7640,7 +8125,7 @@ AC_DEFUN([LT_PROG_GCJ],
|
| [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
|
| [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
|
| [AC_CHECK_TOOL(GCJ, gcj,)
|
| - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
|
| + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
|
| AC_SUBST(GCJFLAGS)])])[]dnl
|
| ])
|
|
|
| @@ -7749,7 +8234,7 @@ lt_ac_count=0
|
| # Add /usr/xpg4/bin/sed as it is typically found on Solaris
|
| # along with /bin/sed that truncates output.
|
| for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
|
| - test ! -f $lt_ac_sed && continue
|
| + test ! -f "$lt_ac_sed" && continue
|
| cat /dev/null > conftest.in
|
| lt_ac_count=0
|
| echo $ECHO_N "0123456789$ECHO_C" >conftest.in
|
| @@ -7766,9 +8251,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
|
| $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
|
| cmp -s conftest.out conftest.nl || break
|
| # 10000 chars as input seems more than enough
|
| - test $lt_ac_count -gt 10 && break
|
| + test 10 -lt "$lt_ac_count" && break
|
| lt_ac_count=`expr $lt_ac_count + 1`
|
| - if test $lt_ac_count -gt $lt_ac_max; then
|
| + if test "$lt_ac_count" -gt "$lt_ac_max"; then
|
| lt_ac_max=$lt_ac_count
|
| lt_cv_path_SED=$lt_ac_sed
|
| fi
|
| @@ -7792,27 +8277,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
|
| # Find out whether the shell is Bourne or XSI compatible,
|
| # or has some other useful features.
|
| m4_defun([_LT_CHECK_SHELL_FEATURES],
|
| -[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
|
| -# Try some XSI features
|
| -xsi_shell=no
|
| -( _lt_dummy="a/b/c"
|
| - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
|
| - = c,a/b,b/c, \
|
| - && eval 'test $(( 1 + 1 )) -eq 2 \
|
| - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
|
| - && xsi_shell=yes
|
| -AC_MSG_RESULT([$xsi_shell])
|
| -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
|
| -
|
| -AC_MSG_CHECKING([whether the shell understands "+="])
|
| -lt_shell_append=no
|
| -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
|
| - >/dev/null 2>&1 \
|
| - && lt_shell_append=yes
|
| -AC_MSG_RESULT([$lt_shell_append])
|
| -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
|
| -
|
| -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
| +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
| lt_unset=unset
|
| else
|
| lt_unset=false
|
| @@ -7836,102 +8301,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
|
| ])# _LT_CHECK_SHELL_FEATURES
|
|
|
|
|
| -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
|
| -# ------------------------------------------------------
|
| -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
|
| -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
|
| -m4_defun([_LT_PROG_FUNCTION_REPLACE],
|
| -[dnl {
|
| -sed -e '/^$1 ()$/,/^} # $1 /c\
|
| -$1 ()\
|
| -{\
|
| -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
|
| -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
|
| - && mv -f "$cfgfile.tmp" "$cfgfile" \
|
| - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
| -test 0 -eq $? || _lt_function_replace_fail=:
|
| -])
|
| -
|
| -
|
| -# _LT_PROG_REPLACE_SHELLFNS
|
| -# -------------------------
|
| -# Replace existing portable implementations of several shell functions with
|
| -# equivalent extended shell implementations where those features are available..
|
| -m4_defun([_LT_PROG_REPLACE_SHELLFNS],
|
| -[if test x"$xsi_shell" = xyes; then
|
| - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
|
| - case ${1} in
|
| - */*) func_dirname_result="${1%/*}${2}" ;;
|
| - * ) func_dirname_result="${3}" ;;
|
| - esac])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
|
| - func_basename_result="${1##*/}"])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
|
| - case ${1} in
|
| - */*) func_dirname_result="${1%/*}${2}" ;;
|
| - * ) func_dirname_result="${3}" ;;
|
| - esac
|
| - func_basename_result="${1##*/}"])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
|
| - # 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}"}])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
|
| - func_split_long_opt_name=${1%%=*}
|
| - func_split_long_opt_arg=${1#*=}])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
|
| - func_split_short_opt_arg=${1#??}
|
| - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
|
| - case ${1} in
|
| - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
|
| - *) func_lo2o_result=${1} ;;
|
| - esac])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
|
| -fi
|
| -
|
| -if test x"$lt_shell_append" = xyes; then
|
| - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
|
| -
|
| - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
|
| - func_quote_for_eval "${2}"
|
| -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
|
| - eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
|
| -
|
| - # Save a `func_append' function call where possible by direct use of '+='
|
| - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
|
| - && mv -f "$cfgfile.tmp" "$cfgfile" \
|
| - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
| - test 0 -eq $? || _lt_function_replace_fail=:
|
| -else
|
| - # Save a `func_append' function call even when '+=' is not available
|
| - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
|
| - && mv -f "$cfgfile.tmp" "$cfgfile" \
|
| - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
|
| - test 0 -eq $? || _lt_function_replace_fail=:
|
| -fi
|
| -
|
| -if test x"$_lt_function_replace_fail" = x":"; then
|
| - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
|
| -fi
|
| -])
|
| -
|
| # _LT_PATH_CONVERSION_FUNCTIONS
|
| # -----------------------------
|
| -# Determine which file name conversion functions should be used by
|
| +# Determine what file name conversion functions should be used by
|
| # func_to_host_file (and, implicitly, by func_to_host_path). These are needed
|
| # for certain cross-compile configurations and native mingw.
|
| m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
|
| @@ -7998,15 +8370,15 @@ _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
|
|
|
| # Helper functions for option handling. -*- Autoconf -*-
|
| #
|
| -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
|
| -# Inc.
|
| +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
|
| +# Foundation, Inc.
|
| # Written by Gary V. Vaughan, 2004
|
| #
|
| # 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 ltoptions.m4
|
| +# serial 8 ltoptions.m4
|
|
|
| # This is to help aclocal find these macros, as it can't see m4_define.
|
| AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
| @@ -8027,7 +8399,7 @@ m4_define([_LT_SET_OPTION],
|
| [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
|
| m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
|
| _LT_MANGLE_DEFUN([$1], [$2]),
|
| - [m4_warning([Unknown $1 option `$2'])])[]dnl
|
| + [m4_warning([Unknown $1 option '$2'])])[]dnl
|
| ])
|
|
|
|
|
| @@ -8073,13 +8445,15 @@ m4_if([$1],[LT_INIT],[
|
| dnl
|
| dnl If no reference was made to various pairs of opposing options, then
|
| dnl we run the default mode handler for the pair. For example, if neither
|
| - dnl `shared' nor `disable-shared' was passed, we enable building of shared
|
| + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
|
| dnl archives by default:
|
| _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
|
| _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
|
| _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
|
| _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
|
| - [_LT_ENABLE_FAST_INSTALL])
|
| + [_LT_ENABLE_FAST_INSTALL])
|
| + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
|
| + [_LT_WITH_AIX_SONAME([aix])])
|
| ])
|
| ])# _LT_SET_OPTIONS
|
|
|
| @@ -8107,7 +8481,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
|
| [_LT_SET_OPTION([LT_INIT], [dlopen])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you
|
| -put the `dlopen' option into LT_INIT's first parameter.])
|
| +put the 'dlopen' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
| @@ -8143,7 +8517,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
| _LT_SET_OPTION([LT_INIT], [win32-dll])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you
|
| -put the `win32-dll' option into LT_INIT's first parameter.])
|
| +put the 'win32-dll' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
| @@ -8152,9 +8526,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
|
|
|
| # _LT_ENABLE_SHARED([DEFAULT])
|
| # ----------------------------
|
| -# implement the --enable-shared flag, and supports the `shared' and
|
| -# `disable-shared' LT_INIT options.
|
| -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
| +# implement the --enable-shared flag, and supports the 'shared' and
|
| +# 'disable-shared' LT_INIT options.
|
| +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
| m4_define([_LT_ENABLE_SHARED],
|
| [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
| AC_ARG_ENABLE([shared],
|
| @@ -8167,14 +8541,14 @@ AC_ARG_ENABLE([shared],
|
| *)
|
| 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],
|
| [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
|
| @@ -8206,9 +8580,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
|
|
|
| # _LT_ENABLE_STATIC([DEFAULT])
|
| # ----------------------------
|
| -# implement the --enable-static flag, and support the `static' and
|
| -# `disable-static' LT_INIT options.
|
| -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
| +# implement the --enable-static flag, and support the 'static' and
|
| +# 'disable-static' LT_INIT options.
|
| +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
| m4_define([_LT_ENABLE_STATIC],
|
| [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
| AC_ARG_ENABLE([static],
|
| @@ -8221,14 +8595,14 @@ AC_ARG_ENABLE([static],
|
| *)
|
| 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],
|
| [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
|
| @@ -8260,9 +8634,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
|
|
|
| # _LT_ENABLE_FAST_INSTALL([DEFAULT])
|
| # ----------------------------------
|
| -# implement the --enable-fast-install flag, and support the `fast-install'
|
| -# and `disable-fast-install' LT_INIT options.
|
| -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
| +# implement the --enable-fast-install flag, and support the 'fast-install'
|
| +# and 'disable-fast-install' LT_INIT options.
|
| +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
|
| m4_define([_LT_ENABLE_FAST_INSTALL],
|
| [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
| AC_ARG_ENABLE([fast-install],
|
| @@ -8275,14 +8649,14 @@ AC_ARG_ENABLE([fast-install],
|
| *)
|
| 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],
|
| [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
|
| @@ -8299,14 +8673,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
|
| [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
| -the `fast-install' option into LT_INIT's first parameter.])
|
| +the 'fast-install' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| AU_DEFUN([AC_DISABLE_FAST_INSTALL],
|
| [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you put
|
| -the `disable-fast-install' option into LT_INIT's first parameter.])
|
| +the 'disable-fast-install' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
| @@ -8314,11 +8688,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
|
| dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
|
|
|
|
|
| +# _LT_WITH_AIX_SONAME([DEFAULT])
|
| +# ----------------------------------
|
| +# implement the --with-aix-soname flag, and support the `aix-soname=aix'
|
| +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
|
| +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
|
| +m4_define([_LT_WITH_AIX_SONAME],
|
| +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
|
| +shared_archive_member_spec=
|
| +case $host,$enable_shared in
|
| +power*-*-aix[[5-9]]*,yes)
|
| + AC_MSG_CHECKING([which variant of shared library versioning to provide])
|
| + AC_ARG_WITH([aix-soname],
|
| + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
|
| + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
|
| + [case $withval in
|
| + aix|svr4|both)
|
| + ;;
|
| + *)
|
| + AC_MSG_ERROR([Unknown argument to --with-aix-soname])
|
| + ;;
|
| + esac
|
| + lt_cv_with_aix_soname=$with_aix_soname],
|
| + [AC_CACHE_VAL([lt_cv_with_aix_soname],
|
| + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
|
| + with_aix_soname=$lt_cv_with_aix_soname])
|
| + AC_MSG_RESULT([$with_aix_soname])
|
| + 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
|
| +
|
| +_LT_DECL([], [shared_archive_member_spec], [0],
|
| + [Shared archive member basename, for filename based shared library versioning on AIX])dnl
|
| +])# _LT_WITH_AIX_SONAME
|
| +
|
| +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
|
| +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
|
| +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
|
| +
|
| +
|
| # _LT_WITH_PIC([MODE])
|
| # --------------------
|
| -# implement the --with-pic flag, and support the `pic-only' and `no-pic'
|
| +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
|
| # LT_INIT options.
|
| -# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
| +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
|
| m4_define([_LT_WITH_PIC],
|
| [AC_ARG_WITH([pic],
|
| [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
| @@ -8329,19 +8756,17 @@ m4_define([_LT_WITH_PIC],
|
| *)
|
| pic_mode=default
|
| # Look at the argument we got. We use all the common list separators.
|
| - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
| + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
| for lt_pkg in $withval; do
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| if test "X$lt_pkg" = "X$lt_p"; then
|
| pic_mode=yes
|
| fi
|
| done
|
| - IFS="$lt_save_ifs"
|
| + IFS=$lt_save_ifs
|
| ;;
|
| esac],
|
| - [pic_mode=default])
|
| -
|
| -test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
|
| + [pic_mode=m4_default([$1], [default])])
|
|
|
| _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
|
| ])# _LT_WITH_PIC
|
| @@ -8354,7 +8779,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
|
| [_LT_SET_OPTION([LT_INIT], [pic-only])
|
| AC_DIAGNOSE([obsolete],
|
| [$0: Remove this warning and the call to _LT_SET_OPTION when you
|
| -put the `pic-only' option into LT_INIT's first parameter.])
|
| +put the 'pic-only' option into LT_INIT's first parameter.])
|
| ])
|
|
|
| dnl aclocal-1.4 backwards compatibility:
|
| @@ -8377,7 +8802,8 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenience],
|
|
|
| # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
|
| #
|
| -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
|
| +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
|
| +# Foundation, Inc.
|
| # Written by Gary V. Vaughan, 2004
|
| #
|
| # This file is free software; the Free Software Foundation gives
|
| @@ -8410,7 +8836,7 @@ m4_define([_lt_join],
|
| # ------------
|
| # Manipulate m4 lists.
|
| # These macros are necessary as long as will still need to support
|
| -# Autoconf-2.59 which quotes differently.
|
| +# Autoconf-2.59, which quotes differently.
|
| m4_define([lt_car], [[$1]])
|
| m4_define([lt_cdr],
|
| [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
|
| @@ -8421,7 +8847,7 @@ m4_define([lt_unquote], $1)
|
|
|
| # lt_append(MACRO-NAME, STRING, [SEPARATOR])
|
| # ------------------------------------------
|
| -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
|
| +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
|
| # Note that neither SEPARATOR nor STRING are expanded; they are appended
|
| # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
|
| # No SEPARATOR is output if MACRO-NAME was previously undefined (different
|
| @@ -8501,7 +8927,7 @@ m4_define([lt_dict_filter],
|
|
|
| # ltversion.m4 -- version numbers -*- Autoconf -*-
|
| #
|
| -# Copyright (C) 2004 Free Software Foundation, Inc.
|
| +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
|
| # Written by Scott James Remnant, 2004
|
| #
|
| # This file is free software; the Free Software Foundation gives
|
| @@ -8510,22 +8936,23 @@ m4_define([lt_dict_filter],
|
|
|
| # @configure_input@
|
|
|
| -# serial 3337 ltversion.m4
|
| +# serial 4179 ltversion.m4
|
| # This file is part of GNU Libtool
|
|
|
| -m4_define([LT_PACKAGE_VERSION], [2.4.2])
|
| -m4_define([LT_PACKAGE_REVISION], [1.3337])
|
| +m4_define([LT_PACKAGE_VERSION], [2.4.6])
|
| +m4_define([LT_PACKAGE_REVISION], [2.4.6])
|
|
|
| AC_DEFUN([LTVERSION_VERSION],
|
| -[macro_version='2.4.2'
|
| -macro_revision='1.3337'
|
| +[macro_version='2.4.6'
|
| +macro_revision='2.4.6'
|
| _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
| _LT_DECL(, macro_revision, 0)
|
| ])
|
|
|
| # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
| #
|
| -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
|
| +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
|
| +# Foundation, Inc.
|
| # Written by Scott James Remnant, 2004.
|
| #
|
| # This file is free software; the Free Software Foundation gives
|
| @@ -8536,7 +8963,7 @@ _LT_DECL(, macro_revision, 0)
|
|
|
| # These exist entirely to fool aclocal when bootstrapping libtool.
|
| #
|
| -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
|
| +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
|
| # which have later been changed to m4_define as they aren't part of the
|
| # exported API, or moved to Autoconf or Automake where they belong.
|
| #
|
| @@ -8550,7 +8977,7 @@ _LT_DECL(, macro_revision, 0)
|
| # included after everything else. This provides aclocal with the
|
| # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
|
| # because those macros already exist, or will be overwritten later.
|
| -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
|
| +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
|
| #
|
| # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
|
| # Yes, that means every name once taken will need to remain here until
|
| @@ -8622,7 +9049,7 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
|
| m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
|
| m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
|
|
| -# Copyright (C) 2002-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -8634,10 +9061,10 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
| # 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.14'
|
| +[am__api_version='1.15'
|
| 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.14.1], [],
|
| +m4_if([$1], [1.15], [],
|
| [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
| ])
|
|
|
| @@ -8653,14 +9080,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
| # 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.14.1])dnl
|
| +[AM_AUTOMAKE_VERSION([1.15])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-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -8705,15 +9132,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
| # configured tree to be moved without reconfiguration.
|
|
|
| AC_DEFUN([AM_AUX_DIR_EXPAND],
|
| -[dnl Rely on autoconf to set up CDPATH properly.
|
| -AC_PREREQ([2.50])dnl
|
| -# expand $ac_aux_dir to an absolute path
|
| -am_aux_dir=`cd $ac_aux_dir && pwd`
|
| +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
| +# Expand $ac_aux_dir to an absolute path.
|
| +am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
| ])
|
|
|
| # AM_CONDITIONAL -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -8744,7 +9170,7 @@ AC_CONFIG_COMMANDS_PRE(
|
| Usually this means the macro was only invoked conditionally.]])
|
| fi])])
|
|
|
| -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -8935,7 +9361,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
|
|
|
| # Generate code to set up dependency tracking. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9011,7 +9437,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
|
| # Do all the work for Automake. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9101,8 +9527,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
| # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
| # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
| AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
|
| -# We need awk for the "check" target. The system "awk" is bad on
|
| -# some platforms.
|
| +# We need awk for the "check" target (and possibly the TAP driver). The
|
| +# system "awk" is bad on some platforms.
|
| AC_REQUIRE([AC_PROG_AWK])dnl
|
| AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
| AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
| @@ -9175,7 +9601,11 @@ to "yes", and re-run configure.
|
| END
|
| AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
|
| fi
|
| -fi])
|
| +fi
|
| +dnl The trailing newline in this macro's definition is deliberate, for
|
| +dnl backward compatibility and to allow trailing 'dnl'-style comments
|
| +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
|
| +])
|
|
|
| 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
|
| @@ -9204,7 +9634,7 @@ for _am_header in $config_headers :; do
|
| done
|
| echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
|
|
| -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9215,7 +9645,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
|
| # Define $install_sh.
|
| AC_DEFUN([AM_PROG_INSTALL_SH],
|
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
| -if test x"${install_sh}" != xset; then
|
| +if test x"${install_sh+set}" != xset; then
|
| case $am_aux_dir in
|
| *\ * | *\ *)
|
| install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
| @@ -9225,7 +9655,7 @@ if test x"${install_sh}" != xset; then
|
| fi
|
| AC_SUBST([install_sh])])
|
|
|
| -# Copyright (C) 2003-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2003-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9246,7 +9676,7 @@ AC_SUBST([am__leading_dot])])
|
|
|
| # Check to see how 'make' treats includes. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9296,7 +9726,7 @@ rm -f confinc confmf
|
|
|
| # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9335,7 +9765,7 @@ fi
|
|
|
| # Helper functions for option handling. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9364,7 +9794,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
|
| AC_DEFUN([_AM_IF_OPTION],
|
| [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
|
|
| -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9411,7 +9841,7 @@ AC_LANG_POP([C])])
|
| # For backward compatibility.
|
| AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
|
|
| -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9430,7 +9860,7 @@ AC_DEFUN([AM_RUN_LOG],
|
|
|
| # Check to make sure that the build environment is sane. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9511,7 +9941,7 @@ AC_CONFIG_COMMANDS_PRE(
|
| rm -f conftest.file
|
| ])
|
|
|
| -# Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9571,7 +10001,7 @@ AC_SUBST([AM_BACKSLASH])dnl
|
| _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
|
| ])
|
|
|
| -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9599,7 +10029,7 @@ fi
|
| INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
| AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
|
|
| -# Copyright (C) 2006-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2006-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
| @@ -9618,7 +10048,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
|
| # Check how to create a tarball. -*- Autoconf -*-
|
|
|
| -# Copyright (C) 2004-2013 Free Software Foundation, Inc.
|
| +# Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
| #
|
| # This file is free software; the Free Software Foundation
|
| # gives unlimited permission to copy and/or distribute it,
|
|
|
Chromium Code Reviews
Issue 2865973002:
Check in the libxslt roll script. (Closed)
