kopia lustrzana https://github.com/Hamlib/Hamlib
1.5-8 update
git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1645 7ae35d74-ebe9-4afe-98af-79ac388436b8Hamlib-1.2.0
Stéphane Fillod, F8CFE
rodzic
523b084f86
commit
d0fab077c4
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.7.7 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.7.9 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
||||
|
|
@ -500,7 +500,7 @@ install-am: all-am
|
|||
installcheck: installcheck-am
|
||||
install-strip:
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
INSTALL_STRIP_FLAG=-s \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
`test -z '$(STRIP)' || \
|
||||
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
||||
mostlyclean-generic:
|
||||
|
|
@ -522,7 +522,6 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
|
|||
distclean: distclean-am
|
||||
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
||||
-rm -f Makefile
|
||||
|
||||
distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
|
||||
distclean-libtool distclean-tags
|
||||
|
||||
|
|
@ -548,7 +547,6 @@ maintainer-clean: maintainer-clean-am
|
|||
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
||||
-rm -rf $(top_srcdir)/autom4te.cache
|
||||
-rm -f Makefile
|
||||
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
mostlyclean: mostlyclean-am
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# generated automatically by aclocal 1.7.7 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
||||
# Free Software Foundation, Inc.
|
||||
|
|
@ -163,7 +163,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
|
|||
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
||||
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.7.7])])
|
||||
[AM_AUTOMAKE_VERSION([1.7.9])])
|
||||
|
||||
# Helper functions for option handling. -*- Autoconf -*-
|
||||
|
||||
|
|
@ -901,7 +901,7 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
|
|||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
|
||||
# serial 47 AC_PROG_LIBTOOL
|
||||
# Debian $Rev: 100 $
|
||||
# Debian $Rev: 149 $
|
||||
|
||||
|
||||
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
||||
|
|
@ -2327,8 +2327,11 @@ linux*)
|
|||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
# /usr/X11R6/lib and /usr/local/lib are common enough...
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
# powerpc, because MkLinux only supported shared libraries with the
|
||||
|
|
@ -2999,12 +3002,19 @@ bsdi4*)
|
|||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
;;
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
cygwin*)
|
||||
# win32_libid is a shell function defined in ltmain.sh
|
||||
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
|
||||
lt_cv_file_magic_cmd='win32_libid'
|
||||
;;
|
||||
|
||||
mingw* | pw32*)
|
||||
# Base MSYS/MinGW do not provide the 'file' command needed by
|
||||
# win32_libid shell function, so use a weaker test based on 'objdump'.
|
||||
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
|
||||
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
||||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,193 +1,309 @@
|
|||
/* config-h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define to 1 if you have the `argz_append' function. */
|
||||
/*
|
||||
Define to 1 if you have the `argz_append'
|
||||
function. */
|
||||
#undef HAVE_ARGZ_APPEND
|
||||
|
||||
/* Define to 1 if you have the `argz_create_sep' function. */
|
||||
/*
|
||||
Define to 1 if you have the `argz_create_sep'
|
||||
function. */
|
||||
#undef HAVE_ARGZ_CREATE_SEP
|
||||
|
||||
/* Define to 1 if you have the <argz.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <argz.h>
|
||||
header file. */
|
||||
#undef HAVE_ARGZ_H
|
||||
|
||||
/* Define to 1 if you have the `argz_insert' function. */
|
||||
/*
|
||||
Define to 1 if you have the `argz_insert'
|
||||
function. */
|
||||
#undef HAVE_ARGZ_INSERT
|
||||
|
||||
/* Define to 1 if you have the `argz_next' function. */
|
||||
/*
|
||||
Define to 1 if you have the `argz_next'
|
||||
function. */
|
||||
#undef HAVE_ARGZ_NEXT
|
||||
|
||||
/* Define to 1 if you have the `argz_stringify' function. */
|
||||
/*
|
||||
Define to 1 if you have the `argz_stringify'
|
||||
function. */
|
||||
#undef HAVE_ARGZ_STRINGIFY
|
||||
|
||||
/* Define to 1 if you have the <assert.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <assert.h>
|
||||
header file. */
|
||||
#undef HAVE_ASSERT_H
|
||||
|
||||
/* Define to 1 if you have the `bcopy' function. */
|
||||
/*
|
||||
Define to 1 if you have the `bcopy'
|
||||
function. */
|
||||
#undef HAVE_BCOPY
|
||||
|
||||
/* Define to 1 if you have the `closedir' function. */
|
||||
/*
|
||||
Define to 1 if you have the `closedir'
|
||||
function. */
|
||||
#undef HAVE_CLOSEDIR
|
||||
|
||||
/* Define to 1 if you have the <ctype.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <ctype.h>
|
||||
header file. */
|
||||
#undef HAVE_CTYPE_H
|
||||
|
||||
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
|
||||
*/
|
||||
/*
|
||||
Define to 1 if you have the <dirent.h>
|
||||
header file, and it defines `DIR'. */
|
||||
#undef HAVE_DIRENT_H
|
||||
|
||||
/* Define if you have the GNU dld library. */
|
||||
/*
|
||||
Define if you have the GNU dld library.
|
||||
*/
|
||||
#undef HAVE_DLD
|
||||
|
||||
/* Define to 1 if you have the <dld.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <dld.h>
|
||||
header file. */
|
||||
#undef HAVE_DLD_H
|
||||
|
||||
/* Define to 1 if you have the `dlerror' function. */
|
||||
/*
|
||||
Define to 1 if you have the `dlerror'
|
||||
function. */
|
||||
#undef HAVE_DLERROR
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <dlfcn.h>
|
||||
header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
/* Define to 1 if you have the <dl.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <dl.h>
|
||||
header file. */
|
||||
#undef HAVE_DL_H
|
||||
|
||||
/* Define if you have the _dyld_func_lookup function. */
|
||||
/*
|
||||
Define if you have the _dyld_func_lookup function. */
|
||||
#undef HAVE_DYLD
|
||||
|
||||
/* Define to 1 if you have the <errno.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <errno.h>
|
||||
header file. */
|
||||
#undef HAVE_ERRNO_H
|
||||
|
||||
/* Define to 1 if the system has the type `error_t'. */
|
||||
/*
|
||||
Define to 1 if the system has the
|
||||
type `error_t'. */
|
||||
#undef HAVE_ERROR_T
|
||||
|
||||
/* Define to 1 if you have the `index' function. */
|
||||
/*
|
||||
Define to 1 if you have the `index'
|
||||
function. */
|
||||
#undef HAVE_INDEX
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <inttypes.h>
|
||||
header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define if you have the libdl library or equivalent. */
|
||||
/*
|
||||
Define if you have the libdl library or
|
||||
equivalent. */
|
||||
#undef HAVE_LIBDL
|
||||
|
||||
/* Define to 1 if you have the <mach-o/dyld.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <mach-o/dyld.h>
|
||||
header file. */
|
||||
#undef HAVE_MACH_O_DYLD_H
|
||||
|
||||
/* Define to 1 if you have the <malloc.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <malloc.h>
|
||||
header file. */
|
||||
#undef HAVE_MALLOC_H
|
||||
|
||||
/* Define to 1 if you have the `memcpy' function. */
|
||||
/*
|
||||
Define to 1 if you have the `memcpy'
|
||||
function. */
|
||||
#undef HAVE_MEMCPY
|
||||
|
||||
/* Define to 1 if you have the `memmove' function. */
|
||||
/*
|
||||
Define to 1 if you have the `memmove'
|
||||
function. */
|
||||
#undef HAVE_MEMMOVE
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <memory.h>
|
||||
header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
|
||||
/*
|
||||
Define to 1 if you have the <ndir.h>
|
||||
header file, and it defines `DIR'. */
|
||||
#undef HAVE_NDIR_H
|
||||
|
||||
/* Define to 1 if you have the `opendir' function. */
|
||||
/*
|
||||
Define to 1 if you have the `opendir'
|
||||
function. */
|
||||
#undef HAVE_OPENDIR
|
||||
|
||||
/* Define if libtool can extract symbol lists from object files. */
|
||||
/*
|
||||
Define if libtool can extract symbol lists from
|
||||
object files. */
|
||||
#undef HAVE_PRELOADED_SYMBOLS
|
||||
|
||||
/* Define to 1 if you have the `readdir' function. */
|
||||
/*
|
||||
Define to 1 if you have the `readdir'
|
||||
function. */
|
||||
#undef HAVE_READDIR
|
||||
|
||||
/* Define to 1 if you have the `rindex' function. */
|
||||
/*
|
||||
Define to 1 if you have the `rindex'
|
||||
function. */
|
||||
#undef HAVE_RINDEX
|
||||
|
||||
/* Define if you have the shl_load function. */
|
||||
/*
|
||||
Define if you have the shl_load function. */
|
||||
#undef HAVE_SHL_LOAD
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <stdint.h>
|
||||
header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define to 1 if you have the <stdio.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <stdio.h>
|
||||
header file. */
|
||||
#undef HAVE_STDIO_H
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <stdlib.h>
|
||||
header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to 1 if you have the `strchr' function. */
|
||||
/*
|
||||
Define to 1 if you have the `strchr'
|
||||
function. */
|
||||
#undef HAVE_STRCHR
|
||||
|
||||
/* Define to 1 if you have the `strcmp' function. */
|
||||
/*
|
||||
Define to 1 if you have the `strcmp'
|
||||
function. */
|
||||
#undef HAVE_STRCMP
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <strings.h>
|
||||
header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <string.h>
|
||||
header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to 1 if you have the `strrchr' function. */
|
||||
/*
|
||||
Define to 1 if you have the `strrchr'
|
||||
function. */
|
||||
#undef HAVE_STRRCHR
|
||||
|
||||
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
|
||||
*/
|
||||
/*
|
||||
Define to 1 if you have the <sys/dir.h>
|
||||
header file, and it defines `DIR'. */
|
||||
#undef HAVE_SYS_DIR_H
|
||||
|
||||
/* Define to 1 if you have the <sys/dl.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <sys/dl.h>
|
||||
header file. */
|
||||
#undef HAVE_SYS_DL_H
|
||||
|
||||
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
|
||||
*/
|
||||
/*
|
||||
Define to 1 if you have the <sys/ndir.h>
|
||||
header file, and it defines `DIR'. */
|
||||
#undef HAVE_SYS_NDIR_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <sys/stat.h>
|
||||
header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <sys/types.h>
|
||||
header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
/*
|
||||
Define to 1 if you have the <unistd.h>
|
||||
header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define if the OS needs help to load dependent libraries for dlopen(). */
|
||||
/*
|
||||
Define if the OS needs help to load
|
||||
dependent libraries for dlopen(). */
|
||||
#undef LTDL_DLOPEN_DEPLIBS
|
||||
|
||||
/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
||||
*/
|
||||
/*
|
||||
Define to the sub-directory in which libtool stores
|
||||
uninstalled libraries. */
|
||||
#undef LTDL_OBJDIR
|
||||
|
||||
/* Define to the name of the environment variable that determines the dynamic
|
||||
library search path. */
|
||||
/*
|
||||
Define to the name of the environment variable
|
||||
that determines the dynamic library search path. */
|
||||
#undef LTDL_SHLIBPATH_VAR
|
||||
|
||||
/* Define to the extension used for shared libraries, say, ".so". */
|
||||
/*
|
||||
Define to the extension used for shared libraries,
|
||||
say, ".so". */
|
||||
#undef LTDL_SHLIB_EXT
|
||||
|
||||
/* Define to the system default library search path. */
|
||||
/*
|
||||
Define to the system default library search path.
|
||||
*/
|
||||
#undef LTDL_SYSSEARCHPATH
|
||||
|
||||
/* Define if dlsym() requires a leading underscore in symbol names. */
|
||||
/*
|
||||
Define if dlsym() requires a leading underscore in
|
||||
symbol names. */
|
||||
#undef NEED_USCORE
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
/*
|
||||
Define to the address where bug reports for
|
||||
this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
/*
|
||||
Define to the full name of this package.
|
||||
*/
|
||||
#undef PACKAGE_NAME
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
/*
|
||||
Define to the full name and version of
|
||||
this package. */
|
||||
#undef PACKAGE_STRING
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
/*
|
||||
Define to the one symbol short name of
|
||||
this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the version of this package. */
|
||||
/*
|
||||
Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
/*
|
||||
Define to 1 if you have the ANSI
|
||||
C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
/*
|
||||
Define to empty if `const' does not conform
|
||||
to ANSI C. */
|
||||
#undef const
|
||||
|
||||
/* Define to a type to use for `error_t' if it is not otherwise available. */
|
||||
/*
|
||||
Define to a type to use for `error_t'
|
||||
if it is not otherwise available. */
|
||||
#undef error_t
|
||||
|
||||
/* Define as `__inline' if that's what the C compiler calls it, or to nothing
|
||||
if it is not supported. */
|
||||
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
||||
calls it, or to nothing if 'inline' is not supported under any name. */
|
||||
#ifndef __cplusplus
|
||||
#undef inline
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2003-07-02'
|
||||
timestamp='2003-10-07'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
|
|
@ -734,7 +734,7 @@ EOF
|
|||
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
exit 0 ;;
|
||||
*:UNICOS/mp:*:*)
|
||||
echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
exit 0 ;;
|
||||
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
|
||||
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
||||
|
|
@ -751,7 +751,7 @@ EOF
|
|||
*:BSD/OS:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
|
||||
*:FreeBSD:*:*)
|
||||
# Determine whether the default compiler uses glibc.
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
|
|
@ -763,7 +763,7 @@ EOF
|
|||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
# GNU/FreeBSD systems have a "k" prefix to indicate we are using
|
||||
# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
|
||||
# FreeBSD's kernel, but not the complete OS.
|
||||
case ${LIBC} in gnu) kernel_only='k' ;; esac
|
||||
echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
|
||||
|
|
@ -799,8 +799,13 @@ EOF
|
|||
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit 0 ;;
|
||||
*:GNU:*:*)
|
||||
# the GNU system
|
||||
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
exit 0 ;;
|
||||
*:GNU/*:*:*)
|
||||
# other systems with GNU libc and userland
|
||||
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
|
||||
exit 0 ;;
|
||||
i*86:Minix:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-minix
|
||||
exit 0 ;;
|
||||
|
|
@ -948,6 +953,9 @@ EOF
|
|||
LIBC=gnuaout
|
||||
#endif
|
||||
#endif
|
||||
#ifdef __dietlibc__
|
||||
LIBC=dietlibc
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
|
||||
|
|
@ -1049,7 +1057,7 @@ EOF
|
|||
exit 0 ;;
|
||||
M68*:*:R3V[567]*:*)
|
||||
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
|
||||
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
|
||||
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
|
||||
OS_REL=''
|
||||
test -r /etc/.relid \
|
||||
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
||||
|
|
@ -1164,7 +1172,7 @@ EOF
|
|||
*:QNX:*:4*)
|
||||
echo i386-pc-qnx
|
||||
exit 0 ;;
|
||||
NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
|
||||
NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
|
||||
echo nsr-tandem-nsk${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:NonStop-UX:*:*)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2003-07-17'
|
||||
timestamp='2003-10-07'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
|
|
@ -118,7 +118,7 @@ esac
|
|||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
|
|
@ -248,6 +248,7 @@ case $basic_machine in
|
|||
| mipsisa32 | mipsisa32el \
|
||||
| mipsisa32r2 | mipsisa32r2el \
|
||||
| mipsisa64 | mipsisa64el \
|
||||
| mipsisa64r2 | mipsisa64r2el \
|
||||
| mipsisa64sb1 | mipsisa64sb1el \
|
||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||
| mipstx39 | mipstx39el \
|
||||
|
|
@ -320,6 +321,7 @@ case $basic_machine in
|
|||
| mipsisa32-* | mipsisa32el-* \
|
||||
| mipsisa32r2-* | mipsisa32r2el-* \
|
||||
| mipsisa64-* | mipsisa64el-* \
|
||||
| mipsisa64r2-* | mipsisa64r2el-* \
|
||||
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
||||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
|
|
@ -1129,7 +1131,7 @@ case $os in
|
|||
| -aos* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
|
||||
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
|
|
@ -1165,6 +1167,9 @@ case $os in
|
|||
-mac*)
|
||||
os=`echo $os | sed -e 's|mac|macos|'`
|
||||
;;
|
||||
-linux-dietlibc)
|
||||
os=-linux-dietlibc
|
||||
;;
|
||||
-linux*)
|
||||
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
||||
;;
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -56,7 +56,7 @@ modename="$progname"
|
|||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.5.0a
|
||||
TIMESTAMP=" (1.1220.2.33 2003/09/29 11:43:50) Debian$Rev: 103 $"
|
||||
TIMESTAMP=" (1.1220.2.35 2003/11/12 18:51:58) Debian$Rev: 179 $"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
|
|
@ -177,6 +177,7 @@ do
|
|||
;;
|
||||
tag)
|
||||
tagname="$arg"
|
||||
preserve_args="${preserve_args}=$arg"
|
||||
|
||||
# Check whether tagname contains only valid characters
|
||||
case $tagname in
|
||||
|
|
@ -239,6 +240,7 @@ do
|
|||
--debug)
|
||||
$echo "$progname: enabling shell trace mode"
|
||||
set -x
|
||||
preserve_args="$preserve_args $arg"
|
||||
;;
|
||||
|
||||
--dry-run | -n)
|
||||
|
|
@ -269,6 +271,7 @@ do
|
|||
|
||||
--quiet | --silent)
|
||||
show=:
|
||||
preserve_args="$preserve_args $arg"
|
||||
;;
|
||||
|
||||
--tag) prevopt="--tag" prev=tag ;;
|
||||
|
|
@ -276,6 +279,7 @@ do
|
|||
set tag "$optarg" ${1+"$@"}
|
||||
shift
|
||||
prev=tag
|
||||
preserve_args="$preserve_args --tag"
|
||||
;;
|
||||
|
||||
-dlopen)
|
||||
|
|
@ -374,6 +378,7 @@ if test -z "$show_help"; then
|
|||
suppress_output=
|
||||
arg_mode=normal
|
||||
libobj=
|
||||
later=
|
||||
|
||||
for arg
|
||||
do
|
||||
|
|
@ -402,18 +407,8 @@ if test -z "$show_help"; then
|
|||
continue
|
||||
;;
|
||||
|
||||
-static)
|
||||
build_old_libs=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-pic)
|
||||
pic_mode=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-non-pic)
|
||||
pic_mode=no
|
||||
-static | -prefer-pic | -prefer-non-pic)
|
||||
later="$later $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
|
|
@ -563,6 +558,25 @@ if test -z "$show_help"; then
|
|||
esac
|
||||
fi
|
||||
|
||||
for arg in $later; do
|
||||
case $arg in
|
||||
-static)
|
||||
build_old_libs=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-pic)
|
||||
pic_mode=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-non-pic)
|
||||
pic_mode=no
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
|
||||
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$obj"; then
|
||||
|
|
@ -844,7 +858,7 @@ EOF
|
|||
;;
|
||||
esac
|
||||
libtool_args="$nonopt"
|
||||
base_compile="$nonopt"
|
||||
base_compile="$nonopt $@"
|
||||
compile_command="$nonopt"
|
||||
finalize_command="$nonopt"
|
||||
|
||||
|
|
@ -889,6 +903,47 @@ EOF
|
|||
vinfo=
|
||||
vinfo_number=no
|
||||
|
||||
# Infer tagged configuration to use if any are available and
|
||||
# if one wasn't chosen via the "--tag" command line option.
|
||||
# Only attempt this if the compiler in the base link
|
||||
# command doesn't match the default compiler.
|
||||
if test -n "$available_tags" && test -z "$tagname"; then
|
||||
case $base_compile in
|
||||
# Blanks in the command may have been stripped by the calling shell,
|
||||
# but not from the CC environment variable when configure was run.
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
||||
# Blanks at the start of $base_compile will cause this to fail
|
||||
# if we don't check for them as well.
|
||||
*)
|
||||
for z in $available_tags; do
|
||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case $base_compile in
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
||||
# The compiler in $compile_command matches
|
||||
# the one in the tagged configuration.
|
||||
# Assume this is the tagged configuration we want.
|
||||
tagname=$z
|
||||
break
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
# If $tagname still isn't set, then no tagged configuration
|
||||
# was found and let the user know that the "--tag" command
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
$echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# We need to know -static, to get the right output filenames.
|
||||
for arg
|
||||
do
|
||||
|
|
@ -920,7 +975,6 @@ EOF
|
|||
# Go through the arguments, transforming them on the way.
|
||||
while test "$#" -gt 0; do
|
||||
arg="$1"
|
||||
base_compile="$base_compile $arg"
|
||||
shift
|
||||
case $arg in
|
||||
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
||||
|
|
@ -1296,8 +1350,9 @@ EOF
|
|||
continue
|
||||
;;
|
||||
|
||||
-pthread|-pthreads|-kthread|-Kthread|-mthreads|--thread-safe|-mt)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
-module)
|
||||
|
|
@ -1632,47 +1687,6 @@ EOF
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Infer tagged configuration to use if any are available and
|
||||
# if one wasn't chosen via the "--tag" command line option.
|
||||
# Only attempt this if the compiler in the base link
|
||||
# command doesn't match the default compiler.
|
||||
if test -n "$available_tags" && test -z "$tagname"; then
|
||||
case $base_compile in
|
||||
# Blanks in the command may have been stripped by the calling shell,
|
||||
# but not from the CC environment variable when configure was run.
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
||||
# Blanks at the start of $base_compile will cause this to fail
|
||||
# if we don't check for them as well.
|
||||
*)
|
||||
for z in $available_tags; do
|
||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case $base_compile in
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
||||
# The compiler in $compile_command matches
|
||||
# the one in the tagged configuration.
|
||||
# Assume this is the tagged configuration we want.
|
||||
tagname=$z
|
||||
break
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
# If $tagname still isn't set, then no tagged configuration
|
||||
# was found and let the user know that the "--tag" command
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
$echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
|
||||
eval arg=\"$export_dynamic_flag_spec\"
|
||||
compile_command="$compile_command $arg"
|
||||
|
|
@ -1815,9 +1829,13 @@ EOF
|
|||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
-pthread|-pthreads|-kthread|-Kthread|-mthreads|--thread-safe|-mt)
|
||||
deplibs="$deplib $deplibs"
|
||||
test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
else
|
||||
deplibs="$deplib $deplibs"
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
-l*)
|
||||
|
|
@ -5077,7 +5095,7 @@ fi\
|
|||
fi
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
|
|
@ -5619,7 +5637,7 @@ relink_command=\"$relink_command\""
|
|||
tmpdir="/tmp"
|
||||
test -n "$TMPDIR" && tmpdir="$TMPDIR"
|
||||
tmpdir="$tmpdir/libtool-$$"
|
||||
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
|
||||
if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
|
||||
else
|
||||
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
|
||||
continue
|
||||
|
|
@ -5702,7 +5720,7 @@ relink_command=\"$relink_command\""
|
|||
if test -n "$current_libdirs"; then
|
||||
# Maybe just do a dry run.
|
||||
test -n "$run" && current_libdirs=" -n$current_libdirs"
|
||||
exec_cmd='$SHELL $0 --finish$current_libdirs'
|
||||
exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
|||
144
ltmain.sh
144
ltmain.sh
|
|
@ -56,7 +56,7 @@ modename="$progname"
|
|||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.5.0a
|
||||
TIMESTAMP=" (1.1220.2.33 2003/09/29 11:43:50) Debian$Rev: 103 $"
|
||||
TIMESTAMP=" (1.1220.2.35 2003/11/12 18:51:58) Debian$Rev: 179 $"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
|
|
@ -177,6 +177,7 @@ do
|
|||
;;
|
||||
tag)
|
||||
tagname="$arg"
|
||||
preserve_args="${preserve_args}=$arg"
|
||||
|
||||
# Check whether tagname contains only valid characters
|
||||
case $tagname in
|
||||
|
|
@ -239,6 +240,7 @@ do
|
|||
--debug)
|
||||
$echo "$progname: enabling shell trace mode"
|
||||
set -x
|
||||
preserve_args="$preserve_args $arg"
|
||||
;;
|
||||
|
||||
--dry-run | -n)
|
||||
|
|
@ -269,6 +271,7 @@ do
|
|||
|
||||
--quiet | --silent)
|
||||
show=:
|
||||
preserve_args="$preserve_args $arg"
|
||||
;;
|
||||
|
||||
--tag) prevopt="--tag" prev=tag ;;
|
||||
|
|
@ -276,6 +279,7 @@ do
|
|||
set tag "$optarg" ${1+"$@"}
|
||||
shift
|
||||
prev=tag
|
||||
preserve_args="$preserve_args --tag"
|
||||
;;
|
||||
|
||||
-dlopen)
|
||||
|
|
@ -374,6 +378,7 @@ if test -z "$show_help"; then
|
|||
suppress_output=
|
||||
arg_mode=normal
|
||||
libobj=
|
||||
later=
|
||||
|
||||
for arg
|
||||
do
|
||||
|
|
@ -402,18 +407,8 @@ if test -z "$show_help"; then
|
|||
continue
|
||||
;;
|
||||
|
||||
-static)
|
||||
build_old_libs=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-pic)
|
||||
pic_mode=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-non-pic)
|
||||
pic_mode=no
|
||||
-static | -prefer-pic | -prefer-non-pic)
|
||||
later="$later $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
|
|
@ -563,6 +558,25 @@ if test -z "$show_help"; then
|
|||
esac
|
||||
fi
|
||||
|
||||
for arg in $later; do
|
||||
case $arg in
|
||||
-static)
|
||||
build_old_libs=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-pic)
|
||||
pic_mode=yes
|
||||
continue
|
||||
;;
|
||||
|
||||
-prefer-non-pic)
|
||||
pic_mode=no
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
|
||||
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$obj"; then
|
||||
|
|
@ -844,7 +858,7 @@ EOF
|
|||
;;
|
||||
esac
|
||||
libtool_args="$nonopt"
|
||||
base_compile="$nonopt"
|
||||
base_compile="$nonopt $@"
|
||||
compile_command="$nonopt"
|
||||
finalize_command="$nonopt"
|
||||
|
||||
|
|
@ -889,6 +903,47 @@ EOF
|
|||
vinfo=
|
||||
vinfo_number=no
|
||||
|
||||
# Infer tagged configuration to use if any are available and
|
||||
# if one wasn't chosen via the "--tag" command line option.
|
||||
# Only attempt this if the compiler in the base link
|
||||
# command doesn't match the default compiler.
|
||||
if test -n "$available_tags" && test -z "$tagname"; then
|
||||
case $base_compile in
|
||||
# Blanks in the command may have been stripped by the calling shell,
|
||||
# but not from the CC environment variable when configure was run.
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
||||
# Blanks at the start of $base_compile will cause this to fail
|
||||
# if we don't check for them as well.
|
||||
*)
|
||||
for z in $available_tags; do
|
||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case $base_compile in
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
||||
# The compiler in $compile_command matches
|
||||
# the one in the tagged configuration.
|
||||
# Assume this is the tagged configuration we want.
|
||||
tagname=$z
|
||||
break
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
# If $tagname still isn't set, then no tagged configuration
|
||||
# was found and let the user know that the "--tag" command
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
$echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# We need to know -static, to get the right output filenames.
|
||||
for arg
|
||||
do
|
||||
|
|
@ -920,7 +975,6 @@ EOF
|
|||
# Go through the arguments, transforming them on the way.
|
||||
while test "$#" -gt 0; do
|
||||
arg="$1"
|
||||
base_compile="$base_compile $arg"
|
||||
shift
|
||||
case $arg in
|
||||
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
||||
|
|
@ -1296,8 +1350,9 @@ EOF
|
|||
continue
|
||||
;;
|
||||
|
||||
-pthread|-pthreads|-kthread|-Kthread|-mthreads|--thread-safe|-mt)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
-module)
|
||||
|
|
@ -1632,47 +1687,6 @@ EOF
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Infer tagged configuration to use if any are available and
|
||||
# if one wasn't chosen via the "--tag" command line option.
|
||||
# Only attempt this if the compiler in the base link
|
||||
# command doesn't match the default compiler.
|
||||
if test -n "$available_tags" && test -z "$tagname"; then
|
||||
case $base_compile in
|
||||
# Blanks in the command may have been stripped by the calling shell,
|
||||
# but not from the CC environment variable when configure was run.
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
||||
# Blanks at the start of $base_compile will cause this to fail
|
||||
# if we don't check for them as well.
|
||||
*)
|
||||
for z in $available_tags; do
|
||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||
case $base_compile in
|
||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
||||
# The compiler in $compile_command matches
|
||||
# the one in the tagged configuration.
|
||||
# Assume this is the tagged configuration we want.
|
||||
tagname=$z
|
||||
break
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
# If $tagname still isn't set, then no tagged configuration
|
||||
# was found and let the user know that the "--tag" command
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
$echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
|
||||
eval arg=\"$export_dynamic_flag_spec\"
|
||||
compile_command="$compile_command $arg"
|
||||
|
|
@ -1815,9 +1829,13 @@ EOF
|
|||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
-pthread|-pthreads|-kthread|-Kthread|-mthreads|--thread-safe|-mt)
|
||||
deplibs="$deplib $deplibs"
|
||||
test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
else
|
||||
deplibs="$deplib $deplibs"
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
-l*)
|
||||
|
|
@ -5077,7 +5095,7 @@ fi\
|
|||
fi
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
|
|
@ -5619,7 +5637,7 @@ relink_command=\"$relink_command\""
|
|||
tmpdir="/tmp"
|
||||
test -n "$TMPDIR" && tmpdir="$TMPDIR"
|
||||
tmpdir="$tmpdir/libtool-$$"
|
||||
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
|
||||
if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
|
||||
else
|
||||
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
|
||||
continue
|
||||
|
|
@ -5702,7 +5720,7 @@ relink_command=\"$relink_command\""
|
|||
if test -n "$current_libdirs"; then
|
||||
# Maybe just do a dry run.
|
||||
test -n "$run" && current_libdirs=" -n$current_libdirs"
|
||||
exec_cmd='$SHELL $0 --finish$current_libdirs'
|
||||
exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue