diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libtool.m4 | 227 | ||||
| -rw-r--r-- | m4/ltoptions.m4 | 4 | ||||
| -rw-r--r-- | m4/ltsugar.m4 | 2 | ||||
| -rw-r--r-- | m4/ltversion.m4 | 13 | ||||
| -rw-r--r-- | m4/lt~obsolete.m4 | 4 | 
5 files changed, 141 insertions, 109 deletions
| diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 4e87d34..717e769 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,6 +1,7 @@  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-  # -#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +#   Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +#   Foundation, Inc.  #   Written by Gordon Matzigkeit, 1996  #  # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl  # along with this program.  If not, see <http://www.gnu.org/licenses/>.  ]) -# serial 58 LT_INIT +# serial 59 LT_INIT  # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ 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_DECL_FILECMD])dnl  m4_require([_LT_CHECK_MAGIC_METHOD])dnl  m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl  m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ esac  ofile=libtool  can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib').  libext=a  with_gnu_ld=$lt_cv_prog_gnu_ld @@ -777,7 +779,7 @@ _LT_EOF    # 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" \ +  $SED '$q' "$ltmain" >> "$cfgfile" \       || (rm -f "$cfgfile"; exit 1)     mv -f "$cfgfile" "$ofile" || @@ -1041,8 +1043,8 @@ 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 "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD +      $AR $AR_FLAGS 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 @@ -1066,17 +1068,12 @@ _LT_EOF        _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;      darwin1.*)        _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; -    darwin*) # darwin 5.x on -      # if running on 10.5 or later, the deployment target defaults -      # to the OS version, if on x86, and 10.4, the deployment -      # target defaults to 10.4. Don't you love it? -      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; -	10.[[012]][[,.]]*) -	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; -	10.*) -	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; +    darwin*) +      case $MACOSX_DEPLOYMENT_TARGET,$host in +        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' ;;        esac      ;;    esac @@ -1125,12 +1122,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],      output_verbose_link_cmd=func_echo_all      _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"      _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" -    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" -    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" +    _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" +    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"      m4_if([$1], [CXX],  [   if test yes != "$lt_cv_apple_cc_single_mod"; then        _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" -      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" +      _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"      fi  ],[])    else @@ -1244,7 +1241,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])  # _LT_WITH_SYSROOT  # ----------------  AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot])  AC_ARG_WITH([sysroot],  [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],    [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1261,7 +1259,7 @@ case $with_sysroot in #(     fi     ;; #(   /*) -   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` +   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`     ;; #(   no|'')     ;; #( @@ -1291,7 +1289,7 @@ ia64-*-hpux*)    # options accordingly.    echo 'int i;' > conftest.$ac_ext    if AC_TRY_EVAL(ac_compile); then -    case `/usr/bin/file conftest.$ac_objext` in +    case `$FILECMD conftest.$ac_objext` in        *ELF-32*)  	HPUX_IA64_MODE=32  	;; @@ -1308,7 +1306,7 @@ ia64-*-hpux*)    echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext    if AC_TRY_EVAL(ac_compile); then      if test yes = "$lt_cv_prog_gnu_ld"; then -      case `/usr/bin/file conftest.$ac_objext` in +      case `$FILECMD conftest.$ac_objext` in  	*32-bit*)  	  LD="${LD-ld} -melf32bsmip"  	  ;; @@ -1320,7 +1318,7 @@ ia64-*-hpux*)  	;;        esac      else -      case `/usr/bin/file conftest.$ac_objext` in +      case `$FILECMD conftest.$ac_objext` in  	*32-bit*)  	  LD="${LD-ld} -32"  	  ;; @@ -1342,7 +1340,7 @@ mips64*-*linux*)    echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext    if AC_TRY_EVAL(ac_compile); then      emul=elf -    case `/usr/bin/file conftest.$ac_objext` in +    case `$FILECMD conftest.$ac_objext` in        *32-bit*)  	emul="${emul}32"  	;; @@ -1350,7 +1348,7 @@ mips64*-*linux*)  	emul="${emul}64"  	;;      esac -    case `/usr/bin/file conftest.$ac_objext` in +    case `$FILECMD conftest.$ac_objext` in        *MSB*)  	emul="${emul}btsmip"  	;; @@ -1358,7 +1356,7 @@ mips64*-*linux*)  	emul="${emul}ltsmip"  	;;      esac -    case `/usr/bin/file conftest.$ac_objext` in +    case `$FILECMD conftest.$ac_objext` in        *N32*)  	emul="${emul}n32"  	;; @@ -1378,14 +1376,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)    # not appear in the list.    echo 'int i;' > conftest.$ac_ext    if AC_TRY_EVAL(ac_compile); then -    case `/usr/bin/file conftest.o` in +    case `$FILECMD conftest.o` in        *32-bit*)  	case $host in  	  x86_64-*kfreebsd*-gnu)  	    LD="${LD-ld} -m elf_i386_fbsd"  	    ;;  	  x86_64-*linux*) -	    case `/usr/bin/file conftest.o` in +	    case `$FILECMD conftest.o` in  	      *x86-64*)  		LD="${LD-ld} -m elf32_x86_64"  		;; @@ -1453,7 +1451,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)    # options accordingly.    echo 'int i;' > conftest.$ac_ext    if AC_TRY_EVAL(ac_compile); then -    case `/usr/bin/file conftest.o` in +    case `$FILECMD conftest.o` in      *64-bit*)        case $lt_cv_prog_gnu_ld in        yes*) @@ -1492,9 +1490,22 @@ need_locks=$enable_libtool_lock  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]) + +# 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 +# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], +         [Flags to create an archive])  AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],    [lt_cv_ar_at_file=no @@ -1713,7 +1724,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl      lt_cv_sys_max_cmd_len=8192;      ;; -  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) +  bitrig* | 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` @@ -1756,7 +1767,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl    sysv5* | sco5v6* | sysv4.2uw2*)      kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`      if test -n "$kargmax"; then -      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'` +      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[	 ]]//'`      else        lt_cv_sys_max_cmd_len=32768      fi @@ -2206,26 +2217,35 @@ m4_defun([_LT_CMD_STRIPLIB],  striplib=  old_striplib=  AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -  test -z "$striplib" && striplib="$STRIP --strip-unneeded" -  AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then +  AC_MSG_RESULT([no])  else -# FIXME - insert some real tests, host_os isn't really good enough -  case $host_os in -  darwin*) -    if test -n "$STRIP"; then +  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +    old_striplib="$STRIP --strip-debug" +    striplib="$STRIP --strip-unneeded" +    AC_MSG_RESULT([yes]) +  else +    case $host_os in +    darwin*) +      # FIXME - insert some real tests, host_os isn't really good enough        striplib="$STRIP -x"        old_striplib="$STRIP -S"        AC_MSG_RESULT([yes]) -    else +      ;; +    freebsd*) +      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then +        old_striplib="$STRIP --strip-debug" +        striplib="$STRIP --strip-unneeded" +        AC_MSG_RESULT([yes]) +      else +        AC_MSG_RESULT([no]) +      fi +      ;; +    *)        AC_MSG_RESULT([no]) -    fi -    ;; -  *) -    AC_MSG_RESULT([no]) -    ;; -  esac +      ;; +    esac +  fi  fi  _LT_DECL([], [old_striplib], [1], [Commands to strip libraries])  _LT_DECL([], [striplib], [1]) @@ -2548,7 +2568,7 @@ cygwin* | mingw* | pw32* | cegcc*)      case $host_os in      cygwin*)        # Cygwin DLLs use 'cyg' prefix rather than 'lib' -      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' +      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'  m4_if([$1], [],[        sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])        ;; @@ -2558,14 +2578,14 @@ m4_if([$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' +      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 +  *,cl* | *,icl*) +    # Native MSVC or ICC      libname_spec='$name'      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'      library_names_spec='$libname.dll.lib' @@ -2584,7 +2604,7 @@ m4_if([$1], [],[        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|^ ||'` +      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 @@ -2621,7 +2641,7 @@ m4_if([$1], [],[      ;;    *) -    # Assume MSVC wrapper +    # Assume MSVC and ICC wrapper      library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'      dynamic_linker='Win32 ld.exe'      ;; @@ -2654,7 +2674,7 @@ dgux*)    shlibpath_var=LD_LIBRARY_PATH    ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*)    # DragonFly does not have aout.  When/if they implement a new    # versioning mechanism, adjust this.    if test -x /usr/bin/objformat; then @@ -3453,7 +3473,7 @@ beos*)  bsdi[[45]]*)    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' -  lt_cv_file_magic_cmd='/usr/bin/file -L' +  lt_cv_file_magic_cmd='$FILECMD -L'    lt_cv_file_magic_test_file=/shlib/libc.so    ;; @@ -3487,14 +3507,14 @@ darwin* | rhapsody*)    lt_cv_deplibs_check_method=pass_all    ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*)    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then      case $host_cpu in      i*86 )        # Not sure whether the presence of OpenBSD here was a mistake.        # Let's accept both of them until this is cleared up.        lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -      lt_cv_file_magic_cmd=/usr/bin/file +      lt_cv_file_magic_cmd=$FILECMD        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`        ;;      esac @@ -3508,7 +3528,7 @@ haiku*)    ;;  hpux10.20* | hpux11*) -  lt_cv_file_magic_cmd=/usr/bin/file +  lt_cv_file_magic_cmd=$FILECMD    case $host_cpu in    ia64*)      lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3555,7 +3575,7 @@ netbsd*)  newos6*)    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -  lt_cv_file_magic_cmd=/usr/bin/file +  lt_cv_file_magic_cmd=$FILECMD    lt_cv_file_magic_test_file=/usr/lib/libnls.so    ;; @@ -3682,13 +3702,13 @@ else  	mingw*) lt_bad_file=conftest.nm/nofile ;;  	*) lt_bad_file=/dev/null ;;  	esac -	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in +	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in  	*$lt_bad_file* | *'Invalid file or object type'*)  	  lt_cv_path_NM="$tmp_nm -B"  	  break 2  	  ;;  	*) -	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +	  case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in  	  */dev/null*)  	    lt_cv_path_NM="$tmp_nm -p"  	    break 2 @@ -3714,7 +3734,7 @@ else      # Let the user override the test.    else      AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) -    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in +    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in      *COFF*)        DUMPBIN="$DUMPBIN -symbols -headers"        ;; @@ -3954,7 +3974,7 @@ esac  if test "$lt_cv_nm_interface" = "MS dumpbin"; then    # Gets list of data symbols to import. -  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" +  lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"    # Adjust the below global symbol transforms to fixup imported variables.    lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"    lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'" @@ -3972,20 +3992,20 @@ fi  # Transform an extracted symbol line into a proper C declaration.  # Some systems (esp. on ia64) link data and code symbols differently,  # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\  $lt_cdecl_hook\  " -e 's/^T .* \(.*\)$/extern int \1();/p'"\  " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"  # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\  $lt_c_name_hook\  " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\  " -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"  # Transform an extracted symbol line into symbol name with lib prefix and  # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\  $lt_c_name_lib_hook\  " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\  " -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\ @@ -4009,7 +4029,7 @@ for ac_symprfx in "" "_"; do    if test "$lt_cv_nm_interface" = "MS dumpbin"; then      # Fake it for dumpbin and say T for any non-static function,      # D for any global variable and I for any imported variable. -    # Also find C++ and __fastcall symbols from MSVC++, +    # Also find C++ and __fastcall symbols from MSVC++ or ICC,      # which start with @ or ?.      lt_cv_sys_global_symbol_pipe="$AWK ['"\  "     {last_section=section; section=\$ 3};"\ @@ -4027,9 +4047,9 @@ for ac_symprfx in "" "_"; do  "     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\  "     ' prfx=^$ac_symprfx]"    else -    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" +    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'" +  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 @@ -4316,7 +4336,7 @@ m4_if([$1], [CXX], [  	    ;;  	esac  	;; -      freebsd* | dragonfly*) +      freebsd* | dragonfly* | midnightbsd*)  	# FreeBSD uses GNU C++  	;;        hpux9* | hpux10* | hpux11*) @@ -4399,7 +4419,7 @@ m4_if([$1], [CXX], [  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'  	    ;;  	  *) -	    case `$CC -V 2>&1 | sed 5q` in +	    case `$CC -V 2>&1 | $SED 5q` in  	    *Sun\ C*)  	      # Sun C++ 5.9  	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4735,7 +4755,7 @@ m4_if([$1], [CXX], [  	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'  	;;        *) -	case `$CC -V 2>&1 | sed 5q` in +	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' @@ -4918,7 +4938,7 @@ m4_if([$1], [CXX], [      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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'      else -      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' +      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'      fi      ;;    pw32*) @@ -4926,7 +4946,7 @@ m4_if([$1], [CXX], [      ;;    cygwin* | mingw* | cegcc*)      case $cc_basename in -    cl*) +    cl* | icl*)        _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'        ;;      *) @@ -4983,15 +5003,15 @@ dnl Note also adjust exclude_expsyms for C++ above.    case $host_os in    cygwin* | mingw* | pw32* | cegcc*) -    # FIXME: the MSVC++ port hasn't been tested in a loooong time +    # 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++. +    # Microsoft Visual C++ or Intel C++ Compiler.      if test yes != "$GCC"; then        with_gnu_ld=no      fi      ;;    interix*) -    # we just hope/assume this is gcc and not c89 (= MSVC++) +    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)      with_gnu_ld=yes      ;;    openbsd* | bitrig*) @@ -5043,7 +5063,7 @@ dnl Note also adjust exclude_expsyms for C++ above.        _LT_TAGVAR(whole_archive_flag_spec, $1)=      fi      supports_anon_versioning=no -    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in +    case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in        *GNU\ gold*) supports_anon_versioning=yes ;;        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5155,6 +5175,7 @@ _LT_EOF  	emximp -o $lib $output_objdir/$libname.def'        _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +      _LT_TAGVAR(file_list_spec, $1)='@'        ;;      interix[[3-9]]*) @@ -5169,7 +5190,7 @@ _LT_EOF        # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link        # time.  Moving up from 0x10000000 also allows more sbrk(2) space.        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +      _LT_TAGVAR(archive_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) @@ -5212,7 +5233,7 @@ _LT_EOF  	  _LT_TAGVAR(compiler_needs_object, $1)=yes  	  ;;  	esac -	case `$CC -V 2>&1 | sed 5q` in +	case `$CC -V 2>&1 | $SED 5q` in  	*Sun\ C*)			# Sun C 5.9  	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'  	  _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5224,7 +5245,7 @@ _LT_EOF          if test yes = "$supports_anon_versioning"; then            _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +            cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~              echo "local: *; };" >> $output_objdir/$libname.ver~              $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'          fi @@ -5240,7 +5261,7 @@ _LT_EOF  	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'  	  if test yes = "$supports_anon_versioning"; then  	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +              cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~                echo "local: *; };" >> $output_objdir/$libname.ver~                $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'  	  fi @@ -5372,7 +5393,7 @@ _LT_EOF  	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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'  	else -	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' +	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'  	fi  	aix_use_runtimelinking=no @@ -5555,12 +5576,12 @@ _LT_EOF      cygwin* | mingw* | pw32* | cegcc*)        # When not using gcc, we currently assume that we are using -      # Microsoft Visual C++. +      # Microsoft Visual C++ or Intel C++ Compiler.        # hardcode_libdir_flag_spec is actually meaningless, as there is        # no search path for DLLs.        case $cc_basename in -      cl*) -	# Native MSVC +      cl* | icl*) +	# Native MSVC or ICC  	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '  	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported  	_LT_TAGVAR(always_export_symbols, $1)=yes @@ -5601,7 +5622,7 @@ _LT_EOF            fi'  	;;        *) -	# Assume MSVC wrapper +	# Assume MSVC and ICC wrapper  	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '  	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported  	# Tell ltmain to make .lib files, not .a files. @@ -5649,7 +5670,7 @@ _LT_EOF        ;;      # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -    freebsd* | dragonfly*) +    freebsd* | dragonfly* | midnightbsd*)        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'        _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5860,6 +5881,7 @@ _LT_EOF  	emximp -o $lib $output_objdir/$libname.def'        _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +      _LT_TAGVAR(file_list_spec, $1)='@'        ;;      osf3*) @@ -6630,8 +6652,8 @@ if test yes != "$_lt_caught_CXX_error"; then        cygwin* | mingw* | pw32* | cegcc*)  	case $GXX,$cc_basename in -	,cl* | no,cl*) -	  # Native MSVC +	,cl* | no,cl* | ,icl* | no,icl*) +	  # Native MSVC or ICC  	  # hardcode_libdir_flag_spec is actually meaningless, as there is  	  # no search path for DLLs.  	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6729,6 +6751,7 @@ if test yes != "$_lt_caught_CXX_error"; then  	  emximp -o $lib $output_objdir/$libname.def'  	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'  	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +	_LT_TAGVAR(file_list_spec, $1)='@'  	;;        dgux*) @@ -6759,7 +6782,7 @@ if test yes != "$_lt_caught_CXX_error"; then          _LT_TAGVAR(archive_cmds_need_lc, $1)=no          ;; -      freebsd* | dragonfly*) +      freebsd* | dragonfly* | midnightbsd*)          # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF          # conventions          _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6896,7 +6919,7 @@ if test yes != "$_lt_caught_CXX_error"; then  	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link  	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.  	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +	_LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'  	;;        irix5* | irix6*)          case $cc_basename in @@ -7036,13 +7059,13 @@ if test yes != "$_lt_caught_CXX_error"; then  	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'  	    if test yes = "$supports_anon_versioning"; then  	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +                cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~                  echo "local: *; };" >> $output_objdir/$libname.ver~                  $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'  	    fi  	    ;;  	  *) -	    case `$CC -V 2>&1 | sed 5q` in +	    case `$CC -V 2>&1 | $SED 5q` in  	    *Sun\ C*)  	      # Sun C++ 5.9  	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8188,6 +8211,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program])  AC_SUBST([DLLTOOL])  ]) +# _LT_DECL_FILECMD +# ---------------- +# 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], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD +  # _LT_DECL_SED  # ------------  # Check for a fully-functional sed program, that truncates diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 94b0829..b0b5e9c 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,7 +1,7 @@  # Helper functions for option handling.                    -*- Autoconf -*-  # -#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -#   Foundation, Inc. +#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +#   Software Foundation, Inc.  #   Written by Gary V. Vaughan, 2004  #  # This file is free software; the Free Software Foundation gives diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 48bc934..902508b 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,6 @@  # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-  # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software  # Foundation, Inc.  # Written by Gary V. Vaughan, 2004  # diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index fa04b52..b155d0a 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,7 @@  # ltversion.m4 -- version numbers			-*- Autoconf -*-  # -#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +#   Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +#   Inc.  #   Written by Scott James Remnant, 2004  #  # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@  # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4  # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7])  AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7'  _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])  _LT_DECL(, macro_revision, 0)  ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c6b26f8..0f7a875 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,7 +1,7 @@  # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-  # -#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -#   Foundation, Inc. +#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +#   Software Foundation, Inc.  #   Written by Scott James Remnant, 2004.  #  # This file is free software; the Free Software Foundation gives | 
