|
|
@@ -1,6 +1,6 @@
|
|
|
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
|
|
#
|
|
|
-# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
|
|
|
+# Copyright (C) 1996-2001, 2003-2019, 2021-2024 Free Software
|
|
|
# Foundation, Inc.
|
|
|
# Written by Gordon Matzigkeit, 1996
|
|
|
#
|
|
|
@@ -9,13 +9,13 @@
|
|
|
# modifications, as long as this notice is preserved.
|
|
|
|
|
|
m4_define([_LT_COPYING], [dnl
|
|
|
-# Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
+# Copyright (C) 2024 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
|
|
|
+# the Free Software Foundation; either version 2 of the License, or
|
|
|
# (at your option) any later version.
|
|
|
#
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
|
@@ -32,7 +32,7 @@ m4_define([_LT_COPYING], [dnl
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
])
|
|
|
|
|
|
-# serial 59 LT_INIT
|
|
|
+# serial 62 LT_INIT
|
|
|
|
|
|
|
|
|
# LT_PREREQ(VERSION)
|
|
|
@@ -60,7 +60,7 @@ esac
|
|
|
# LT_INIT([OPTIONS])
|
|
|
# ------------------
|
|
|
AC_DEFUN([LT_INIT],
|
|
|
-[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
|
|
|
+[AC_PREREQ([2.64])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
|
|
|
@@ -616,7 +616,7 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
|
|
|
# LT_OUTPUT
|
|
|
# ---------
|
|
|
# This macro allows early generation of the libtool script (before
|
|
|
-# AC_OUTPUT is called), incase it is used in configure for compilation
|
|
|
+# AC_OUTPUT is called), in case it is used in configure for compilation
|
|
|
# tests.
|
|
|
AC_DEFUN([LT_OUTPUT],
|
|
|
[: ${CONFIG_LT=./config.lt}
|
|
|
@@ -651,9 +651,9 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
|
|
|
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) 2024 Free Software Foundation, Inc.
|
|
|
This config.lt script is free software; the Free Software Foundation
|
|
|
-gives unlimited permision to copy, distribute and modify it."
|
|
|
+gives unlimited permission to copy, distribute and modify it."
|
|
|
|
|
|
while test 0 != $[#]
|
|
|
do
|
|
|
@@ -730,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([
|
|
|
cat <<_LT_EOF >> "$cfgfile"
|
|
|
#! $SHELL
|
|
|
# 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.
|
|
|
@@ -975,6 +974,7 @@ _lt_linker_boilerplate=`cat conftest.err`
|
|
|
$RM -r conftest*
|
|
|
])# _LT_LINKER_BOILERPLATE
|
|
|
|
|
|
+
|
|
|
# _LT_REQUIRED_DARWIN_CHECKS
|
|
|
# -------------------------
|
|
|
m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
|
|
@@ -1025,6 +1025,21 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
|
|
rm -f conftest.*
|
|
|
fi])
|
|
|
|
|
|
+ # Feature test to disable chained fixups since it is not
|
|
|
+ # compatible with '-undefined dynamic_lookup'
|
|
|
+ AC_CACHE_CHECK([for -no_fixup_chains linker flag],
|
|
|
+ [lt_cv_support_no_fixup_chains],
|
|
|
+ [ save_LDFLAGS=$LDFLAGS
|
|
|
+ LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
|
|
|
+ AC_LINK_IFELSE(
|
|
|
+ [AC_LANG_PROGRAM([],[])],
|
|
|
+ lt_cv_support_no_fixup_chains=yes,
|
|
|
+ lt_cv_support_no_fixup_chains=no
|
|
|
+ )
|
|
|
+ LDFLAGS=$save_LDFLAGS
|
|
|
+ ]
|
|
|
+ )
|
|
|
+
|
|
|
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
|
|
|
[lt_cv_ld_exported_symbols_list],
|
|
|
[lt_cv_ld_exported_symbols_list=no
|
|
|
@@ -1049,7 +1064,7 @@ _LT_EOF
|
|
|
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;}
|
|
|
+int main(void) { 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
|
|
|
@@ -1074,7 +1089,11 @@ _LT_EOF
|
|
|
10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
|
|
|
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
|
|
*)
|
|
|
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
|
|
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
|
|
|
+ if test yes = "$lt_cv_support_no_fixup_chains"; then
|
|
|
+ AS_VAR_APPEND([_lt_dar_allow_undefined], [' $wl-no_fixup_chains'])
|
|
|
+ fi
|
|
|
+ ;;
|
|
|
esac
|
|
|
;;
|
|
|
esac
|
|
|
@@ -1256,7 +1275,9 @@ lt_sysroot=
|
|
|
case $with_sysroot in #(
|
|
|
yes)
|
|
|
if test yes = "$GCC"; then
|
|
|
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
|
|
+ # Trim trailing / since we'll always append absolute paths and we want
|
|
|
+ # to avoid //, if only for less confusing output for the user.
|
|
|
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
|
|
|
fi
|
|
|
;; #(
|
|
|
/*)
|
|
|
@@ -1368,7 +1389,7 @@ mips64*-*linux*)
|
|
|
;;
|
|
|
|
|
|
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
|
|
|
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
|
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
|
|
|
# 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
|
|
|
@@ -1383,7 +1404,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
|
x86_64-*kfreebsd*-gnu)
|
|
|
LD="${LD-ld} -m elf_i386_fbsd"
|
|
|
;;
|
|
|
- x86_64-*linux*)
|
|
|
+ x86_64-*linux*|x86_64-gnu*)
|
|
|
case `$FILECMD conftest.o` in
|
|
|
*x86-64*)
|
|
|
LD="${LD-ld} -m elf32_x86_64"
|
|
|
@@ -1412,7 +1433,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
|
x86_64-*kfreebsd*-gnu)
|
|
|
LD="${LD-ld} -m elf_x86_64_fbsd"
|
|
|
;;
|
|
|
- x86_64-*linux*)
|
|
|
+ x86_64-*linux*|x86_64-gnu*)
|
|
|
LD="${LD-ld} -m elf_x86_64"
|
|
|
;;
|
|
|
powerpcle-*linux*|powerpc64le-*linux*)
|
|
|
@@ -1495,7 +1516,7 @@ _LT_DECL([], [AR], [1], [The archiver])
|
|
|
|
|
|
# Use ARFLAGS variable as AR's operation code to sync the variable naming with
|
|
|
# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
|
|
|
-# higher priority because thats what people were doing historically (setting
|
|
|
+# higher priority because that's what people were doing historically (setting
|
|
|
# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
|
|
|
# variable obsoleted/removed.
|
|
|
|
|
|
@@ -1545,7 +1566,7 @@ AC_CHECK_TOOL(STRIP, strip, :)
|
|
|
test -z "$STRIP" && STRIP=:
|
|
|
_LT_DECL([], [STRIP], [1], [A symbol stripping program])
|
|
|
|
|
|
-AC_CHECK_TOOL(RANLIB, ranlib, :)
|
|
|
+AC_REQUIRE([AC_PROG_RANLIB])
|
|
|
test -z "$RANLIB" && RANLIB=:
|
|
|
_LT_DECL([], [RANLIB], [1],
|
|
|
[Commands used to install an old-style archive])
|
|
|
@@ -1556,15 +1577,8 @@ old_postinstall_cmds='chmod 644 $oldlib'
|
|
|
old_postuninstall_cmds=
|
|
|
|
|
|
if test -n "$RANLIB"; then
|
|
|
- case $host_os in
|
|
|
- bitrig* | openbsd*)
|
|
|
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
|
|
|
- ;;
|
|
|
- *)
|
|
|
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
|
|
|
- ;;
|
|
|
- esac
|
|
|
old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
|
|
|
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
|
|
|
fi
|
|
|
|
|
|
case $host_os in
|
|
|
@@ -1703,7 +1717,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|
|
lt_cv_sys_max_cmd_len=-1;
|
|
|
;;
|
|
|
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | cegcc*)
|
|
|
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
|
|
# about 5 minutes as the teststring grows exponentially.
|
|
|
# Worse, since 9x/ME are not pre-emptively multitasking,
|
|
|
@@ -1725,7 +1739,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|
|
lt_cv_sys_max_cmd_len=8192;
|
|
|
;;
|
|
|
|
|
|
- bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
|
|
|
+ darwin* | dragonfly* | freebsd* | midnightbsd* | 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`
|
|
|
@@ -1885,11 +1899,11 @@ else
|
|
|
/* 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))
|
|
|
-int fnord () __attribute__((visibility("default")));
|
|
|
+int fnord (void) __attribute__((visibility("default")));
|
|
|
#endif
|
|
|
|
|
|
-int fnord () { return 42; }
|
|
|
-int main ()
|
|
|
+int fnord (void) { return 42; }
|
|
|
+int main (void)
|
|
|
{
|
|
|
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
|
|
int status = $lt_dlunknown;
|
|
|
@@ -1946,7 +1960,7 @@ else
|
|
|
lt_cv_dlopen_self=yes
|
|
|
;;
|
|
|
|
|
|
- mingw* | pw32* | cegcc*)
|
|
|
+ mingw* | windows* | pw32* | cegcc*)
|
|
|
lt_cv_dlopen=LoadLibrary
|
|
|
lt_cv_dlopen_libs=
|
|
|
;;
|
|
|
@@ -2314,7 +2328,7 @@ if test yes = "$GCC"; then
|
|
|
*) lt_awk_arg='/^libraries:/' ;;
|
|
|
esac
|
|
|
case $host_os in
|
|
|
- mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
|
|
|
+ mingw* | windows* | 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`
|
|
|
@@ -2372,7 +2386,7 @@ BEGIN {RS = " "; FS = "/|\n";} {
|
|
|
# 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" |\
|
|
|
+ mingw* | windows* | 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`
|
|
|
@@ -2447,7 +2461,7 @@ aix[[4-9]]*)
|
|
|
# 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.
|
|
|
+ # linker flag in LDFLAGS as well, or --enable-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
|
|
|
@@ -2541,7 +2555,7 @@ bsdi[[45]]*)
|
|
|
# libtool to hard-code these into programs
|
|
|
;;
|
|
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
version_type=windows
|
|
|
shrext_cmds=.dll
|
|
|
need_version=no
|
|
|
@@ -2552,6 +2566,19 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
# gcc
|
|
|
library_names_spec='$libname.dll.a'
|
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
|
+ # If user builds GCC with mulitlibs enabled,
|
|
|
+ # it should just install on $(libdir)
|
|
|
+ # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
|
|
|
+ if test yes = $multilib; then
|
|
|
+ postinstall_cmds='base_file=`basename \$file`~
|
|
|
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
|
|
|
+ dldir=$destdir/`dirname \$dlpath`~
|
|
|
+ $install_prog $dir/$dlname $destdir/$dlname~
|
|
|
+ chmod a+x $destdir/$dlname~
|
|
|
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
|
|
|
+ eval '\''$striplib $destdir/$dlname'\'' || exit \$?;
|
|
|
+ fi'
|
|
|
+ else
|
|
|
postinstall_cmds='base_file=`basename \$file`~
|
|
|
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
|
|
|
dldir=$destdir/`dirname \$dlpath`~
|
|
|
@@ -2561,6 +2588,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
|
|
|
eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
|
|
|
fi'
|
|
|
+ fi
|
|
|
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
|
|
|
dlpath=$dir/\$dldll~
|
|
|
$RM \$dlpath'
|
|
|
@@ -2573,7 +2601,7 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
|
m4_if([$1], [],[
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
|
|
;;
|
|
|
- mingw* | cegcc*)
|
|
|
+ mingw* | windows* | cegcc*)
|
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
|
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
|
|
|
;;
|
|
|
@@ -2592,7 +2620,7 @@ m4_if([$1], [],[
|
|
|
library_names_spec='$libname.dll.lib'
|
|
|
|
|
|
case $build_os in
|
|
|
- mingw*)
|
|
|
+ mingw* | windows*)
|
|
|
sys_lib_search_path_spec=
|
|
|
lt_save_ifs=$IFS
|
|
|
IFS=';'
|
|
|
@@ -2712,7 +2740,21 @@ freebsd* | dragonfly* | midnightbsd*)
|
|
|
need_version=no
|
|
|
;;
|
|
|
esac
|
|
|
- shlibpath_var=LD_LIBRARY_PATH
|
|
|
+ case $host_cpu in
|
|
|
+ powerpc64)
|
|
|
+ # On FreeBSD bi-arch platforms, a different variable is used for 32-bit
|
|
|
+ # binaries. See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.
|
|
|
+ AC_COMPILE_IFELSE(
|
|
|
+ [AC_LANG_SOURCE(
|
|
|
+ [[int test_pointer_size[sizeof (void *) - 5];
|
|
|
+ ]])],
|
|
|
+ [shlibpath_var=LD_LIBRARY_PATH],
|
|
|
+ [shlibpath_var=LD_32_LIBRARY_PATH])
|
|
|
+ ;;
|
|
|
+ *)
|
|
|
+ shlibpath_var=LD_LIBRARY_PATH
|
|
|
+ ;;
|
|
|
+ esac
|
|
|
case $host_os in
|
|
|
freebsd2.*)
|
|
|
shlibpath_overrides_runpath=yes
|
|
|
@@ -2853,7 +2895,7 @@ 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'
|
|
|
+ library_names_spec='$libname$release$shared_ext $libname$shared_ext'
|
|
|
soname_spec='$libname$release$shared_ext'
|
|
|
finish_cmds=
|
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
|
@@ -2865,8 +2907,9 @@ linux*android*)
|
|
|
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'
|
|
|
+ # -rpath works at least for libraries that are not overridden by
|
|
|
+ # libraries installed in system locations.
|
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
|
|
;;
|
|
|
|
|
|
# This must be glibc/ELF.
|
|
|
@@ -2900,7 +2943,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
|
|
# before this can be enabled.
|
|
|
hardcode_into_libs=yes
|
|
|
|
|
|
- # Ideally, we could use ldconfig to report *all* directores which are
|
|
|
+ # Ideally, we could use ldconfig to report *all* directories 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,
|
|
|
@@ -2957,7 +3000,7 @@ newsos6)
|
|
|
dynamic_linker='ldqnx.so'
|
|
|
;;
|
|
|
|
|
|
-openbsd* | bitrig*)
|
|
|
+openbsd*)
|
|
|
version_type=sunos
|
|
|
sys_lib_dlsearch_path_spec=/usr/lib
|
|
|
need_lib_prefix=no
|
|
|
@@ -3289,7 +3332,7 @@ 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*)
|
|
|
+ *-*-mingw* | *-*-windows*)
|
|
|
# gcc leaves a trailing carriage return, which upsets mingw
|
|
|
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
|
|
*)
|
|
|
@@ -3398,7 +3441,7 @@ case $reload_flag in
|
|
|
esac
|
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
|
case $host_os in
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
if test yes != "$GCC"; then
|
|
|
reload_cmds=false
|
|
|
fi
|
|
|
@@ -3470,7 +3513,6 @@ lt_cv_deplibs_check_method='unknown'
|
|
|
# 'none' -- dependencies not supported.
|
|
|
# 'unknown' -- same as none, but documents that we really don't know.
|
|
|
# 'pass_all' -- all dependencies passed with no checks.
|
|
|
-# 'test_compile' -- check by making test program.
|
|
|
# 'file_magic [[regex]]' -- check by looking for files in library path
|
|
|
# that responds to the $file_magic_cmd with a given extended regex.
|
|
|
# If you have 'file' or equivalent on your system and you're not sure
|
|
|
@@ -3497,7 +3539,7 @@ cygwin*)
|
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
|
;;
|
|
|
|
|
|
-mingw* | pw32*)
|
|
|
+mingw* | windows* | 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.
|
|
|
@@ -3506,7 +3548,7 @@ mingw* | pw32*)
|
|
|
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)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
|
|
|
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
|
|
fi
|
|
|
;;
|
|
|
@@ -3597,7 +3639,7 @@ newos6*)
|
|
|
lt_cv_deplibs_check_method=pass_all
|
|
|
;;
|
|
|
|
|
|
-openbsd* | bitrig*)
|
|
|
+openbsd*)
|
|
|
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
|
|
|
@@ -3661,7 +3703,7 @@ file_magic_glob=
|
|
|
want_nocaseglob=no
|
|
|
if test "$build" = "$host"; then
|
|
|
case $host_os in
|
|
|
- mingw* | pw32*)
|
|
|
+ mingw* | windows* | pw32*)
|
|
|
if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
|
|
|
want_nocaseglob=yes
|
|
|
else
|
|
|
@@ -3713,7 +3755,7 @@ else
|
|
|
# Tru64's nm complains that /dev/null is an invalid object file
|
|
|
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
|
|
|
case $build_os in
|
|
|
- mingw*) lt_bad_file=conftest.nm/nofile ;;
|
|
|
+ mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
|
|
|
*) lt_bad_file=/dev/null ;;
|
|
|
esac
|
|
|
case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
|
|
|
@@ -3804,7 +3846,7 @@ lt_cv_sharedlib_from_linklib_cmd,
|
|
|
[lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
|
|
case $host_os in
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
# two different shell functions defined in ltmain.sh;
|
|
|
# decide which one to use based on capabilities of $DLLTOOL
|
|
|
case `$DLLTOOL --help 2>&1` in
|
|
|
@@ -3836,16 +3878,16 @@ _LT_DECL([], [sharedlib_from_linklib_cmd], [1],
|
|
|
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
|
|
|
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_manifest_tool],
|
|
|
+ [lt_cv_path_manifest_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
|
|
|
+ lt_cv_path_manifest_tool=yes
|
|
|
fi
|
|
|
rm -f conftest*])
|
|
|
-if test yes != "$lt_cv_path_mainfest_tool"; then
|
|
|
+if test yes != "$lt_cv_path_manifest_tool"; then
|
|
|
MANIFEST_TOOL=:
|
|
|
fi
|
|
|
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
|
|
|
@@ -3874,7 +3916,7 @@ AC_DEFUN([LT_LIB_M],
|
|
|
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
LIBM=
|
|
|
case $host in
|
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
|
|
|
# These system don't have libm, or don't need it
|
|
|
;;
|
|
|
*-ncr-sysv4.3*)
|
|
|
@@ -3949,7 +3991,7 @@ case $host_os in
|
|
|
aix*)
|
|
|
symcode='[[BCDT]]'
|
|
|
;;
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
symcode='[[ABCDGISTW]]'
|
|
|
;;
|
|
|
hpux*)
|
|
|
@@ -3964,7 +4006,7 @@ osf*)
|
|
|
symcode='[[BCDEGQRST]]'
|
|
|
;;
|
|
|
solaris*)
|
|
|
- symcode='[[BDRT]]'
|
|
|
+ symcode='[[BCDRT]]'
|
|
|
;;
|
|
|
sco3.2v5*)
|
|
|
symcode='[[DT]]'
|
|
|
@@ -4028,7 +4070,7 @@ $lt_c_name_lib_hook\
|
|
|
# Handle CRLF in mingw tool chain
|
|
|
opt_cr=
|
|
|
case $build_os in
|
|
|
-mingw*)
|
|
|
+mingw* | windows*)
|
|
|
opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
|
|
|
;;
|
|
|
esac
|
|
|
@@ -4079,7 +4121,7 @@ void nm_test_func(void){}
|
|
|
#ifdef __cplusplus
|
|
|
}
|
|
|
#endif
|
|
|
-int main(){nm_test_var='a';nm_test_func();return(0);}
|
|
|
+int main(void){nm_test_var='a';nm_test_func();return(0);}
|
|
|
_LT_EOF
|
|
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
|
|
@@ -4255,7 +4297,7 @@ m4_if([$1], [CXX], [
|
|
|
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
|
|
# PIC is the default for these OSes.
|
|
|
;;
|
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
|
+ mingw* | windows* | 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).
|
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
|
@@ -4331,7 +4373,7 @@ m4_if([$1], [CXX], [
|
|
|
;;
|
|
|
esac
|
|
|
;;
|
|
|
- mingw* | cygwin* | os2* | pw32* | cegcc*)
|
|
|
+ mingw* | windows* | 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], [],
|
|
|
@@ -4579,7 +4621,7 @@ m4_if([$1], [CXX], [
|
|
|
# PIC is the default for these OSes.
|
|
|
;;
|
|
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
|
+ mingw* | windows* | 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).
|
|
|
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
|
|
@@ -4683,7 +4725,7 @@ m4_if([$1], [CXX], [
|
|
|
esac
|
|
|
;;
|
|
|
|
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
|
+ mingw* | windows* | 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], [],
|
|
|
@@ -4725,6 +4767,12 @@ m4_if([$1], [CXX], [
|
|
|
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
|
|
;;
|
|
|
+ *flang* | ftn)
|
|
|
+ # Flang 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'
|
|
|
+ ;;
|
|
|
# icc used to be incompatible with GCC.
|
|
|
# ICC 10 doesn't accept -KPIC any more.
|
|
|
icc* | ifort*)
|
|
|
@@ -4958,7 +5006,7 @@ m4_if([$1], [CXX], [
|
|
|
pw32*)
|
|
|
_LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
|
|
|
;;
|
|
|
- cygwin* | mingw* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | cegcc*)
|
|
|
case $cc_basename in
|
|
|
cl* | icl*)
|
|
|
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
|
@@ -5016,7 +5064,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
|
|
extract_expsyms_cmds=
|
|
|
|
|
|
case $host_os in
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
# FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
|
|
|
# When not using gcc, we currently assume that we are using
|
|
|
# Microsoft Visual C++ or Intel C++ Compiler.
|
|
|
@@ -5028,7 +5076,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
|
|
# we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
|
|
|
with_gnu_ld=yes
|
|
|
;;
|
|
|
- openbsd* | bitrig*)
|
|
|
+ openbsd*)
|
|
|
with_gnu_ld=no
|
|
|
;;
|
|
|
esac
|
|
|
@@ -5131,7 +5179,7 @@ _LT_EOF
|
|
|
fi
|
|
|
;;
|
|
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
# _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'
|
|
|
@@ -5187,7 +5235,7 @@ _LT_EOF
|
|
|
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(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
|
|
|
_LT_TAGVAR(file_list_spec, $1)='@'
|
|
|
;;
|
|
|
@@ -5588,7 +5636,7 @@ _LT_EOF
|
|
|
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
|
|
|
;;
|
|
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
# When not using gcc, we currently assume that we are using
|
|
|
# Microsoft Visual C++ or Intel C++ Compiler.
|
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
|
@@ -5605,14 +5653,14 @@ _LT_EOF
|
|
|
# Tell ltmain to make .dll files, not .so files.
|
|
|
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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
|
|
|
+ _LT_TAGVAR(archive_cmds, $1)='$CC -Fe $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"~
|
|
|
+ $CC -Fe $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'
|
|
|
@@ -5850,7 +5898,7 @@ _LT_EOF
|
|
|
*nto* | *qnx*)
|
|
|
;;
|
|
|
|
|
|
- openbsd* | bitrig*)
|
|
|
+ openbsd*)
|
|
|
if test -f /usr/libexec/ld.so; then
|
|
|
_LT_TAGVAR(hardcode_direct, $1)=yes
|
|
|
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
|
|
@@ -5893,7 +5941,7 @@ _LT_EOF
|
|
|
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(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
|
|
|
_LT_TAGVAR(file_list_spec, $1)='@'
|
|
|
;;
|
|
|
@@ -6187,7 +6235,7 @@ _LT_TAGDECL([], [hardcode_direct], [0],
|
|
|
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
|
|
|
[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
|
|
|
@@ -6245,7 +6293,7 @@ _LT_TAGVAR(objext, $1)=$objext
|
|
|
lt_simple_compile_test_code="int some_variable = 0;"
|
|
|
|
|
|
# Code to be used in simple link tests
|
|
|
-lt_simple_link_test_code='int main(){return(0);}'
|
|
|
+lt_simple_link_test_code='int main(void){return(0);}'
|
|
|
|
|
|
_LT_TAG_COMPILER
|
|
|
# Save the default compiler, since it gets overwritten when the other
|
|
|
@@ -6434,8 +6482,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
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
|
|
|
+ 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'
|
|
|
else
|
|
|
_LT_TAGVAR(whole_archive_flag_spec, $1)=
|
|
|
@@ -6455,7 +6502,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
# 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"'
|
|
|
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"'
|
|
|
|
|
|
else
|
|
|
GXX=no
|
|
|
@@ -6664,7 +6711,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
esac
|
|
|
;;
|
|
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
|
+ cygwin* | mingw* | windows* | pw32* | cegcc*)
|
|
|
case $GXX,$cc_basename in
|
|
|
,cl* | no,cl* | ,icl* | no,icl*)
|
|
|
# Native MSVC or ICC
|
|
|
@@ -6763,7 +6810,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
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(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
|
|
|
_LT_TAGVAR(file_list_spec, $1)='@'
|
|
|
;;
|
|
|
@@ -6831,7 +6878,7 @@ if test yes != "$_lt_caught_CXX_error"; 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 yes = "$GXX"; then
|
|
|
@@ -6896,7 +6943,7 @@ if test yes != "$_lt_caught_CXX_error"; 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 yes = "$GXX"; then
|
|
|
@@ -7144,7 +7191,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
_LT_TAGVAR(ld_shlibs, $1)=yes
|
|
|
;;
|
|
|
|
|
|
- openbsd* | bitrig*)
|
|
|
+ openbsd*)
|
|
|
if test -f /usr/libexec/ld.so; then
|
|
|
_LT_TAGVAR(hardcode_direct, $1)=yes
|
|
|
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
|
|
@@ -7235,7 +7282,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
# 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"'
|
|
|
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"'
|
|
|
|
|
|
else
|
|
|
# FIXME: insert proper C++ library support
|
|
|
@@ -7319,7 +7366,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
# 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"'
|
|
|
+ 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
|
|
|
# platform.
|
|
|
@@ -7330,7 +7377,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|
|
# 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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
|
|
+ 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'
|
|
|
@@ -7568,10 +7615,11 @@ if AC_TRY_EVAL(ac_compile); then
|
|
|
case $prev$p in
|
|
|
|
|
|
-L* | -R* | -l*)
|
|
|
- # Some compilers place space between "-{L,R}" and the path.
|
|
|
+ # Some compilers place space between "-{L,R,l}" and the path.
|
|
|
# Remove the space.
|
|
|
- if test x-L = "$p" ||
|
|
|
- test x-R = "$p"; then
|
|
|
+ if test x-L = x"$p" ||
|
|
|
+ test x-R = x"$p" ||
|
|
|
+ test x-l = x"$p"; then
|
|
|
prev=$p
|
|
|
continue
|
|
|
fi
|
|
|
@@ -8229,7 +8277,7 @@ AC_SUBST([DLLTOOL])
|
|
|
# ----------------
|
|
|
# Check for a file(cmd) program that can be used to detect file type and magic
|
|
|
m4_defun([_LT_DECL_FILECMD],
|
|
|
-[AC_CHECK_TOOL([FILECMD], [file], [:])
|
|
|
+[AC_CHECK_PROG([FILECMD], [file], [file], [:])
|
|
|
_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])
|
|
|
])# _LD_DECL_FILECMD
|
|
|
|
|
|
@@ -8245,73 +8293,6 @@ _LT_DECL([], [SED], [1], [A sed program that does not truncate output])
|
|
|
_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
|
|
|
[Sed that helps us avoid accidentally triggering echo(1) options like -n])
|
|
|
])# _LT_DECL_SED
|
|
|
-
|
|
|
-m4_ifndef([AC_PROG_SED], [
|
|
|
-############################################################
|
|
|
-# NOTE: This macro has been submitted for inclusion into #
|
|
|
-# GNU Autoconf as AC_PROG_SED. When it is available in #
|
|
|
-# a released version of Autoconf we should remove this #
|
|
|
-# macro and use it instead. #
|
|
|
-############################################################
|
|
|
-
|
|
|
-m4_defun([AC_PROG_SED],
|
|
|
-[AC_MSG_CHECKING([for a sed that does not truncate output])
|
|
|
-AC_CACHE_VAL(lt_cv_path_SED,
|
|
|
-[# Loop through the user's path and test for sed and gsed.
|
|
|
-# Then use that list of sed's as ones to test for truncation.
|
|
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
|
-for as_dir in $PATH
|
|
|
-do
|
|
|
- IFS=$as_save_IFS
|
|
|
- test -z "$as_dir" && as_dir=.
|
|
|
- for lt_ac_prog in sed gsed; do
|
|
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
|
|
|
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
|
|
|
- fi
|
|
|
- done
|
|
|
- done
|
|
|
-done
|
|
|
-IFS=$as_save_IFS
|
|
|
-lt_ac_max=0
|
|
|
-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
|
|
|
- cat /dev/null > conftest.in
|
|
|
- lt_ac_count=0
|
|
|
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
|
|
|
- # Check for GNU sed and select it if it is found.
|
|
|
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
|
|
|
- lt_cv_path_SED=$lt_ac_sed
|
|
|
- break
|
|
|
- fi
|
|
|
- while true; do
|
|
|
- cat conftest.in conftest.in >conftest.tmp
|
|
|
- mv conftest.tmp conftest.in
|
|
|
- cp conftest.in conftest.nl
|
|
|
- echo >>conftest.nl
|
|
|
- $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 10 -lt "$lt_ac_count" && break
|
|
|
- lt_ac_count=`expr $lt_ac_count + 1`
|
|
|
- if test "$lt_ac_count" -gt "$lt_ac_max"; then
|
|
|
- lt_ac_max=$lt_ac_count
|
|
|
- lt_cv_path_SED=$lt_ac_sed
|
|
|
- fi
|
|
|
- done
|
|
|
-done
|
|
|
-])
|
|
|
-SED=$lt_cv_path_SED
|
|
|
-AC_SUBST([SED])
|
|
|
-AC_MSG_RESULT([$SED])
|
|
|
-])#AC_PROG_SED
|
|
|
-])#m4_ifndef
|
|
|
-
|
|
|
-# Old name:
|
|
|
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
|
|
|
dnl aclocal-1.4 backwards compatibility:
|
|
|
dnl AC_DEFUN([LT_AC_PROG_SED], [])
|
|
|
|
|
|
@@ -8358,7 +8339,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
|
|
|
[case $host in
|
|
|
*-*-mingw* )
|
|
|
case $build in
|
|
|
- *-*-mingw* ) # actually msys
|
|
|
+ *-*-mingw* | *-*-windows* ) # actually msys
|
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
|
;;
|
|
|
*-*-cygwin* )
|
|
|
@@ -8371,7 +8352,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
|
|
|
;;
|
|
|
*-*-cygwin* )
|
|
|
case $build in
|
|
|
- *-*-mingw* ) # actually msys
|
|
|
+ *-*-mingw* | *-*-windows* ) # actually msys
|
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
|
;;
|
|
|
*-*-cygwin* )
|
|
|
@@ -8397,9 +8378,9 @@ AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
|
|
|
[#assume ordinary cross tools, or native build.
|
|
|
lt_cv_to_tool_file_cmd=func_convert_file_noop
|
|
|
case $host in
|
|
|
- *-*-mingw* )
|
|
|
+ *-*-mingw* | *-*-windows* )
|
|
|
case $build in
|
|
|
- *-*-mingw* ) # actually msys
|
|
|
+ *-*-mingw* | *-*-windows* ) # actually msys
|
|
|
lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
|
|
|
;;
|
|
|
esac
|
Martin Prikryl