http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/libtool.m4 ---------------------------------------------------------------------- diff --cc config/libtool.m4 index 828104c,828104c..671cde1 --- a/config/libtool.m4 +++ b/config/libtool.m4 @@@ -1,8 -1,8 +1,7 @@@ # 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. ++# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@@ -11,8 -11,8 +10,7 @@@ 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. ++# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@@ -39,7 -39,7 +37,7 @@@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) --# serial 57 LT_INIT ++# serial 56 LT_INIT # LT_PREREQ(VERSION) @@@ -68,7 -68,7 +66,6 @@@ esa # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT --AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@@ -85,8 -85,8 +82,6 @@@ AC_REQUIRE([LTVERSION_VERSION])dn AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl --_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) -- dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@@ -123,7 -123,7 +118,7 @@@ m4_defun([_LT_CC_BASENAME] *) break;; esac done --cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ]) @@@ -143,11 -143,11 +138,6 @@@ m4_defun([_LT_FILEUTILS_DEFAULTS] m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl --AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -- --_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl --dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@@ -170,13 -170,13 +160,10 @@@ _LT_DECL([], [exeext], [0], [Executabl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl --m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl --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 _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@@ -192,6 -192,6 +179,7 @@@ f _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@@ -205,6 -205,6 +193,23 @@@ ;; esac ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ # Global variables: ofile=libtool can_build_shared=yes @@@ -245,28 -245,28 +250,6 @@@ _LT_CONFIG_COMMAND ])# _LT_SETUP --# _LT_PREPARE_SED_QUOTE_VARS --# -------------------------- --# Define a few sed substitution that help us do robust quoting. --m4_defun([_LT_PREPARE_SED_QUOTE_VARS], --[# Backslashify metacharacters that are still active within --# double-quoted strings. --sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\([["`\\]]\)/\\\1/g' -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to delay expansion of an escaped single quote. --delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' --]) -- # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@@ -425,7 -425,7 +408,7 @@@ m4_define([_lt_decl_all_varnames] # 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"`']) ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@@ -435,7 -435,7 +418,7 @@@ # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # --# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' ++# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@@ -534,20 -534,20 +517,12 @@@ LTCC='$LTCC LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' --# A function that is used when there is no print builtin or printf. --func_fallback_echo () --{ -- eval 'cat <<_LTECHO_EOF --\$[]1 --_LTECHO_EOF' --} -- # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do -- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@@ -558,9 -558,9 +533,9 @@@ don # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do -- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@@ -568,38 -568,38 +543,16 @@@ esac done ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ ;; ++esac ++ _LT_OUTPUT_LIBTOOL_INIT ]) --# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) --# ------------------------------------ --# 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 --# 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). --m4_ifdef([AS_INIT_GENERATED], --[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], --[m4_defun([_LT_GENERATED_FILE_INIT], --[m4_require([AS_PREPARE])]dnl --[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl --[lt_write_fail=0 --cat >$1 <<_ASEOF || lt_write_fail=1 --#! $SHELL --# Generated by $as_me. --$2 --SHELL=\${CONFIG_SHELL-$SHELL} --export SHELL --_ASEOF --cat >>$1 <<\_ASEOF || lt_write_fail=1 --AS_SHELL_SANITIZE --_AS_PREPARE --exec AS_MESSAGE_FD>&1 --_ASEOF --test $lt_write_fail = 0 && chmod +x $1[]dnl --m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@@ -609,11 -609,11 +562,20 @@@ AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) --_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], --[# Run this file to recreate a libtool stub with the current configuration.]) ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. --cat >>"$CONFIG_LT" <<\_LTEOF lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AS_SHELL_SANITIZE ++_AS_PREPARE ++ ++exec AS_MESSAGE_FD>&1 exec AS_MESSAGE_LOG_FD>>config.log { echo @@@ -639,7 -639,7 +601,7 @@@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. --Copyright (C) 2011 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@@ -684,13 -684,13 +646,15 @@@ chmod +x "$CONFIG_LT # appending to config.log, which fails on DOS, as config.log is still kept # 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 && -- 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 --exec AS_MESSAGE_LOG_FD>>config.log --$lt_cl_success || AS_EXIT(1) ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ 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 ++ exec AS_MESSAGE_LOG_FD>>config.log ++ $lt_cl_success || AS_EXIT(1) ++fi ])# LT_OUTPUT @@@ -753,12 -753,12 +717,15 @@@ _LT_EO # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? -- sed '$q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ _LT_PROG_XSI_SHELLFNS -- _LT_PROG_REPLACE_SHELLFNS ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) -- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@@ -803,7 -803,7 +770,6 @@@ AC_DEFUN([LT_LANG] m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], -- [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@@ -825,31 -825,31 +791,6 @@@ m4_defun([_LT_LANG] ])# _LT_LANG --m4_ifndef([AC_PROG_GO], [ --############################################################ --# NOTE: This macro has been submitted for inclusion into # --# GNU Autoconf as AC_PROG_GO. When it is available in # --# a released version of Autoconf we should remove this # --# macro and use it instead. # --############################################################ --m4_defun([AC_PROG_GO], --[AC_LANG_PUSH(Go)dnl --AC_ARG_VAR([GOC], [Go compiler command])dnl --AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl --_AC_ARG_VAR_LDFLAGS()dnl --AC_CHECK_TOOL(GOC, gccgo) --if test -z "$GOC"; then -- if test -n "$ac_tool_prefix"; then -- AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) -- fi --fi --if test -z "$GOC"; then -- AC_CHECK_PROG(GOC, gccgo, gccgo, false) --fi --])#m4_defun --])#m4_ifndef -- -- # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@@ -880,10 -880,10 +821,6 @@@ AC_PROVIDE_IFELSE([AC_PROG_GCJ] m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) --AC_PROVIDE_IFELSE([AC_PROG_GO], -- [LT_LANG(GO)], -- [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) -- AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@@ -894,13 -894,13 +831,11 @@@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++ AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) --AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) --dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@@ -986,13 -986,13 +921,7 @@@ m4_defun_once([_LT_REQUIRED_DARWIN_CHEC $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? -- # If there is a non-empty error log, and "single_module" -- # appears in it, assume the flag caused a linker warning -- if test -s conftest.err && $GREP single_module conftest.err; then -- cat conftest.err >&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 ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@@ -1000,7 -1000,7 +929,6 @@@ rm -rf libconftest.dylib* rm -f conftest.* fi]) -- AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@@ -1012,34 -1012,34 +940,6 @@@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) -- -- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], -- [lt_cv_ld_force_load=no -- cat > conftest.c << _LT_EOF --int forced_loaded() { return 2;} --_LT_EOF -- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD -- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD -- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD -- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD -- cat > conftest.c << _LT_EOF --int main() { return 0;} --_LT_EOF -- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD -- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err -- _lt_result=$? -- if test -s conftest.err && $GREP force_load conftest.err; then -- cat conftest.err >&AS_MESSAGE_LOG_FD -- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then -- lt_cv_ld_force_load=yes -- else -- cat conftest.err >&AS_MESSAGE_LOG_FD -- fi -- rm -f conftest.err libconftest.a conftest conftest.c -- rm -rf conftest.dSYM -- ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@@ -1067,7 -1067,7 +967,7 @@@ else _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" != ":"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@@ -1077,8 -1077,8 +977,8 @@@ ]) --# _LT_DARWIN_LINKER_FEATURES([TAG]) --# --------------------------------- ++# _LT_DARWIN_LINKER_FEATURES ++# -------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@@ -1087,13 -1087,13 +987,7 @@@ _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\"`' -- 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(whole_archive_flag_spec, $1)='' _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@@ -1101,7 -1101,7 +995,7 @@@ *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=func_echo_all ++ output_verbose_link_cmd=echo _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}" @@@ -1117,141 -1117,141 +1011,202 @@@ fi ]) --# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) --# ---------------------------------- ++# _LT_SYS_MODULE_PATH_AIX ++# ----------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. --# Store the results from the different compilers for each TAGNAME. --# 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 -- aix_libpath=$lt_cv_aix_libpath --else -- AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -- [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ -- lt_aix_libpath_sed='[ -- /Import File Strings/,/^$/ { -- /^0/ { -- s/^0 *\([^ ]*\) *$/\1/ -- p -- } -- }]' -- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -- # Check for a 64-bit object if we didn't find anything. -- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -- _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" -- fi -- ]) -- aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) --fi ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_SYS_MODULE_PATH_AIX # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], --[m4_divert_text([M4SH-INIT], [$1 --])])# _LT_SHELL_INIT -- ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_SHELL_INIT # _LT_PROG_ECHO_BACKSLASH # ----------------------- --# 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). ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. m4_defun([_LT_PROG_ECHO_BACKSLASH], --[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO --ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -- --AC_MSG_CHECKING([how to print strings]) --# Test print first, because it will be a builtin if present. --if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ -- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then -- ECHO='print -r --' --elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -- ECHO='printf %s\n' ++[_LT_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++case X$lt_ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac ++ ++ECHO=${lt_ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! ++ : else -- # Use this function as a fallback that always works. -- func_fallback_echo () -- { -- eval 'cat <<_LTECHO_EOF --$[]1 --_LTECHO_EOF' -- } -- ECHO='func_fallback_echo' ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} fi --# func_echo_all arg... --# Invoke $ECHO with all args, space-separated. --func_echo_all () --{ -- $ECHO "$*" --} ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<_LT_EOF ++[$]* ++_LT_EOF ++ exit 0 ++fi --case "$ECHO" in -- printf*) AC_MSG_RESULT([printf]) ;; -- print*) AC_MSG_RESULT([print -r]) ;; -- *) AC_MSG_RESULT([cat]) ;; --esac ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH --m4_ifdef([_AS_DETECT_SUGGESTED], --[_AS_DETECT_SUGGESTED([ -- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( -- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -- PATH=/empty FPATH=/empty; export PATH FPATH -- test "X`printf %s $ECHO`" = "X$ECHO" \ -- || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi --_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) --_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) --])# _LT_PROG_ECHO_BACKSLASH ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" --# _LT_WITH_SYSROOT --# ---------------- --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).], --[], [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 #( -- yes) -- if test "$GCC" = yes; then -- lt_sysroot=`$CC --print-sysroot 2>/dev/null` -- fi -- ;; #( -- /*) -- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` -- ;; #( -- no|'') -- ;; #( -- *) -- AC_MSG_RESULT([${with_sysroot}]) -- AC_MSG_ERROR([The sysroot must be an absolute path.]) -- ;; --esac ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi ++ fi ++ fi ++ fi ++fi ++ ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi ++ ++AC_SUBST(lt_ECHO) ++]) ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], ++ [An echo program that does not interpret backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH -- 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.])]) # _LT_ENABLE_LOCK # --------------- @@@ -1281,7 -1281,7 +1236,7 @@@ ia64-*-hpux* ;; *-*-irix6*) # Find out which ABI we are using. -- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@@ -1374,27 -1374,27 +1329,14 @@@ s390*-*linux*|s390*-*tpf*|sparc*-*linux CFLAGS="$SAVE_CFLAGS" fi ;; --*-*solaris*) ++sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -- yes*) -- case $host in -- i?86-*-solaris*) -- LD="${LD-ld} -m elf_x86_64" -- ;; -- sparc*-*-solaris*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- # GNU ld 2.21 introduced _sol2 emulations. Use them if available. -- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then -- LD="${LD-ld}_sol2" -- fi -- ;; ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@@ -1412,47 -1412,47 +1354,14 @@@ need_locks="$enable_libtool_lock ])# _LT_ENABLE_LOCK --# _LT_PROG_AR --# ----------- --m4_defun([_LT_PROG_AR], --[AC_CHECK_TOOLS(AR, [ar], false) --: ${AR=ar} --: ${AR_FLAGS=cru} --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -- --AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], -- [lt_cv_ar_at_file=no -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM], -- [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 -- # 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 -- lt_cv_ar_at_file=@ -- fi -- fi -- rm -f conftest.* libconftest.a -- ]) -- ]) -- --if test "x$lt_cv_ar_at_file" = xno; then -- archiver_list_spec= --else -- archiver_list_spec=$lt_cv_ar_at_file --fi --_LT_DECL([], [archiver_list_spec], [1], -- [How to feed a file listing to the archiver]) --])# _LT_PROG_AR -- -- # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], --[_LT_PROG_AR ++[AC_CHECK_TOOL(AR, ar, false) ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1]) AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@@ -1471,27 -1471,27 +1380,18 @@@ old_postuninstall_cmds if test -n "$RANLIB"; then case $host_os in openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -- --case $host_os in -- darwin*) -- lock_old_archive_extraction=yes ;; -- *) -- lock_old_archive_extraction=no ;; --esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) --_LT_DECL([], [lock_old_archive_extraction], [0], -- [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@@ -1516,15 -1516,15 +1416,15 @@@ AC_CACHE_CHECK([$1], [$2] -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@@ -1564,7 -1564,7 +1464,7 @@@ AC_CACHE_CHECK([$1], [$2] if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD -- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@@ -1627,11 -1627,11 +1527,6 @@@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [ lt_cv_sys_max_cmd_len=8192; ;; -- mint*) -- # On MiNT this can take a long time and run out of memory. -- lt_cv_sys_max_cmd_len=8192; -- ;; -- amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@@ -1657,11 -1657,11 +1552,6 @@@ lt_cv_sys_max_cmd_len=196608 ;; -- os2*) -- # The test takes a long time on OS/2. -- lt_cv_sys_max_cmd_len=8192 -- ;; -- osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@@ -1701,8 -1701,8 +1591,8 @@@ # 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` \ -- = "X$teststring$teststring"; } >/dev/null 2>&1 && ++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@@ -1753,7 -1753,7 +1643,7 @@@ els lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --[#line $LINENO "configure" ++[#line __oline__ "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@@ -1794,13 -1794,13 +1684,7 @@@ # endif #endif --/* When -fvisbility=hidden is used, assume the code has been annotated -- correspondingly for the symbols needed. */ --#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) --int fnord () __attribute__((visibility("default"))); --#endif -- --int fnord () { return 42; } ++void fnord() { int i=42;} int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@@ -1809,11 -1809,11 +1693,7 @@@ if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else -- { -- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- else puts (dlerror ()); -- } ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } else @@@ -1989,16 -1989,16 +1869,16 @@@ AC_CACHE_CHECK([if $compiler supports - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings -- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@@ -2157,7 -2157,7 +2037,6 @@@ m4_require([_LT_DECL_EGREP])dn 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 AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@@ -2166,23 -2166,23 +2045,16 @@@ if test "$GCC" = yes; the 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" ;; -- 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 -- *\;*) ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` -- ;; -- *) -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` -- ;; -- esac ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@@ -2195,7 -2195,7 +2067,7 @@@ 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 ' ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@@ -2215,13 -2215,13 +2087,7 @@@ if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` -- # AWK program above erroneously prepends '/' to C:/dos/paths -- # 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'` ;; -- esac -- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@@ -2247,7 -2247,7 +2113,7 @@@ need_version=unknow case $host_os in aix3*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@@ -2256,7 -2256,7 +2122,7 @@@ ;; aix[[4-9]]*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@@ -2309,7 -2309,7 +2175,7 @@@ amigaos* 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=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@@ -2321,7 -2321,7 +2187,7 @@@ beos* ;; bsdi[[45]]*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@@ -2340,9 -2340,9 +2206,8 @@@ cygwin* | mingw* | pw32* | cegcc* need_version=no need_lib_prefix=no -- case $GCC,$cc_basename in -- yes,*) -- # gcc ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@@ -2363,83 -2363,83 +2228,36 @@@ 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}' --m4_if([$1], [],[ -- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- ;; -- pw32*) -- # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- ;; -- -- *,cl*) -- # Native MSVC -- libname_spec='$name' -- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- library_names_spec='${libname}.dll.lib' -- -- case $build_os in -- mingw*) -- sys_lib_search_path_spec= -- lt_save_ifs=$IFS -- IFS=';' -- for lt_path in $LIB -- do -- IFS=$lt_save_ifs -- # Let DOS variable expansion print the short 8.3 style file name. -- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` -- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" -- done -- IFS=$lt_save_ifs -- # Convert to MSYS style. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` -- ;; -- cygwin*) -- # Convert to unix form, then to dos form, then back to unix form -- # but this time dos style (no spaces!) so that the unix form looks -- # like /cygdrive/c/PROGRA~1:/cygdr... -- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` -- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` -- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- ;; -- *) -- sys_lib_search_path_spec="$LIB" ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -- # It is most probably a Windows format PATH. ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi -- # FIXME: find the short name or the path components, as spaces are -- # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac -- -- # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -- dldir=$destdir/`dirname \$dlpath`~ -- test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $RM \$dlpath' -- shlibpath_overrides_runpath=yes -- dynamic_linker='Win32 link.exe' ;; *) -- # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -- dynamic_linker='Win32 ld.exe' ;; esac ++ dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@@ -2460,7 -2460,7 +2278,7 @@@ m4_if([$1], [], ;; dgux*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@@ -2468,6 -2468,6 +2286,10 @@@ shlibpath_var=LD_LIBRARY_PATH ;; ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@@ -2475,7 -2475,7 +2297,7 @@@ objformat=`/usr/bin/objformat` else case $host_os in -- freebsd[[23]].*) objformat=aout ;; ++ freebsd[[123]]*) objformat=aout ;; *) objformat=elf ;; esac fi @@@ -2493,7 -2493,7 +2315,7 @@@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in -- freebsd2.*) ++ freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@@ -2513,26 -2513,26 +2335,12 @@@ ;; gnu*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- --haiku*) -- version_type=linux # correct to gnu/linux during the next big refactor -- 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' -- shlibpath_var=LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@@ -2578,14 -2578,14 +2386,12 @@@ hpux9* | hpux10* | hpux11* soname_spec='${libname}${release}${shared_ext}$major' ;; esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555, ... ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' -- # or fails outright, so override atomically: -- install_override_mode=555 ;; interix[[3-9]]*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@@ -2601,7 -2601,7 +2407,7 @@@ irix5* | irix6* | nonstopux* nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux else version_type=irix fi ;; @@@ -2638,9 -2638,9 +2444,9 @@@ linux*oldld* | linux*aout* | linux*coff dynamic_linker=no ;; --# This must be glibc/ELF. --linux* | k*bsd*-gnu | kopensolaris*-gnu) -- version_type=linux # correct to gnu/linux during the next big refactor ++# This must be Linux ELF. ++linux* | k*bsd*-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}' @@@ -2648,31 -2648,31 +2454,29 @@@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no -- # Some binutils ld are patched to set DT_RUNPATH -- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], -- [lt_cv_shlibpath_overrides_runpath=no -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -- [lt_cv_shlibpath_overrides_runpath=yes])]) -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -- ]) -- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir # 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 ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ 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;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@@ -2684,18 -2684,18 +2488,6 @@@ dynamic_linker='GNU/Linux ld.so' ;; --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- netbsd*) version_type=sunos need_lib_prefix=no @@@ -2715,7 -2715,7 +2507,7 @@@ ;; newsos6) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@@ -2784,7 -2784,7 +2576,7 @@@ rdos* ;; solaris*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@@ -2809,7 -2809,7 +2601,7 @@@ sunos4* ;; sysv4 | sysv4.3*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@@ -2833,7 -2833,7 +2625,7 @@@ sysv4*MP*) if test -d /usr/nec ;then -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@@ -2864,7 -2864,7 +2656,7 @@@ sysv5* | sco3.2v5* | sco5v6* | unixware tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@@ -2874,7 -2874,7 +2666,7 @@@ ;; uts4*) -- version_type=linux # correct to gnu/linux during the next big refactor ++ version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@@ -2916,8 -2916,8 +2708,6 @@@ _LT_DECL([], [library_names_spec], [1] The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) --_LT_DECL([], [install_override_mode], [1], -- [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@@ -3030,7 -3030,7 +2820,6 @@@ AC_REQUIRE([AC_CANONICAL_HOST])dn AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl --m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@@ -3152,11 -3152,11 +2941,6 @@@ case $reload_flag i esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -- if test "$GCC" != yes; then -- reload_cmds=false -- fi -- ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@@ -3165,8 -3165,8 +2949,8 @@@ fi ;; esac --_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl --_LT_TAGDECL([], [reload_cmds], [2])dnl ++_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl ++_LT_DECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@@ -3218,18 -3218,18 +3002,16 @@@ 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 -- # Keep this pattern in sync with the one in func_win32_libid. -- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; --cegcc*) ++cegcc) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@@ -3259,10 -3259,10 +3041,6 @@@ gnu* lt_cv_deplibs_check_method=pass_all ;; --haiku*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@@ -3271,11 -3271,11 +3049,11 @@@ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) -- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@@ -3296,12 -3296,12 +3074,12 @@@ irix5* | irix6* | nonstopux* lt_cv_deplibs_check_method=pass_all ;; --# This must be glibc/ELF. --linux* | k*bsd*-gnu | kopensolaris*-gnu) ++# This must be Linux ELF. ++linux* | k*bsd*-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 @@@ -3375,21 -3375,21 +3153,6 @@@ tpf* ;; esac ]) -- --file_magic_glob= --want_nocaseglob=no --if test "$build" = "$host"; then -- case $host_os in -- mingw* | pw32*) -- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -- want_nocaseglob=yes -- else -- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -- fi -- ;; -- esac --fi -- file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@@ -3397,11 -3397,11 +3160,7 @@@ _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method = "file_magic"]) --_LT_DECL([], [file_magic_glob], [1], -- [How to find potential files when deplibs_check_method = "file_magic"]) --_LT_DECL([], [want_nocaseglob], [1], -- [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) ++ [Command to use when deplibs_check_method == "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@@ -3458,19 -3458,19 +3217,7 @@@ if test "$lt_cv_path_NM" != "no"; the 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 -- *COFF*) -- DUMPBIN="$DUMPBIN -symbols" -- ;; -- *) -- DUMPBIN=: -- ;; -- esac -- fi ++ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@@ -3483,13 -3483,13 +3230,13 @@@ _LT_DECL([], [NM], [1], [A BSD- or MS-c AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@@ -3504,67 -3504,67 +3251,6 @@@ dnl aclocal-1.4 backwards compatibility dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) --# _LT_CHECK_SHAREDLIB_FROM_LINKLIB --# -------------------------------- --# how to determine the name of the shared library --# associated with a specific link library. --# -- PORTME fill in with the dynamic library characteristics --m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], --[m4_require([_LT_DECL_EGREP]) --m4_require([_LT_DECL_OBJDUMP]) --m4_require([_LT_DECL_DLLTOOL]) --AC_CACHE_CHECK([how to associate runtime and link libraries], --lt_cv_sharedlib_from_linklib_cmd, --[lt_cv_sharedlib_from_linklib_cmd='unknown' -- --case $host_os in --cygwin* | mingw* | pw32* | cegcc*) -- # two different shell functions defined in ltmain.sh -- # decide which to use based on capabilities of $DLLTOOL -- case `$DLLTOOL --help 2>&1` in -- *--identify-strict*) -- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -- ;; -- *) -- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -- ;; -- esac -- ;; --*) -- # fallback: assume linklib IS sharedlib -- lt_cv_sharedlib_from_linklib_cmd="$ECHO" -- ;; --esac --]) --sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd --test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -- --_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -- [Command to associate shared and link libraries]) --])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -- -- --# _LT_PATH_MANIFEST_TOOL --# ---------------------- --# locate the manifest tool --m4_defun([_LT_PATH_MANIFEST_TOOL], --[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) --test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt --AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -- [lt_cv_path_mainfest_tool=no -- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -- cat conftest.err >&AS_MESSAGE_LOG_FD -- if $GREP 'Manifest Tool' conftest.out > /dev/null; then -- lt_cv_path_mainfest_tool=yes -- fi -- rm -f conftest*]) --if test "x$lt_cv_path_mainfest_tool" != xyes; then -- MANIFEST_TOOL=: --fi --_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl --])# _LT_PATH_MANIFEST_TOOL -- # LT_LIB_M # -------- @@@ -3573,7 -3573,7 +3259,7 @@@ AC_DEFUN([LT_LIB_M] [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in --*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) ++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@@ -3601,12 -3601,12 +3287,7 @@@ m4_defun([_LT_COMPILER_NO_RTTI] _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then -- case $cc_basename in -- nvcc*) -- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; -- *) -- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; -- esac ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@@ -3623,7 -3623,7 +3304,6 @@@ _LT_TAGDECL([no_builtin_flag], [lt_prog m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@@ -3691,8 -3691,8 +3371,8 @@@ esa lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -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 -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@@ -3716,7 -3716,7 +3396,6 @@@ for ac_symprfx in "" "_"; d # 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};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@@ -3729,7 -3729,7 +3408,6 @@@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi -- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@@ -3751,7 -3751,7 +3429,7 @@@ _LT_EO if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm -- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then ++ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@@ -3763,18 -3763,18 +3441,6 @@@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext --/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ --#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) --/* DATA imports from DLLs on WIN32 con't be const, because runtime -- relocations are performed -- see ld's documentation on pseudo-relocs. */ --# define LT@&t@_DLSYM_CONST --#elif defined(__osf__) --/* This system does not cope well with relocations in const data. */ --# define LT@&t@_DLSYM_CONST --#else --# define LT@&t@_DLSYM_CONST const --#endif -- #ifdef __cplusplus extern "C" { #endif @@@ -3786,7 -3786,7 +3452,7 @@@ _LT_EO cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ --LT@&t@_DLSYM_CONST struct { ++const struct { const char *name; void *address; } @@@ -3812,15 -3812,15 +3478,15 @@@ static const void *lt_preloaded_setup( _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext -- lt_globsym_save_LIBS=$LIBS -- lt_globsym_save_CFLAGS=$CFLAGS ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" 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 pipe_works=yes fi -- LIBS=$lt_globsym_save_LIBS -- CFLAGS=$lt_globsym_save_CFLAGS ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@@ -3853,13 -3853,13 +3519,6 @@@ els AC_MSG_RESULT(ok) fi --# Response file support. --if test "$lt_cv_nm_interface" = "MS dumpbin"; then -- nm_file_list_spec='@' --elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -- nm_file_list_spec='@' --fi -- _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], @@@ -3870,8 -3870,8 +3529,6 @@@ _LT_DECL([global_symbol_to_c_name_addre _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_file_list_spec], [1], -- [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@@ -3883,6 -3883,6 +3540,7 @@@ _LT_TAGVAR(lt_prog_compiler_wl, $1) _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= ++AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@@ -3933,11 -3933,11 +3591,6 @@@ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; -- haiku*) -- # PIC is the default for Haiku. -- # The "-static" flag exists, but is broken. -- _LT_TAGVAR(lt_prog_compiler_static, $1)= -- ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@@ -3987,12 -3987,12 +3640,6 @@@ ;; esac ;; -- mingw* | cygwin* | os2* | pw32* | 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']) -- ;; dgux*) case $cc_basename in ec++*) @@@ -4049,7 -4049,7 +3696,7 @@@ ;; esac ;; -- linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@@ -4082,8 -4082,8 +3729,8 @@@ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; -- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) -- # IBM XL 8.0, 9.0 on PPC and BlueGene ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@@ -4113,7 -4113,7 +3760,7 @@@ ;; esac ;; -- netbsd* | netbsdelf*-gnu) ++ netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@@ -4145,7 -4145,7 +3792,7 @@@ ;; solaris*) case $cc_basename in -- CC* | sunCC*) ++ CC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@@ -4249,12 -4249,12 +3896,6 @@@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; -- haiku*) -- # PIC is the default for Haiku. -- # The "-static" flag exists, but is broken. -- _LT_TAGVAR(lt_prog_compiler_static, $1)= -- ;; -- hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@@ -4297,15 -4297,15 +3938,6 @@@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac -- -- case $cc_basename in -- nvcc*) # Cuda Compiler Driver 2.2 -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' -- if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then -- _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" -- fi -- ;; -- esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@@ -4348,7 -4348,7 +3980,7 @@@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; -- linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ linux* | k*bsd*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@@ -4369,13 -4369,13 +4001,7 @@@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; -- 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' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) ++ pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@@ -4387,40 -4387,40 +4013,25 @@@ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; -- xl* | bgxl* | bgf* | mpixl*) -- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in -- *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) -- # Sun Fortran 8.3 passes all unrecognized flags to the linker -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' -- ;; -- *Sun\ F* | *Sun*Fortran*) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; -- *Intel*\ [[CF]]*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' -- ;; -- *Portland\ Group*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; esac ;; @@@ -4452,7 -4452,7 +4063,7 @@@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in -- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) ++ f77* | f90* | f95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@@ -4509,11 -4509,11 +4120,9 @@@ case $host_os i _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac -- --AC_CACHE_CHECK([for $compiler option to produce PIC], -- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) ++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) # # Check to make sure the PIC flag actually works. @@@ -4532,8 -4532,8 +4141,6 @@@ f _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@@ -4554,7 -4554,7 +4161,6 @@@ _LT_TAGDECL([link_static_flag], [lt_pro m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl --m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@@ -4563,40 -4563,40 +4169,27 @@@ m4_require([_LT_TAG_COMPILER])dn AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 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". 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")) && ([substr](\$ 3,1,1) != ".")) { 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' fi ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; ++ ;; cygwin* | mingw* | cegcc*) -- case $cc_basename in -- cl*) -- _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -- ;; -- *) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -- ;; -- 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 -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; ++ ;; esac ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@@ -4611,6 -4611,6 +4204,7 @@@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@@ -4655,39 -4655,39 +4249,10 @@@ dnl Note also adjust exclude_expsyms fo openbsd*) with_gnu_ld=no ;; -- linux* | k*bsd*-gnu | gnu*) -- _LT_TAGVAR(link_all_deplibs, $1)=no -- ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes -- -- # 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 -- case $host_os in -- aix*) -- # The AIX port of GNU ld has always aspired to compatibility -- # with the native linker. However, as the warning in the GNU ld -- # block says, versions before 2.19.5* couldn't really create working -- # shared libraries, regardless of the interface used. -- case `$LD -v 2>&1` in -- *\ \(GNU\ Binutils\)\ 2.19.5*) ;; -- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; -- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; -- *) -- lt_use_gnu_ld_interface=yes -- ;; -- esac -- ;; -- *) -- lt_use_gnu_ld_interface=yes -- ;; -- esac -- fi -- -- if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@@ -4705,7 -4705,7 +4270,6 @@@ fi supports_anon_versioning=no case `$LD -v 2>&1` in -- *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@@ -4721,12 -4721,12 +4285,11 @@@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 --*** Warning: the GNU linker, at least up to release 2.19, is reported ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to install binutils --*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. --*** You will then need to restart the configuration process. ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. _LT_EOF fi @@@ -4762,12 -4762,12 +4325,10 @@@ # _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(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _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' @@@ -4785,11 -4785,11 +4346,6 @@@ fi ;; -- haiku*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- ;; -- interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@@ -4805,7 -4805,7 +4361,7 @@@ _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) ++ gnu* | linux* | tpf* | k*bsd*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@@ -4815,16 -4815,16 +4371,15 @@@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then -- tmp_addflag=' $pic_flag' ++ tmp_addflag= tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler -- _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; $ECHO \"$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' ++ pgf77* | pgf90* | pgf95*) # 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) #
<TRUNCATED>
