mirror of https://github.com/freetype/freetype
* builds/unix/ltmain.sh: Regenerated with `libtoolize --force
--copy' from libtool 1.4.3. * builds/unix/aclocal.m4: Regenerated with `aclocal -I .' from automake 1.7.1. * builds/unix/configure: Regenerated with autoconf 2.54. * builds/unix/config.guess, builds/unix/config.sub: Updated from `config' CVS module at subversions.gnu.org. * builds/unix/install-sh, builds/unix/mkinstalldirs: Updated from `automake' CVS module at subversions.gnu.org.
This commit is contained in:
parent
52e0a7e930
commit
0d52639603
288
ChangeLog
288
ChangeLog
|
@ -1,228 +1,244 @@
|
|||
2003-01-18 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* builds/unix/ltmain.sh: Regenerated with `libtoolize --force
|
||||
--copy' from libtool 1.4.3.
|
||||
* builds/unix/aclocal.m4: Regenerated with `aclocal -I .' from
|
||||
automake 1.7.1.
|
||||
* builds/unix/configure: Regenerated with autoconf 2.54.
|
||||
* builds/unix/config.guess, builds/unix/config.sub: Updated from
|
||||
`config' CVS module at subversions.gnu.org.
|
||||
* builds/unix/install-sh, builds/unix/mkinstalldirs: Updated from
|
||||
`automake' CVS module at subversions.gnu.org.
|
||||
|
||||
2003-01-15 David Turner <david@freetype.org>
|
||||
|
||||
* include/freetype/freetype.h: fixed documentation for FT_Size_Metrics
|
||||
* include/freetype/freetype.h: Fixed documentation for
|
||||
FT_Size_Metrics.
|
||||
|
||||
2003-01-15 James Su <suzhe@turbolinux.com.cn>
|
||||
|
||||
* src/gzip/ftgzip.c: bugfix: couldn't read certain gzip-ed font files
|
||||
* src/gzip/ftgzip.c: Bugfix: couldn't read certain gzip-ed font
|
||||
files.
|
||||
|
||||
2003-01-15 Huw D M Davies <h.davies1@physics.ox.ac.uk>
|
||||
|
||||
* include/freetype/config/ftheader.h, include/freetype/internal/fnttypes.h,
|
||||
include/freetype/ftwinfnt.h, src/base/winfnt.c, src/winfonts/winfnt.c,
|
||||
src/base/Jamfile, src/base/rules.mk, src/base/descrip.mms:
|
||||
|
||||
added a Windows .FNT specific API (mostly for Wine). Also fixed a nasty
|
||||
bug in the header loader which would cause invalid memory overwrites
|
||||
* include/freetype/config/ftheader.h,
|
||||
include/freetype/internal/fnttypes.h, include/freetype/ftwinfnt.h,
|
||||
src/base/winfnt.c, src/winfonts/winfnt.c, src/base/Jamfile,
|
||||
src/base/rules.mk, src/base/descrip.mms: Added a Windows .FNT
|
||||
specific API (mostly for Wine). Also fixed a nasty bug in the
|
||||
header loader which would cause invalid memory overwrites.
|
||||
|
||||
2003-01-14 Graham Asher <graham.asher@btinternet.com>
|
||||
|
||||
* include/freetype/ftglyph.h, src/base/ftglyph.c:
|
||||
Added 'const' to the type of the first argument to FT_Matrix_Multiply,
|
||||
which isn't changed - this adds documentation and convenience.
|
||||
|
||||
* include/freetype/ftglyph.h, src/base/ftglyph.c: Added `const' to
|
||||
the type of the first argument to FT_Matrix_Multiply, which isn't
|
||||
changed -- this adds documentation and convenience.
|
||||
|
||||
2003-01-13 Graham Asher <graham.asher@btinternet.com>
|
||||
|
||||
* src/sfnt/ttload.c (tt_face_load_metrics)
|
||||
[FT_CONFIG_OPTION_INCREMENTAL]: TrueType typefaces without horizontal
|
||||
metrics (without the 'hmtx' table) are now tolerated if an
|
||||
incremental interface has been specified that has a get_glyph_metrics
|
||||
function, implying that metrics will be supplied from outside.
|
||||
This happens for certain Type 42 fonts passed from GhostScript.
|
||||
|
||||
* src/sfnt/ttload.c (tt_face_load_metrics)
|
||||
[FT_CONFIG_OPTION_INCREMENTAL]: TrueType typefaces without
|
||||
horizontal metrics (without the `hmtx' table) are now tolerated if
|
||||
an incremental interface has been specified that has a
|
||||
get_glyph_metrics function, implying that metrics will be supplied
|
||||
from outside. This happens for certain Type 42 fonts passed from
|
||||
GhostScript.
|
||||
|
||||
2003-01-11 David Chester <davidchester@qmx.net>
|
||||
|
||||
* include/freetype/config/ftoption.h, src/autohint/ahglobal.h,
|
||||
src/autohint/ahglobal.c, src/autohint/ahglyph.c,
|
||||
src/autohint/ahtypes.h:
|
||||
* include/freetype/config/ftoption.h, src/autohint/ahglobal.h,
|
||||
src/autohint/ahglobal.c, src/autohint/ahglyph.c,
|
||||
src/autohint/ahtypes.h: Patches to the auto-hinter in order to
|
||||
slightly improve the output. Note that everything is controlled
|
||||
through the new FT_CONFIG_OPTION_CHESTER_HINTS defined at the end of
|
||||
"ftoption.h". There are also individual FT_CONFIG_CHESTER_XXX
|
||||
macros to control individual "features".
|
||||
|
||||
included David Chester's patches to the auto-hinter in order to
|
||||
slightly improve the output. Note that everything is controlled
|
||||
through the new FT_CONFIG_OPTION_CHESTER_HINTS defined at the
|
||||
end of "ftoption.h", there are also individual FT_CONFIG_CHESTER_XXX
|
||||
macros to control individual "features".
|
||||
|
||||
Note that all improvements are enabled by default, but can be
|
||||
tweaked for optimization and testing purpose. The configuration
|
||||
macros will most likely disappear in the short future.
|
||||
Note that all improvements are enabled by default, but can be
|
||||
tweaked for optimization and testing purposes. The configuration
|
||||
macros will most likely disappear in the short future.
|
||||
|
||||
2003-01-11 David Turner <david@freetype.org>
|
||||
|
||||
* include/freetype/internal/fnttypes.h: fixed a structure field
|
||||
definition to avoid memory overwrites
|
||||
* include/freetype/internal/fnttypes.h: Fixed a structure field
|
||||
definition to avoid memory overwrites.
|
||||
|
||||
2003-01-08 Huw Dawies <huw@codeweavers.com>
|
||||
|
||||
* src/winfonts/winfnt.c: read 16 bytes into "reserved2", not "reserved"
|
||||
|
||||
* src/base/ftobjs.c (find_unicode_charmap): fixed the error code
|
||||
returned when the font doesn't contain a Unicode charmap. This
|
||||
allows FT2 to load "symbol.ttf" and a few others correctly since
|
||||
the last release
|
||||
* src/winfonts/winfnt.c: Read 16 bytes into "reserved2", not
|
||||
"reserved".
|
||||
|
||||
* src/base/ftobjs.c (find_unicode_charmap): Fixed the error code
|
||||
returned when the font doesn't contain a Unicode charmap. This
|
||||
allows FT2 to load "symbol.ttf" and a few others correctly since the
|
||||
last release.
|
||||
|
||||
2003-01-08 Owen Taylor <owen@redhat.com>
|
||||
|
||||
* src/autohint/ahtypes.h, src/autohint/ahhint.c, src/pshinter/pshalgo3.h,
|
||||
src/pshinter/pshalgo3.c: implemented the FT_RENDER_MODE_LIGHT hinting
|
||||
mode in the auto and postscript hinters
|
||||
* src/autohint/ahtypes.h, src/autohint/ahhint.c,
|
||||
src/pshinter/pshalgo3.h, src/pshinter/pshalgo3.c: Implemented the
|
||||
FT_RENDER_MODE_LIGHT hinting mode in the auto and postscript
|
||||
hinters.
|
||||
|
||||
* src/truetype/ttgload.c: fixing the TrueType loader to handle invalid
|
||||
composites correctly by limiting the recursion depth
|
||||
* src/truetype/ttgload.c: Fixing the TrueType loader to handle
|
||||
invalid composites correctly by limiting the recursion depth.
|
||||
|
||||
2003-01-08 David Turner <david@freetype.org>
|
||||
|
||||
* Jamrules, Jamfile, Jamfile.in, src/*/Jamfile: small changes to
|
||||
support the compilation of FreeType 2 as part of larger projects with
|
||||
their own configuration options (only with Jam)
|
||||
* Jamrules, Jamfile, Jamfile.in, src/*/Jamfile: Small changes to
|
||||
support the compilation of FreeType 2 as part of larger projects
|
||||
with their own configuration options (only with Jam).
|
||||
|
||||
2003-01-07 David Turner <david@freetype.org>
|
||||
|
||||
* src/base/ftstroker.c: probably the last bug-fixes to the stroker,
|
||||
the API is likely to change however.
|
||||
* src/base/ftstroker.c: Probably the last bug-fixes to the stroker;
|
||||
the API is likely to change, however.
|
||||
|
||||
* src/base/fttrigon.c (FT_Angle_Diff): fixing function, it returned
|
||||
invalid values for large negative angle differences (resulting in
|
||||
incorrect stroker computations, among other things)
|
||||
* src/base/fttrigon.c (FT_Angle_Diff): Fixing function: It returned
|
||||
invalid values for large negative angle differences (resulting in
|
||||
incorrect stroker computations, among other things).
|
||||
|
||||
* src/cache/ftccache.c (ftc_node_unlink): removing incorrect
|
||||
assertion, and changing code to avoid hash table size contraction
|
||||
* src/cache/ftccache.c (ftc_node_unlink): Removing incorrect
|
||||
assertion, and changing code to avoid hash table size contraction.
|
||||
|
||||
* src/base/Jamfile, src/base/rules.mk, src/base/descrip.mms:
|
||||
adding "ftstroker.obj" to default build, as optional component
|
||||
* src/base/Jamfile, src/base/rules.mk, src/base/descrip.mms: Adding
|
||||
"ftstroker.obj" to default build, as optional component.
|
||||
|
||||
2002-12-26 David Turner <david@freetype.org>
|
||||
|
||||
* src/gzip/adler32.c, src/gzip/infblock.c, src/gzip/inflate.c,
|
||||
src/gzip/inftrees.c, src/gzip/zconf.h, src/gzip/zlib.h,
|
||||
src/gzip/zutil.h: updates to allow compilation without compiler
|
||||
warnings with LCC-Win32
|
||||
* src/gzip/adler32.c, src/gzip/infblock.c, src/gzip/inflate.c,
|
||||
src/gzip/inftrees.c, src/gzip/zconf.h, src/gzip/zlib.h,
|
||||
src/gzip/zutil.h: Updates to allow compilation without compiler
|
||||
warnings with LCC-Win32.
|
||||
|
||||
* include/freetype/freetype.h, docs/VERSION.DLL,
|
||||
builds/unix/configure.ac, builds/unix/configure: updates for the upcoming
|
||||
2.1.4 release
|
||||
* include/freetype/freetype.h, docs/VERSION.DLL,
|
||||
builds/unix/configure.ac, builds/unix/configure: Updates for the
|
||||
upcoming 2.1.4 release.
|
||||
|
||||
2002-12-23 Anthony Fok <anthony@thizlinux.com>
|
||||
2002-12-23 Anthony Fok <anthony@thizlinux.com>
|
||||
|
||||
* builds/unix/configure.ac, builds/unix/unix-cc.in,
|
||||
builds/unix/unix-def.in: small fix to configure sub-system on Unix
|
||||
to allow other programs to correctly link with zlib when needed
|
||||
* builds/unix/configure.ac, builds/unix/unix-cc.in,
|
||||
builds/unix/unix-def.in: Small fix to configure sub-system on Unix
|
||||
to allow other programs to correctly link with zlib when needed.
|
||||
|
||||
2002-12-17 David Turner <david@freetype.org>
|
||||
|
||||
* src/base/ftobjs.c (find_unicode_charmap): added some comments to
|
||||
better explain what's happening there
|
||||
* src/base/ftobjs.c (find_unicode_charmap): Added some comments to
|
||||
better explain what's happening there.
|
||||
|
||||
* src/base/ftobjs.c (open_face): included Graham Asher's fix to
|
||||
prevent faces without Unicode charmaps from loading
|
||||
* src/base/ftobjs.c (open_face): Included Graham Asher's fix to
|
||||
prevent faces without Unicode charmaps from loading.
|
||||
|
||||
* src/winfonts/winfnt.c: included George Williams' fix to support
|
||||
version 2 fonts correctly
|
||||
* src/winfonts/winfnt.c: Included George Williams's fix to support
|
||||
version 2 fonts correctly.
|
||||
|
||||
2002-12-16 David Turner <david@freetype.org>
|
||||
|
||||
* docs/VERSION.DLL: updating document to better explain the differences between
|
||||
the three version numbers being used on Unix, as well as provide the AutoConf
|
||||
fragment provided by Lars Clausen
|
||||
* docs/VERSION.DLL: Updating document to better explain the
|
||||
differences between the three version numbers being used on Unix, as
|
||||
well as providing an autoconf fragment provided by Lars Clausen.
|
||||
|
||||
* src/smooth/ftgrays.c (gray_render_conic): fixed small bug that
|
||||
prevented bezier arcs with negative vertical coordinates to be rendered
|
||||
appropriately
|
||||
* src/smooth/ftgrays.c (gray_render_conic): Fixed small bug that
|
||||
prevented bezier arcs with negative vertical coordinates to be
|
||||
rendered appropriately.
|
||||
|
||||
2002-12-02 Antoine Leca <Antoine-FreetypeLeca-Marti.org>
|
||||
2002-12-02 Antoine Leca <Antoine-Freetype@Leca-Marti.org>
|
||||
|
||||
* src/base/ftobjs.c: modified the logic to get Unicode charmaps.
|
||||
Now it loads UCS-4 charmaps when there is one.
|
||||
* src/base/ftobjs.c (find_unicode_charmap): new function.
|
||||
* src/base/ftobjs.c (open_face): refer to the above one.
|
||||
* src/base/ftobjs.c (FT_Select_Charmap): idem.
|
||||
* src/base/ftobjs.c: Modified the logic to get Unicode charmaps.
|
||||
Now it loads UCS-4 charmaps when there is one.
|
||||
* src/base/ftobjs.c (find_unicode_charmap): New function.
|
||||
* src/base/ftobjs.c (open_face): Refer to the above one.
|
||||
* src/base/ftobjs.c (FT_Select_Charmap): Idem.
|
||||
|
||||
2002-11-29 Antoine Leca <Antoine-FreetypeLeca-Marti.org>
|
||||
2002-11-29 Antoine Leca <Antoine-Freetype@Leca-Marti.org>
|
||||
|
||||
* include/freetype/ftgzip.h: Correct the name of the controlling
|
||||
macro (was __FTXF86_H__ ...)
|
||||
* include/freetype/ftgzip.h: Correct the name of the controlling
|
||||
macro (was __FTXF86_H__ ...).
|
||||
|
||||
2002-11-27 Vincent Caron <v.caron@zerodeux.net>
|
||||
|
||||
* builds/unix/unix-def.in, builds/unix/freetype-config.in,
|
||||
builds/unix/configure.ac, src/gzip/rules.mk, src/gzip/ftgzip.c:
|
||||
adding support for system zlib installations when available on the
|
||||
target platform (Unix only)
|
||||
* builds/unix/unix-def.in, builds/unix/freetype-config.in,
|
||||
builds/unix/configure.ac, src/gzip/rules.mk, src/gzip/ftgzip.c:
|
||||
Adding support for system zlib installations if available on the
|
||||
target platform (Unix only).
|
||||
|
||||
2002-11-23 David Turner <david@freetype.org>
|
||||
|
||||
* src/cff/cffload.c (cff_charser_load): modified charset loader to
|
||||
accept pre-defined charsets, even when the font contains fewer glyphs.
|
||||
also enforced more checks to ensure that we never overflow the
|
||||
character codes array in the encoding.
|
||||
* src/cff/cffload.c (cff_charser_load): Modified charset loader to
|
||||
accept pre-defined charsets, even when the font contains fewer
|
||||
glyphs. Also enforced more checks to ensure that we never overflow
|
||||
the character codes array in the encoding.
|
||||
|
||||
2002-11-18 David Turner <david@freetype.org>
|
||||
|
||||
* FreeType 2.1.3 is released
|
||||
============================
|
||||
|
||||
* Version 2.1.3 is released.
|
||||
============================
|
||||
|
||||
|
||||
2002-11-07 David Turner <david@freetype.org>
|
||||
|
||||
* src/cache/ftcsbit.c (ftc_sbit_node_load): fixed a small bug that caused
|
||||
problems with embedded bitmaps
|
||||
* src/cache/ftcsbit.c (ftc_sbit_node_load): Fixed a small bug that
|
||||
caused problems with embedded bitmaps.
|
||||
|
||||
* src/otlayout/otlayout.h, src/otlyaout/otlconf.h,
|
||||
src/otlayout/otlgsub.c, src/otlayout/otlgsub.h, src/otlayout/otlparse.c,
|
||||
src/otlayout/otlparse.h, src/otlayout/otlutils.h:
|
||||
* src/otlayout/otlayout.h, src/otlyaout/otlconf.h,
|
||||
src/otlayout/otlgsub.c, src/otlayout/otlgsub.h,
|
||||
src/otlayout/otlparse.c, src/otlayout/otlparse.h,
|
||||
src/otlayout/otlutils.h: Updating the OpenType Layout code, adding
|
||||
support fot the first GSUB lookups. Nothing that really compiles
|
||||
for now though.
|
||||
|
||||
updating the OpenType Layout code, adding support fot the first
|
||||
GSUB lookups. Nothing that really compiles for now though
|
||||
|
||||
* src/autohint/ahhint.c: disabled serif stem width quantization. It
|
||||
produces slightly better shapes though this is not distinguishable
|
||||
with many fonts.
|
||||
* src/autohint/ahhint.c: Disabled serif stem width quantization. It
|
||||
produces slightly better shapes though this is not distinguishable
|
||||
with many fonts.
|
||||
|
||||
2002-11-05 David Turner <david@freetype.org>
|
||||
|
||||
* include/freetype/config/ftoption.h, src/gzip/ftgzip.c: added
|
||||
support for the FT_CONFIG_OPTION_SYSTEM_ZLIB option, used to specify
|
||||
the use of system-wide zlib.
|
||||
* include/freetype/config/ftoption.h, src/gzip/ftgzip.c: Added
|
||||
support for the FT_CONFIG_OPTION_SYSTEM_ZLIB option, used to specify
|
||||
the use of system-wide zlib.
|
||||
|
||||
Note that this macro, as well as FT_CONFIG_OPTION_BYTECODE_INTERPRETER,
|
||||
is not #undef-ed anymore. This allows the build system to define them
|
||||
depending on the configuration (typically by adding -D flags at
|
||||
compile time).
|
||||
Note that this macro, as well as
|
||||
FT_CONFIG_OPTION_BYTECODE_INTERPRETER, is not #undef-ed anymore.
|
||||
This allows the build system to define them depending on the
|
||||
configuration (typically by adding -D flags at compile time).
|
||||
|
||||
* src/sfnt/ttcmap0.c (tt_face_build_cmaps): removed compiler warnings
|
||||
in optimized mode relative to the "volatile" local variables. This was
|
||||
not a compiler bug after all, but the fact that a pointer to a volatile
|
||||
variable is not the same than a volatile pointer to a variable :-)
|
||||
* src/sfnt/ttcmap0.c (tt_face_build_cmaps): Removed compiler
|
||||
warnings in optimized mode relative to the "volatile" local
|
||||
variables. This was not a compiler bug after all, but the fact that
|
||||
a pointer to a volatile variable is not the same than a volatile
|
||||
pointer to a variable :-)
|
||||
|
||||
the fix was to change "volatile FT_Byte* p"
|
||||
into "FT_Byte* volatile p"
|
||||
The fix was to change
|
||||
`volatile FT_Byte* p'
|
||||
into
|
||||
`FT_Byte* volatile p'.
|
||||
|
||||
* src/pfr/pfrload.c, src/pfr/pfrdrivr.c, src/gzip/inftrees.c: removed
|
||||
compiler warnings in optimized modes
|
||||
|
||||
* src/gzip/*.[hc]: modified our ZLib copy in order to prevent exporting
|
||||
any zlib function names outside of the component. This prevents linking
|
||||
problems on some platforms, when applications want to link FreeType
|
||||
_and_ ZLib together.
|
||||
* src/pfr/pfrload.c, src/pfr/pfrdrivr.c, src/gzip/inftrees.c:
|
||||
Removed compiler warnings in optimized modes.
|
||||
|
||||
* src/gzip/*.[hc]: Modified our zlib copy in order to prevent
|
||||
exporting any zlib function names outside of the component. This
|
||||
prevents linking problems on some platforms, when applications want
|
||||
to link FreeType _and_ zlib together.
|
||||
|
||||
2002-11-05 Juliusz <jch@pps.jussieu.fr>
|
||||
|
||||
* src/psaux/psobjs.c (ps_table_add): modified increment loop in
|
||||
order to implement exponential behaviour
|
||||
* src/psaux/psobjs.c (ps_table_add): Modified increment loop in
|
||||
order to implement exponential behaviour.
|
||||
|
||||
2002-10-31 David Turner <david@freetype.org>
|
||||
|
||||
* include/freetype/ftgzip.h, src/gzip/ftgzip.c:
|
||||
adding support for gzip compressed streams !!
|
||||
* include/freetype/ftgzip.h, src/gzip/ftgzip.c: Adding support for
|
||||
gzip compressed streams.
|
||||
|
||||
* src/pcf/pcfdriver.c: adding automatic support for gzip-compressed
|
||||
PCF files
|
||||
* src/pcf/pcfdriver.c: Adding automatic support for gzip-compressed
|
||||
PCF files.
|
||||
|
||||
2002-10-30 David Turner <david@freetype.org>
|
||||
|
||||
* FreeType 2.1.3rc3 released
|
||||
* FreeType 2.1.3rc3 released
|
||||
|
||||
2002-10-25 David Turner <david@freetype.org>
|
||||
|
||||
|
|
|
@ -1,4 +1,18 @@
|
|||
## FreeType specific autoconf tests
|
||||
# generated automatically by aclocal 1.7.1 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
||||
# Free Software Foundation, Inc.
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
# PARTICULAR PURPOSE.
|
||||
|
||||
|
||||
# serial 1 FT_MUNMAP_DECL
|
||||
|
||||
AC_DEFUN(FT_MUNMAP_DECL,
|
||||
[AC_MSG_CHECKING([whether munmap must be declared])
|
||||
|
@ -13,7 +27,8 @@ ft_cv_munmap_decl=no,
|
|||
ft_cv_munmap_decl=yes)])
|
||||
AC_MSG_RESULT($ft_cv_munmap_decl)
|
||||
if test $ft_cv_munmap_decl = yes; then
|
||||
AC_DEFINE(NEED_MUNMAP_DECL)
|
||||
AC_DEFINE(NEED_MUNMAP_DECL,,
|
||||
[Define to 1 if munmap() is not defined in <sys/mman.h>])
|
||||
fi])
|
||||
|
||||
AC_DEFUN(FT_MUNMAP_PARAM,
|
||||
|
@ -22,33 +37,12 @@ AC_TRY_COMPILE([
|
|||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
int munmap(void *, size_t);],,
|
||||
AC_MSG_RESULT([void *]);AC_DEFINE(MUNMAP_USES_VOIDP),
|
||||
AC_MSG_RESULT([void *]);AC_DEFINE(MUNMAP_USES_VOIDP,,
|
||||
[Define to 1 if the first argument of munmap is of type void *]),
|
||||
AC_MSG_RESULT([char *]))
|
||||
])
|
||||
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
|
||||
## Copyright 1996, 1997, 1998, 1999, 2000, 2001
|
||||
## Free Software Foundation, Inc.
|
||||
## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
##
|
||||
## This program is free software; you can redistribute it and/or modify
|
||||
## it under the terms of the GNU General Public License as published by
|
||||
## the Free Software Foundation; either version 2 of the License, or
|
||||
## (at your option) any later version.
|
||||
##
|
||||
## This program is distributed in the hope that it will be useful, but
|
||||
## WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
## General Public License for more details.
|
||||
##
|
||||
## You should have received a copy of the GNU General Public License
|
||||
## along with this program; if not, write to the Free Software
|
||||
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
##
|
||||
## As a special exception to the GNU General Public License, if you
|
||||
## distribute this file as part of a program that contains a
|
||||
## configuration script generated by Autoconf, you may include it under
|
||||
## the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# serial 46 AC_PROG_LIBTOOL
|
||||
|
||||
|
@ -77,6 +71,8 @@ AC_REQUIRE([AC_PROG_CC])dnl
|
|||
AC_REQUIRE([AC_PROG_LD])dnl
|
||||
AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
|
||||
AC_REQUIRE([AC_PROG_NM])dnl
|
||||
AC_REQUIRE([LT_AC_PROG_SED])dnl
|
||||
|
||||
AC_REQUIRE([AC_PROG_LN_S])dnl
|
||||
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
|
||||
AC_REQUIRE([AC_OBJEXT])dnl
|
||||
|
@ -244,9 +240,12 @@ hpux*) # Its linker distinguishes data from code symbols
|
|||
lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
|
||||
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
|
||||
;;
|
||||
irix*)
|
||||
irix* | nonstopux*)
|
||||
symcode='[[BCDEGRST]]'
|
||||
;;
|
||||
osf*)
|
||||
symcode='[[BCDEGQRST]]'
|
||||
;;
|
||||
solaris* | sysv5*)
|
||||
symcode='[[BDT]]'
|
||||
;;
|
||||
|
@ -343,7 +342,7 @@ EOF
|
|||
save_CFLAGS="$CFLAGS"
|
||||
LIBS="conftstm.$ac_objext"
|
||||
CFLAGS="$CFLAGS$no_builtin_flag"
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
|
||||
pipe_works=yes
|
||||
fi
|
||||
LIBS="$save_LIBS"
|
||||
|
@ -837,8 +836,6 @@ fi
|
|||
set dummy $CC
|
||||
compiler="[$]2"
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([for objdir])
|
||||
rm -f .libs 2>/dev/null
|
||||
mkdir .libs 2>/dev/null
|
||||
|
@ -850,12 +847,8 @@ else
|
|||
fi
|
||||
rmdir .libs 2>/dev/null
|
||||
AC_MSG_RESULT($objdir)
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_ARG_WITH(pic,
|
||||
[ --with-pic try to use only PIC/non-PIC objects [default=use both]],
|
||||
pic_mode="$withval", pic_mode=default)
|
||||
|
@ -893,7 +886,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
|
|||
# like `-m68040'.
|
||||
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
|
||||
;;
|
||||
beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
|
||||
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
|
@ -936,7 +929,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
|
|||
lt_cv_prog_cc_pic='+Z'
|
||||
;;
|
||||
|
||||
irix5* | irix6*)
|
||||
irix5* | irix6* | nonstopux*)
|
||||
lt_cv_prog_cc_wl='-Wl,'
|
||||
lt_cv_prog_cc_static='-non_shared'
|
||||
# PIC (with -KPIC) is the default.
|
||||
|
@ -980,11 +973,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
|
|||
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
||||
lt_cv_prog_cc_pic='-KPIC'
|
||||
lt_cv_prog_cc_static='-Bstatic'
|
||||
if test "x$host_vendor" = xsni; then
|
||||
lt_cv_prog_cc_wl='-LD'
|
||||
else
|
||||
lt_cv_prog_cc_wl='-Wl,'
|
||||
fi
|
||||
lt_cv_prog_cc_wl='-Wl,'
|
||||
;;
|
||||
|
||||
uts4*)
|
||||
|
@ -1046,8 +1035,6 @@ else
|
|||
|
||||
AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
# Check for any special shared library compilation flags.
|
||||
if test -n "$lt_cv_prog_cc_shlib"; then
|
||||
|
@ -1059,8 +1046,6 @@ if test -n "$lt_cv_prog_cc_shlib"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
|
||||
AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
|
||||
lt_cv_prog_cc_static_works=no
|
||||
|
@ -1080,12 +1065,8 @@ wl="$lt_cv_prog_cc_wl"
|
|||
link_static_flag="$lt_cv_prog_cc_static"
|
||||
no_builtin_flag="$lt_cv_prog_cc_no_builtin"
|
||||
can_build_shared="$lt_cv_prog_cc_can_build_shared"
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Check to see if options -o and -c are simultaneously supported by compiler
|
||||
AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
|
||||
AC_CACHE_VAL([lt_cv_compiler_c_o], [
|
||||
|
@ -1153,11 +1134,7 @@ if test x"$compiler_c_o" = x"yes"; then
|
|||
else
|
||||
compiler_o_lo=no
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Check to see if we can do hard links to lock some files if needed
|
||||
hard_links="nottested"
|
||||
if test "$compiler_c_o" = no && test "$need_locks" != no; then
|
||||
|
@ -1177,11 +1154,7 @@ if test "$compiler_c_o" = no && test "$need_locks" != no; then
|
|||
else
|
||||
need_locks=no
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
if test "$GCC" = yes; then
|
||||
# Check to see if options -fno-rtti -fno-exceptions are supported by compiler
|
||||
AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
|
||||
|
@ -1207,11 +1180,7 @@ if test "$GCC" = yes; then
|
|||
no_builtin_flag=' -fno-builtin'
|
||||
fi
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# See if the linker supports building shared libraries.
|
||||
AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
|
||||
|
||||
|
@ -1369,7 +1338,7 @@ EOF
|
|||
# If the export-symbols file already is a .def file (1st line
|
||||
# is EXPORTS), use it as is.
|
||||
# If DATA tags from a recent dlltool are present, honour them!
|
||||
archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||||
archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
|
||||
cp $export_symbols $output_objdir/$soname-def;
|
||||
else
|
||||
echo EXPORTS > $output_objdir/$soname-def;
|
||||
|
@ -1378,6 +1347,7 @@ EOF
|
|||
set dummy \$symbol;
|
||||
case \[$]# in
|
||||
2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
|
||||
4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
|
||||
*) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
|
||||
esac;
|
||||
_lt_hint=`expr 1 + \$_lt_hint`;
|
||||
|
@ -1490,10 +1460,12 @@ else
|
|||
# need to do runtime linking.
|
||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
case $ld_flag in
|
||||
*-brtl*)
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
esac
|
||||
|
||||
|
@ -1565,7 +1537,7 @@ else
|
|||
allow_undefined_flag='${wl}-berok'
|
||||
# This is a bit strange, but is similar to how AIX traditionally builds
|
||||
# it's shared libraries.
|
||||
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
|
||||
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
@ -1607,8 +1579,9 @@ else
|
|||
esac
|
||||
# FIXME: Relying on posixy $() will cause problems for
|
||||
# cross-compilation, but unfortunately the echo tests do not
|
||||
# yet detect zsh echo's removal of \ escapes.
|
||||
archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
|
||||
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
|
||||
# `"' quotes if we put them in here... so don't!
|
||||
archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
|
||||
# We need to add '_' to the symbols in $export_symbols first
|
||||
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
|
||||
hardcode_direct=yes
|
||||
|
@ -1660,13 +1633,14 @@ else
|
|||
export_dynamic_flag_spec='${wl}-E'
|
||||
;;
|
||||
|
||||
irix5* | irix6*)
|
||||
irix5* | irix6* | nonstopux*)
|
||||
if test "$GCC" = yes; then
|
||||
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
else
|
||||
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
|
||||
hardcode_libdir_flag_spec='-rpath $libdir'
|
||||
fi
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
link_all_deplibs=yes
|
||||
;;
|
||||
|
@ -1694,7 +1668,7 @@ else
|
|||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
|
@ -1704,7 +1678,7 @@ else
|
|||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
;;
|
||||
esac
|
||||
|
@ -1816,13 +1790,23 @@ EOF
|
|||
;;
|
||||
|
||||
sysv4)
|
||||
if test "x$host_vendor" = xsno; then
|
||||
archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
hardcode_direct=yes # is this really true???
|
||||
else
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
|
||||
fi
|
||||
case $host_vendor in
|
||||
sni)
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
hardcode_direct=yes # is this really true???
|
||||
;;
|
||||
siemens)
|
||||
## LD is ld it makes a PLAMLIB
|
||||
## CC just makes a GrossModule.
|
||||
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
|
||||
reload_cmds='$CC -r -o $output$reload_objs'
|
||||
hardcode_direct=no
|
||||
;;
|
||||
motorola)
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
|
||||
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
|
||||
;;
|
||||
esac
|
||||
runpath_var='LD_RUN_PATH'
|
||||
hardcode_shlibpath_var=no
|
||||
;;
|
||||
|
@ -1894,11 +1878,7 @@ EOF
|
|||
fi
|
||||
AC_MSG_RESULT([$ld_shlibs])
|
||||
test "$ld_shlibs" = no && can_build_shared=no
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Check hardcoding attributes.
|
||||
AC_MSG_CHECKING([how to hardcode library paths into programs])
|
||||
hardcode_action=
|
||||
|
@ -1924,11 +1904,7 @@ else
|
|||
hardcode_action=unsupported
|
||||
fi
|
||||
AC_MSG_RESULT([$hardcode_action])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
striplib=
|
||||
old_striplib=
|
||||
AC_MSG_CHECKING([whether stripping libraries is possible])
|
||||
|
@ -1939,14 +1915,10 @@ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
|
|||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
||||
test -z "$deplibs_check_method" && deplibs_check_method=unknown
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# PORTME Fill in your ld.so characteristics
|
||||
AC_MSG_CHECKING([dynamic linker characteristics])
|
||||
library_names_spec=
|
||||
|
@ -1975,6 +1947,9 @@ aix3*)
|
|||
|
||||
aix4* | aix5*)
|
||||
version_type=linux
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
hardcode_into_libs=yes
|
||||
if test "$host_cpu" = ia64; then
|
||||
# AIX 5 supports IA64
|
||||
library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
|
||||
|
@ -2013,6 +1988,7 @@ aix4* | aix5*)
|
|||
fi
|
||||
shlibpath_var=LIBPATH
|
||||
fi
|
||||
hardcode_into_libs=yes
|
||||
;;
|
||||
|
||||
amigaos*)
|
||||
|
@ -2060,7 +2036,7 @@ cygwin* | mingw* | pw32*)
|
|||
;;
|
||||
yes,mingw*)
|
||||
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
|
||||
;;
|
||||
yes,pw32*)
|
||||
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
|
||||
|
@ -2143,14 +2119,17 @@ hpux9* | hpux10* | hpux11*)
|
|||
postinstall_cmds='chmod 555 $lib'
|
||||
;;
|
||||
|
||||
irix5* | irix6*)
|
||||
version_type=irix
|
||||
irix5* | irix6* | nonstopux*)
|
||||
case $host_os in
|
||||
nonstopux*) version_type=nonstopux ;;
|
||||
*) version_type=irix ;;
|
||||
esac
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
soname_spec='${libname}${release}.so$major'
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
|
||||
case $host_os in
|
||||
irix5*)
|
||||
irix5* | nonstopux*)
|
||||
libsuff= shlibsuff=
|
||||
;;
|
||||
*)
|
||||
|
@ -2254,11 +2233,12 @@ os2*)
|
|||
osf3* | osf4* | osf5*)
|
||||
version_type=osf
|
||||
need_version=no
|
||||
soname_spec='${libname}${release}.so'
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
|
||||
soname_spec='${libname}${release}.so$major'
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
|
||||
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
|
||||
hardcode_into_libs=yes
|
||||
;;
|
||||
|
||||
sco3.2v5*)
|
||||
|
@ -2301,6 +2281,12 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
|||
case $host_vendor in
|
||||
sni)
|
||||
shlibpath_overrides_runpath=no
|
||||
need_lib_prefix=no
|
||||
export_dynamic_flag_spec='${wl}-Blargedynsym'
|
||||
runpath_var=LD_RUN_PATH
|
||||
;;
|
||||
siemens)
|
||||
need_lib_prefix=no
|
||||
;;
|
||||
motorola)
|
||||
need_lib_prefix=no
|
||||
|
@ -2342,19 +2328,11 @@ sysv4*MP*)
|
|||
esac
|
||||
AC_MSG_RESULT([$dynamic_linker])
|
||||
test "$dynamic_linker" = no && can_build_shared=no
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# Report the final consequences.
|
||||
AC_MSG_CHECKING([if libtool supports shared libraries])
|
||||
AC_MSG_RESULT([$can_build_shared])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([whether to build shared libraries])
|
||||
test "$can_build_shared" = "no" && enable_shared=no
|
||||
|
||||
|
@ -2376,17 +2354,11 @@ aix4*)
|
|||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$enable_shared])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
AC_MSG_CHECKING([whether to build static libraries])
|
||||
# Make sure either enable_shared or enable_static is yes.
|
||||
test "$enable_shared" = yes || enable_static=yes
|
||||
AC_MSG_RESULT([$enable_static])
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
if test "$hardcode_action" = relink; then
|
||||
# Fast installation is not supported
|
||||
|
@ -2404,8 +2376,6 @@ fi
|
|||
|
||||
AC_LIBTOOL_DLOPEN_SELF
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
if test "$enable_shared" = yes && test "$GCC" = yes; then
|
||||
case $archive_cmds in
|
||||
*'~'*)
|
||||
|
@ -2448,11 +2418,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then
|
|||
esac
|
||||
fi
|
||||
need_lc=${lt_cv_archive_cmds_need_lc-yes}
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
## FIXME: this should be a separate macro
|
||||
##
|
||||
# The second clause should only fire when bootstrapping the
|
||||
# libtool distribution, otherwise you forgot to ship ltmain.sh
|
||||
# with your package, and you will get complaints that there are
|
||||
|
@ -2475,7 +2441,7 @@ if test -f "$ltmain"; then
|
|||
# Now quote all the things that may contain metacharacters while being
|
||||
# careful not to overquote the AC_SUBSTed values. We take copies of the
|
||||
# variables and quote the copies for generation of the libtool script.
|
||||
for var in echo old_CC old_CFLAGS \
|
||||
for var in echo old_CC old_CFLAGS SED \
|
||||
AR AR_FLAGS CC LD LN_S NM SHELL \
|
||||
reload_flag reload_cmds wl \
|
||||
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
|
||||
|
@ -2537,8 +2503,11 @@ if test -f "$ltmain"; then
|
|||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# A sed that does not truncate output.
|
||||
SED=$lt_SED
|
||||
|
||||
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
|
||||
Xsed="sed -e s/^X//"
|
||||
Xsed="${SED} -e s/^X//"
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
|
@ -3002,8 +2971,6 @@ EOF
|
|||
(rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
|
||||
chmod +x "$ofile"
|
||||
fi
|
||||
##
|
||||
## END FIXME
|
||||
|
||||
])# _LT_AC_LTCONFIG_HACK
|
||||
|
||||
|
@ -3301,7 +3268,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
|
|||
# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
|
||||
# -- PORTME fill in with the dynamic library characteristics
|
||||
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
|
||||
[AC_CACHE_CHECK([how to recognise dependant libraries],
|
||||
[AC_CACHE_CHECK([how to recognise dependent libraries],
|
||||
lt_cv_deplibs_check_method,
|
||||
[lt_cv_file_magic_cmd='$MAGIC_CMD'
|
||||
lt_cv_file_magic_test_file=
|
||||
|
@ -3376,9 +3343,9 @@ hpux10.20*|hpux11*)
|
|||
lt_cv_file_magic_test_file=/usr/lib/libc.sl
|
||||
;;
|
||||
|
||||
irix5* | irix6*)
|
||||
irix5* | irix6* | nonstopux*)
|
||||
case $host_os in
|
||||
irix5*)
|
||||
irix5* | nonstopux*)
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
|
||||
;;
|
||||
|
@ -3400,7 +3367,7 @@ irix5* | irix6*)
|
|||
# This must be Linux ELF.
|
||||
linux-gnu*)
|
||||
case $host_cpu in
|
||||
alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
|
||||
alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
|
||||
lt_cv_deplibs_check_method=pass_all ;;
|
||||
*)
|
||||
# glibc up to 2.1.1 does not perform some relocations on ARM
|
||||
|
@ -3471,6 +3438,9 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
|||
lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
|
||||
lt_cv_file_magic_test_file=/lib/libc.so
|
||||
;;
|
||||
siemens)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
@ -3536,12 +3506,12 @@ esac
|
|||
])
|
||||
|
||||
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
|
||||
# the libltdl convenience library and INCLTDL to the include flags for
|
||||
# the libltdl convenience library and LTDLINCL to the include flags for
|
||||
# the libltdl header and adds --enable-ltdl-convenience to the
|
||||
# configure arguments. Note that LIBLTDL and INCLTDL are not
|
||||
# configure arguments. Note that LIBLTDL and LTDLINCL are not
|
||||
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
|
||||
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
|
||||
# with '${top_builddir}/' and INCLTDL will be prefixed with
|
||||
# with '${top_builddir}/' and LTDLINCL will be prefixed with
|
||||
# '${top_srcdir}/' (note the single quotes!). If your package is not
|
||||
# flat and you're not using automake, define top_builddir and
|
||||
# top_srcdir appropriately in the Makefiles.
|
||||
|
@ -3553,16 +3523,18 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
|
|||
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
|
||||
esac
|
||||
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
|
||||
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
|
||||
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
|
||||
# For backwards non-gettext consistent compatibility...
|
||||
INCLTDL="$LTDLINCL"
|
||||
])
|
||||
|
||||
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
|
||||
# the libltdl installable library and INCLTDL to the include flags for
|
||||
# the libltdl installable library and LTDLINCL to the include flags for
|
||||
# the libltdl header and adds --enable-ltdl-install to the configure
|
||||
# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
|
||||
# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
|
||||
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
|
||||
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
|
||||
# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
|
||||
# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
|
||||
# with '${top_srcdir}/' (note the single quotes!). If your package is
|
||||
# not flat and you're not using automake, define top_builddir and
|
||||
# top_srcdir appropriately in the Makefiles.
|
||||
|
@ -3580,12 +3552,14 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
|
|||
if test x"$enable_ltdl_install" = x"yes"; then
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-install"
|
||||
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
|
||||
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
|
||||
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
|
||||
else
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
|
||||
LIBLTDL="-lltdl"
|
||||
INCLTDL=
|
||||
LTDLINCL=
|
||||
fi
|
||||
# For backwards non-gettext consistent compatibility...
|
||||
INCLTDL="$LTDLINCL"
|
||||
])
|
||||
|
||||
# old names
|
||||
|
@ -3599,3 +3573,93 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
|
|||
|
||||
# This is just to silence aclocal about the macro not being used
|
||||
ifelse([AC_DISABLE_FAST_INSTALL])
|
||||
|
||||
# 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. #
|
||||
# LT_AC_PROG_SED
|
||||
# --------------
|
||||
# Check for a fully-functional sed program, that truncates
|
||||
# as few characters as possible. Prefer GNU sed if found.
|
||||
AC_DEFUN([LT_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_executable_p="test -f"
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_prog in sed gsed; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
||||
_sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
|
||||
fi
|
||||
done
|
||||
done
|
||||
done
|
||||
|
||||
# Create a temporary directory, and hook for its removal unless debugging.
|
||||
$debug ||
|
||||
{
|
||||
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
|
||||
trap '{ (exit 1); exit 1; }' 1 2 13 15
|
||||
}
|
||||
|
||||
# Create a (secure) tmp directory for tmp files.
|
||||
: ${TMPDIR=/tmp}
|
||||
{
|
||||
tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
|
||||
test -n "$tmp" && test -d "$tmp"
|
||||
} ||
|
||||
{
|
||||
tmp=$TMPDIR/sed$$-$RANDOM
|
||||
(umask 077 && mkdir $tmp)
|
||||
} ||
|
||||
{
|
||||
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
|
||||
{ (exit 1); exit 1; }
|
||||
}
|
||||
_max=0
|
||||
_count=0
|
||||
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
|
||||
# along with /bin/sed that truncates output.
|
||||
for _sed in $_sed_list /usr/xpg4/bin/sed; do
|
||||
test ! -f ${_sed} && break
|
||||
cat /dev/null > "$tmp/sed.in"
|
||||
_count=0
|
||||
echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
|
||||
# Check for GNU sed and select it if it is found.
|
||||
if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
|
||||
lt_cv_path_SED=${_sed}
|
||||
break
|
||||
fi
|
||||
while true; do
|
||||
cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
|
||||
mv "$tmp/sed.tmp" "$tmp/sed.in"
|
||||
cp "$tmp/sed.in" "$tmp/sed.nl"
|
||||
echo >>"$tmp/sed.nl"
|
||||
${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
|
||||
cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
|
||||
# 40000 chars as input seems more than enough
|
||||
test $_count -gt 10 && break
|
||||
_count=`expr $_count + 1`
|
||||
if test $_count -gt $_max; then
|
||||
_max=$_count
|
||||
lt_cv_path_SED=$_sed
|
||||
fi
|
||||
done
|
||||
done
|
||||
rm -rf "$tmp"
|
||||
])
|
||||
if test "X$SED" != "X"; then
|
||||
lt_cv_path_SED=$SED
|
||||
else
|
||||
SED=$lt_cv_path_SED
|
||||
fi
|
||||
AC_MSG_RESULT([$SED])
|
||||
])
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2002-09-03'
|
||||
timestamp='2003-01-10'
|
||||
|
||||
# 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
|
||||
|
@ -98,30 +98,31 @@ trap 'exit 1' 1 2 15
|
|||
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
|
||||
# use `HOST_CC' if defined, but it is deprecated.
|
||||
|
||||
# This shell variable is my proudest work .. or something. --bje
|
||||
# Portable tmp directory creation inspired by the Autoconf team.
|
||||
|
||||
set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
|
||||
(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
|
||||
|| (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
|
||||
dummy=$tmpdir/dummy ;
|
||||
files="$dummy.c $dummy.o $dummy.rel $dummy" ;
|
||||
trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
|
||||
set_cc_for_build='
|
||||
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
||||
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
||||
: ${TMPDIR=/tmp} ;
|
||||
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
||||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
||||
dummy=$tmp/dummy ;
|
||||
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
|
||||
case $CC_FOR_BUILD,$HOST_CC,$CC in
|
||||
,,) echo "int x;" > $dummy.c ;
|
||||
for c in cc gcc c89 c99 ; do
|
||||
if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
|
||||
if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
|
||||
CC_FOR_BUILD="$c"; break ;
|
||||
fi ;
|
||||
done ;
|
||||
rm -f $files ;
|
||||
if test x"$CC_FOR_BUILD" = x ; then
|
||||
CC_FOR_BUILD=no_compiler_found ;
|
||||
fi
|
||||
;;
|
||||
,,*) CC_FOR_BUILD=$CC ;;
|
||||
,*,*) CC_FOR_BUILD=$HOST_CC ;;
|
||||
esac ;
|
||||
unset files'
|
||||
esac ;'
|
||||
|
||||
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
|
||||
# (ghazi@noc.rutgers.edu 1994-08-24)
|
||||
|
@ -178,7 +179,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
;;
|
||||
esac
|
||||
# The OS release
|
||||
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
# Debian GNU/NetBSD machines have a different userland, and
|
||||
# thus, need a distinct triplet. However, they do not need
|
||||
# kernel version information, so it can be replaced with a
|
||||
# suitable tag, in the style of linux-gnu.
|
||||
case "${UNAME_VERSION}" in
|
||||
Debian*)
|
||||
release='-gnu'
|
||||
;;
|
||||
*)
|
||||
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
;;
|
||||
esac
|
||||
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
|
||||
# contains redundant information, the shorter form:
|
||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
||||
|
@ -223,6 +235,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
*:OpenBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:MicroBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
alpha:OSF1:*:*)
|
||||
if test $UNAME_RELEASE = "V4.0"; then
|
||||
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
|
||||
|
@ -257,7 +272,7 @@ main:
|
|||
jsr \$26,exit
|
||||
.end main
|
||||
EOF
|
||||
$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
|
||||
$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
|
||||
if test "$?" = 0 ; then
|
||||
case `$dummy` in
|
||||
0-0)
|
||||
|
@ -286,7 +301,6 @@ EOF
|
|||
;;
|
||||
esac
|
||||
fi
|
||||
rm -f $dummy.s $dummy && rmdir $tmpdir
|
||||
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
||||
exit 0 ;;
|
||||
Alpha\ *:Windows_NT*:*)
|
||||
|
@ -437,10 +451,9 @@ EOF
|
|||
exit (-1);
|
||||
}
|
||||
EOF
|
||||
$CC_FOR_BUILD $dummy.c -o $dummy \
|
||||
$CC_FOR_BUILD -o $dummy $dummy.c \
|
||||
&& $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
|
||||
&& rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
|
||||
rm -f $dummy.c $dummy && rmdir $tmpdir
|
||||
&& exit 0
|
||||
echo mips-mips-riscos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
Motorola:PowerMAX_OS:*:*)
|
||||
|
@ -449,7 +462,7 @@ EOF
|
|||
Motorola:*:4.3:PL8-*)
|
||||
echo powerpc-harris-powermax
|
||||
exit 0 ;;
|
||||
Night_Hawk:*:*:PowerMAX_OS)
|
||||
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
|
||||
echo powerpc-harris-powermax
|
||||
exit 0 ;;
|
||||
Night_Hawk:Power_UNIX:*:*)
|
||||
|
@ -524,8 +537,7 @@ EOF
|
|||
exit(0);
|
||||
}
|
||||
EOF
|
||||
$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
|
||||
rm -f $dummy.c $dummy && rmdir $tmpdir
|
||||
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
|
||||
echo rs6000-ibm-aix3.2.5
|
||||
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
|
||||
echo rs6000-ibm-aix3.2.4
|
||||
|
@ -623,11 +635,21 @@ EOF
|
|||
exit (0);
|
||||
}
|
||||
EOF
|
||||
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
|
||||
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
|
||||
rm -f $dummy.c $dummy && rmdir $tmpdir
|
||||
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
|
||||
test -z "$HP_ARCH" && HP_ARCH=hppa
|
||||
fi ;;
|
||||
esac
|
||||
if [ ${HP_ARCH} = "hppa2.0w" ]
|
||||
then
|
||||
# avoid double evaluation of $set_cc_for_build
|
||||
test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
|
||||
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
|
||||
then
|
||||
HP_ARCH="hppa2.0w"
|
||||
else
|
||||
HP_ARCH="hppa64"
|
||||
fi
|
||||
fi
|
||||
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
|
||||
exit 0 ;;
|
||||
ia64:HP-UX:*:*)
|
||||
|
@ -661,8 +683,7 @@ EOF
|
|||
exit (0);
|
||||
}
|
||||
EOF
|
||||
$CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
|
||||
rm -f $dummy.c $dummy && rmdir $tmpdir
|
||||
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
|
||||
echo unknown-hitachi-hiuxwe2
|
||||
exit 0 ;;
|
||||
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
|
||||
|
@ -720,15 +741,15 @@ EOF
|
|||
CRAY*TS:*:*:*)
|
||||
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
exit 0 ;;
|
||||
CRAY*T3D:*:*:*)
|
||||
echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
exit 0 ;;
|
||||
CRAY*T3E:*:*:*)
|
||||
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
exit 0 ;;
|
||||
CRAY*SV1:*:*:*)
|
||||
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
exit 0 ;;
|
||||
*:UNICOS/mp:*:*)
|
||||
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'`
|
||||
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
||||
|
@ -756,7 +777,6 @@ EOF
|
|||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
rm -f $dummy.c && rmdir $tmpdir
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
|
||||
exit 0 ;;
|
||||
i*:CYGWIN*:*)
|
||||
|
@ -769,13 +789,16 @@ EOF
|
|||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit 0 ;;
|
||||
x86:Interix*:3*)
|
||||
echo i386-pc-interix3
|
||||
echo i586-pc-interix3
|
||||
exit 0 ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
exit 0 ;;
|
||||
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
||||
# How do we know it's Interix rather than the generic POSIX subsystem?
|
||||
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
||||
# UNAME_MACHINE based on the output of uname instead of i386?
|
||||
echo i386-pc-interix
|
||||
echo i586-pc-interix
|
||||
exit 0 ;;
|
||||
i*:UWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-uwin
|
||||
|
@ -818,8 +841,26 @@ EOF
|
|||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
rm -f $dummy.c && rmdir $tmpdir
|
||||
test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
|
||||
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#undef CPU
|
||||
#undef mips64
|
||||
#undef mips64el
|
||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
||||
CPU=mips64el
|
||||
#else
|
||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
||||
CPU=mips64
|
||||
#else
|
||||
CPU=
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
|
||||
;;
|
||||
ppc:Linux:*:*)
|
||||
echo powerpc-unknown-linux-gnu
|
||||
|
@ -914,7 +955,6 @@ EOF
|
|||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
rm -f $dummy.c && rmdir $tmpdir
|
||||
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
|
||||
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
|
||||
;;
|
||||
|
@ -932,6 +972,23 @@ EOF
|
|||
# Use sysv4.2uw... so that sysv4* matches it.
|
||||
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
|
||||
exit 0 ;;
|
||||
i*86:OS/2:*:*)
|
||||
# If we were able to find `uname', then EMX Unix compatibility
|
||||
# is probably installed.
|
||||
echo ${UNAME_MACHINE}-pc-os2-emx
|
||||
exit 0 ;;
|
||||
i*86:XTS-300:*:STOP)
|
||||
echo ${UNAME_MACHINE}-unknown-stop
|
||||
exit 0 ;;
|
||||
i*86:atheos:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-atheos
|
||||
exit 0 ;;
|
||||
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
||||
echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
i*86:*DOS:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-msdosdjgpp
|
||||
exit 0 ;;
|
||||
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
|
||||
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
|
||||
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
|
||||
|
@ -966,9 +1023,6 @@ EOF
|
|||
echo ${UNAME_MACHINE}-pc-sysv32
|
||||
fi
|
||||
exit 0 ;;
|
||||
i*86:*DOS:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-msdosdjgpp
|
||||
exit 0 ;;
|
||||
pc:*:*:*)
|
||||
# Left here for compatibility:
|
||||
# uname -m prints for DJGPP always 'pc', but it prints nothing about
|
||||
|
@ -995,9 +1049,12 @@ EOF
|
|||
mc68k:UNIX:SYSTEM5:3.51m)
|
||||
echo m68k-convergent-sysv
|
||||
exit 0 ;;
|
||||
M680?0:D-NIX:5.3:*)
|
||||
echo m68k-diab-dnix
|
||||
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)
|
||||
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)
|
||||
OS_REL=''
|
||||
test -r /etc/.relid \
|
||||
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
||||
|
@ -1014,9 +1071,6 @@ EOF
|
|||
mc68030:UNIX_System_V:4.*:*)
|
||||
echo m68k-atari-sysv4
|
||||
exit 0 ;;
|
||||
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
||||
echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
TSUNAMI:LynxOS:2.*:*)
|
||||
echo sparc-unknown-lynxos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
|
@ -1098,7 +1152,11 @@ EOF
|
|||
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:Darwin:*:*)
|
||||
echo `uname -p`-apple-darwin${UNAME_RELEASE}
|
||||
case `uname -p` in
|
||||
*86) UNAME_PROCESSOR=i686 ;;
|
||||
powerpc) UNAME_PROCESSOR=powerpc ;;
|
||||
esac
|
||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:procnto*:*:* | *:QNX:[0123456789]*:*)
|
||||
UNAME_PROCESSOR=`uname -p`
|
||||
|
@ -1134,11 +1192,6 @@ EOF
|
|||
fi
|
||||
echo ${UNAME_MACHINE}-unknown-plan9
|
||||
exit 0 ;;
|
||||
i*86:OS/2:*:*)
|
||||
# If we were able to find `uname', then EMX Unix compatibility
|
||||
# is probably installed.
|
||||
echo ${UNAME_MACHINE}-pc-os2-emx
|
||||
exit 0 ;;
|
||||
*:TOPS-10:*:*)
|
||||
echo pdp10-unknown-tops10
|
||||
exit 0 ;;
|
||||
|
@ -1157,12 +1210,6 @@ EOF
|
|||
*:ITS:*:*)
|
||||
echo pdp10-unknown-its
|
||||
exit 0 ;;
|
||||
i*86:XTS-300:*:STOP)
|
||||
echo ${UNAME_MACHINE}-unknown-stop
|
||||
exit 0 ;;
|
||||
i*86:atheos:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-atheos
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
|
@ -1283,8 +1330,7 @@ main ()
|
|||
}
|
||||
EOF
|
||||
|
||||
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
|
||||
rm -f $dummy.c $dummy && rmdir $tmpdir
|
||||
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
|
||||
|
||||
# Apollos put the system type in the environment.
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2002-09-05'
|
||||
timestamp='2003-01-03'
|
||||
|
||||
# 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* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
|
||||
nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
|
@ -245,11 +245,13 @@ case $basic_machine in
|
|||
| mips64vr4300 | mips64vr4300el \
|
||||
| mips64vr5000 | mips64vr5000el \
|
||||
| mipsisa32 | mipsisa32el \
|
||||
| mipsisa32r2 | mipsisa32r2el \
|
||||
| mipsisa64 | mipsisa64el \
|
||||
| mipsisa64sb1 | mipsisa64sb1el \
|
||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||
| mipstx39 | mipstx39el \
|
||||
| mn10200 | mn10300 \
|
||||
| msp430 \
|
||||
| ns16k | ns32k \
|
||||
| openrisc | or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
|
@ -315,11 +317,13 @@ case $basic_machine in
|
|||
| mips64vr4300-* | mips64vr4300el-* \
|
||||
| mips64vr5000-* | mips64vr5000el-* \
|
||||
| mipsisa32-* | mipsisa32el-* \
|
||||
| mipsisa32r2-* | mipsisa32r2el-* \
|
||||
| mipsisa64-* | mipsisa64el-* \
|
||||
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
||||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||
| mipstx39 | mipstx39el \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| msp430-* \
|
||||
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
|
||||
| orion-* \
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
|
@ -716,6 +720,10 @@ case $basic_machine in
|
|||
np1)
|
||||
basic_machine=np1-gould
|
||||
;;
|
||||
nv1)
|
||||
basic_machine=nv1-cray
|
||||
os=-unicosmp
|
||||
;;
|
||||
nsr-tandem)
|
||||
basic_machine=nsr-tandem
|
||||
;;
|
||||
|
@ -901,10 +909,6 @@ case $basic_machine in
|
|||
basic_machine=i386-sequent
|
||||
os=-dynix
|
||||
;;
|
||||
t3d)
|
||||
basic_machine=alpha-cray
|
||||
os=-unicos
|
||||
;;
|
||||
t3e)
|
||||
basic_machine=alphaev5-cray
|
||||
os=-unicos
|
||||
|
@ -977,10 +981,6 @@ case $basic_machine in
|
|||
basic_machine=hppa1.1-winbond
|
||||
os=-proelf
|
||||
;;
|
||||
windows32)
|
||||
basic_machine=i386-pc
|
||||
os=-windows32-msvcrt
|
||||
;;
|
||||
xps | xps100)
|
||||
basic_machine=xps100-honeywell
|
||||
;;
|
||||
|
@ -1113,11 +1113,12 @@ case $os in
|
|||
| -chorusos* | -chorusrdb* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -microbsd*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
|
@ -1129,8 +1130,10 @@ case $os in
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
-nto-qnx*)
|
||||
;;
|
||||
-nto*)
|
||||
os=-nto-qnx
|
||||
os=`echo $os | sed -e 's|nto|nto-qnx|'`
|
||||
;;
|
||||
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
|
||||
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,9 +1,11 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
#!/bin/sh
|
||||
# install - install a program, script, or datafile
|
||||
# This comes from X11R5 (mit/util/scripts/install.sh).
|
||||
#
|
||||
# This originally came from X11R5 (mit/util/scripts/install.sh).
|
||||
|
||||
scriptversion=2003-01-17.15
|
||||
|
||||
# Copyright 1991 by the Massachusetts Institute of Technology
|
||||
# (FSF changes in the public domain.)
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
|
@ -23,13 +25,11 @@
|
|||
# from scratch. It can only install one file at a time, a restriction
|
||||
# shared with many OS's install programs.
|
||||
|
||||
|
||||
# set DOITPROG to echo to test this script
|
||||
|
||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
||||
doit="${DOITPROG-}"
|
||||
|
||||
|
||||
# put in absolute paths if you don't have them in your path; or use env. vars.
|
||||
|
||||
mvprog="${MVPROG-mv}"
|
||||
|
@ -41,210 +41,229 @@ stripprog="${STRIPPROG-strip}"
|
|||
rmprog="${RMPROG-rm}"
|
||||
mkdirprog="${MKDIRPROG-mkdir}"
|
||||
|
||||
transformbasename=""
|
||||
transform_arg=""
|
||||
transformbasename=
|
||||
transform_arg=
|
||||
instcmd="$mvprog"
|
||||
chmodcmd="$chmodprog 0755"
|
||||
chowncmd=""
|
||||
chgrpcmd=""
|
||||
stripcmd=""
|
||||
chowncmd=
|
||||
chgrpcmd=
|
||||
stripcmd=
|
||||
rmcmd="$rmprog -f"
|
||||
mvcmd="$mvprog"
|
||||
src=""
|
||||
dst=""
|
||||
dir_arg=""
|
||||
src=
|
||||
dst=
|
||||
dir_arg=
|
||||
|
||||
while [ x"$1" != x ]; do
|
||||
case $1 in
|
||||
-c) instcmd="$cpprog"
|
||||
shift
|
||||
continue;;
|
||||
usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
|
||||
or: $0 -d DIR1 DIR2...
|
||||
|
||||
-d) dir_arg=true
|
||||
shift
|
||||
continue;;
|
||||
In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
|
||||
In the second, create the directory path DIR.
|
||||
|
||||
-m) chmodcmd="$chmodprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
Options:
|
||||
-b=TRANSFORMBASENAME
|
||||
-c copy source (using $cpprog) instead of moving (using $mvprog).
|
||||
-d create directories instead of installing files.
|
||||
-g GROUP $chgrp installed files to GROUP.
|
||||
-m MODE $chmod installed files to MODE.
|
||||
-o USER $chown installed files to USER.
|
||||
-s strip installed files (using $stripprog).
|
||||
-t=TRANSFORM
|
||||
--help display this help and exit.
|
||||
--version display version info and exit.
|
||||
|
||||
-o) chowncmd="$chownprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
Environment variables override the default commands:
|
||||
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
|
||||
"
|
||||
|
||||
-g) chgrpcmd="$chgrpprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
while test -n "$1"; do
|
||||
case $1 in
|
||||
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-s) stripcmd="$stripprog"
|
||||
shift
|
||||
continue;;
|
||||
-c) instcmd=$cpprog
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
|
||||
shift
|
||||
continue;;
|
||||
-d) dir_arg=true
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
|
||||
shift
|
||||
continue;;
|
||||
-g) chgrpcmd="$chgrpprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
*) if [ x"$src" = x ]
|
||||
then
|
||||
src=$1
|
||||
else
|
||||
# this colon is to work around a 386BSD /bin/sh bug
|
||||
:
|
||||
dst=$1
|
||||
fi
|
||||
shift
|
||||
continue;;
|
||||
esac
|
||||
--help) echo "$usage"; exit 0;;
|
||||
|
||||
-m) chmodcmd="$chmodprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-o) chowncmd="$chownprog $2"
|
||||
shift
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-s) stripcmd=$stripprog
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
|
||||
shift
|
||||
continue;;
|
||||
|
||||
--version) echo "$0 $scriptversion"; exit 0;;
|
||||
|
||||
*) if test -z "$src"; then
|
||||
src=$1
|
||||
else
|
||||
# this colon is to work around a 386BSD /bin/sh bug
|
||||
:
|
||||
dst=$1
|
||||
fi
|
||||
shift
|
||||
continue;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ x"$src" = x ]
|
||||
then
|
||||
echo "install: no input file specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
if test -z "$src"; then
|
||||
echo "$0: no input file specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ x"$dir_arg" != x ]; then
|
||||
dst=$src
|
||||
src=""
|
||||
|
||||
if [ -d $dst ]; then
|
||||
instcmd=:
|
||||
else
|
||||
instcmd=mkdir
|
||||
fi
|
||||
if test -n "$dir_arg"; then
|
||||
dst=$src
|
||||
src=
|
||||
|
||||
if test -d "$dst"; then
|
||||
instcmd=:
|
||||
chmodcmd=
|
||||
else
|
||||
instcmd=$mkdirprog
|
||||
fi
|
||||
else
|
||||
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
|
||||
# might cause directories to be created, which would be especially bad
|
||||
# if $src (and thus $dsttmp) contains '*'.
|
||||
if test ! -f "$src" && test ! -d "$src"; then
|
||||
echo "$0: $src does not exist." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
|
||||
# might cause directories to be created, which would be especially bad
|
||||
# if $src (and thus $dsttmp) contains '*'.
|
||||
if test -z "$dst"; then
|
||||
echo "$0: no destination specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f $src -o -d $src ]
|
||||
then
|
||||
true
|
||||
else
|
||||
echo "install: $src does not exist"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ x"$dst" = x ]
|
||||
then
|
||||
echo "install: no destination specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
fi
|
||||
|
||||
# If destination is a directory, append the input filename; if your system
|
||||
# does not like double slashes in filenames, you may need to add some logic
|
||||
|
||||
if [ -d $dst ]
|
||||
then
|
||||
dst="$dst"/`basename $src`
|
||||
else
|
||||
true
|
||||
fi
|
||||
# If destination is a directory, append the input filename; won't work
|
||||
# if double slashes aren't ignored.
|
||||
if test -d "$dst"; then
|
||||
dst=$dst/`basename "$src"`
|
||||
fi
|
||||
fi
|
||||
|
||||
## this sed command emulates the dirname command
|
||||
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
||||
dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
||||
|
||||
# Make sure that the destination directory exists.
|
||||
# this part is taken from Noah Friedman's mkinstalldirs script
|
||||
# (this part is taken from Noah Friedman's mkinstalldirs script.)
|
||||
|
||||
# Skip lots of stat calls in the usual case.
|
||||
if [ ! -d "$dstdir" ]; then
|
||||
defaultIFS='
|
||||
'
|
||||
IFS="${IFS-${defaultIFS}}"
|
||||
if test ! -d "$dstdir"; then
|
||||
defaultIFS='
|
||||
'
|
||||
IFS="${IFS-$defaultIFS}"
|
||||
|
||||
oIFS="${IFS}"
|
||||
# Some sh's can't handle IFS=/ for some reason.
|
||||
IFS='%'
|
||||
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
|
||||
IFS="${oIFS}"
|
||||
oIFS=$IFS
|
||||
# Some sh's can't handle IFS=/ for some reason.
|
||||
IFS='%'
|
||||
set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
|
||||
IFS=$oIFS
|
||||
|
||||
pathcomp=''
|
||||
pathcomp=
|
||||
|
||||
while [ $# -ne 0 ] ; do
|
||||
pathcomp="${pathcomp}${1}"
|
||||
shift
|
||||
|
||||
if [ ! -d "${pathcomp}" ] ;
|
||||
then
|
||||
$mkdirprog "${pathcomp}"
|
||||
else
|
||||
true
|
||||
fi
|
||||
|
||||
pathcomp="${pathcomp}/"
|
||||
done
|
||||
while test $# -ne 0 ; do
|
||||
pathcomp=$pathcomp$1
|
||||
shift
|
||||
test -d "$pathcomp" || $mkdirprog "$pathcomp"
|
||||
pathcomp=$pathcomp/
|
||||
done
|
||||
fi
|
||||
|
||||
if [ x"$dir_arg" != x ]
|
||||
then
|
||||
$doit $instcmd $dst &&
|
||||
if test -n "$dir_arg"; then
|
||||
$doit $instcmd "$dst" \
|
||||
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
|
||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
|
||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
|
||||
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
|
||||
else
|
||||
# If we're going to rename the final executable, determine the name now.
|
||||
if test -z "$transformarg"; then
|
||||
dstfile=`basename "$dst"`
|
||||
else
|
||||
dstfile=`basename "$dst" $transformbasename \
|
||||
| sed $transformarg`$transformbasename
|
||||
fi
|
||||
|
||||
# If we're going to rename the final executable, determine the name now.
|
||||
# don't allow the sed command to completely eliminate the filename.
|
||||
test -z "$dstfile" && dstfile=`basename "$dst"`
|
||||
|
||||
if [ x"$transformarg" = x ]
|
||||
then
|
||||
dstfile=`basename $dst`
|
||||
else
|
||||
dstfile=`basename $dst $transformbasename |
|
||||
sed $transformarg`$transformbasename
|
||||
fi
|
||||
# Make a couple of temp file names in the proper directory.
|
||||
dsttmp=$dstdir/#inst.$$#
|
||||
rmtmp=$dstdir/#rm.$$#
|
||||
|
||||
# don't allow the sed command to completely eliminate the filename
|
||||
# Trap to clean up those temp files at exit.
|
||||
trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
|
||||
trap '(exit $?); exit' 1 2 13 15
|
||||
|
||||
if [ x"$dstfile" = x ]
|
||||
then
|
||||
dstfile=`basename $dst`
|
||||
else
|
||||
true
|
||||
fi
|
||||
# Move or copy the file name to the temp name
|
||||
$doit $instcmd "$src" "$dsttmp" &&
|
||||
|
||||
# Make a temp file name in the proper directory.
|
||||
# and set any options; do chmod last to preserve setuid bits.
|
||||
#
|
||||
# If any of these fail, we abort the whole thing. If we want to
|
||||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $instcmd $src $dsttmp" command.
|
||||
#
|
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
|
||||
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
|
||||
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
|
||||
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
|
||||
|
||||
dsttmp=$dstdir/#inst.$$#
|
||||
|
||||
# Move or copy the file name to the temp name
|
||||
|
||||
$doit $instcmd $src $dsttmp &&
|
||||
|
||||
trap "rm -f ${dsttmp}" 0 &&
|
||||
|
||||
# and set any options; do chmod last to preserve setuid bits
|
||||
|
||||
# If any of these fail, we abort the whole thing. If we want to
|
||||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $instcmd $src $dsttmp" command.
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
|
||||
$doit $rmcmd -f $dstdir/$dstfile &&
|
||||
$doit $mvcmd $dsttmp $dstdir/$dstfile
|
||||
# Now remove or move aside any old file at destination location. We
|
||||
# try this two ways since rm can't unlink itself on some systems and
|
||||
# the destination file might be busy for other reasons. In this case,
|
||||
# the final cleanup might fail but the new file should still install
|
||||
# successfully.
|
||||
{
|
||||
if test -f "$dstdir/$dstfile"; then
|
||||
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
|
||||
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|
||||
|| {
|
||||
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
|
||||
(exit 1); exit
|
||||
}
|
||||
else
|
||||
:
|
||||
fi
|
||||
} &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
|
||||
fi &&
|
||||
|
||||
# The final little trick to "correctly" pass the exit status to the exit trap.
|
||||
{
|
||||
(exit 0); exit
|
||||
}
|
||||
|
||||
exit 0
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-end: "$"
|
||||
# End:
|
||||
|
|
|
@ -49,14 +49,14 @@ EOF
|
|||
fi
|
||||
|
||||
# The name of this program.
|
||||
progname=`$echo "$0" | sed 's%^.*/%%'`
|
||||
progname=`$echo "$0" | ${SED} 's%^.*/%%'`
|
||||
modename="$progname"
|
||||
|
||||
# Constants.
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.4.2
|
||||
TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)"
|
||||
VERSION=1.4.3
|
||||
TIMESTAMP=" (1.922.2.110 2002/10/23 01:39:54)"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
|
@ -67,10 +67,19 @@ rm="rm -f"
|
|||
|
||||
# Sed substitution that helps us do robust quoting. It backslashifies
|
||||
# metacharacters that are still active within double-quoted strings.
|
||||
Xsed='sed -e 1s/^X//'
|
||||
Xsed="${SED}"' -e 1s/^X//'
|
||||
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
|
||||
SP2NL='tr \040 \012'
|
||||
NL2SP='tr \015\012 \040\040'
|
||||
# test EBCDIC or ASCII
|
||||
case `echo A|od -x` in
|
||||
*[Cc]1*) # EBCDIC based system
|
||||
SP2NL="tr '\100' '\n'"
|
||||
NL2SP="tr '\r\n' '\100\100'"
|
||||
;;
|
||||
*) # Assume ASCII based system
|
||||
SP2NL="tr '\040' '\012'"
|
||||
NL2SP="tr '\015\012' '\040\040'"
|
||||
;;
|
||||
esac
|
||||
|
||||
# NLS nuisances.
|
||||
# Only set LANG and LC_ALL to C if already set.
|
||||
|
@ -144,7 +153,7 @@ do
|
|||
;;
|
||||
|
||||
--config)
|
||||
sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
|
||||
${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
|
||||
exit 0
|
||||
;;
|
||||
|
||||
|
@ -177,6 +186,8 @@ do
|
|||
--mode) prevopt="--mode" prev=mode ;;
|
||||
--mode=*) mode="$optarg" ;;
|
||||
|
||||
--preserve-dup-deps) duplicate_deps="yes" ;;
|
||||
|
||||
--quiet | --silent)
|
||||
show=:
|
||||
;;
|
||||
|
@ -215,7 +226,7 @@ if test -z "$show_help"; then
|
|||
# Infer the operation mode.
|
||||
if test -z "$mode"; then
|
||||
case $nonopt in
|
||||
*cc | *++ | gcc* | *-gcc*)
|
||||
*cc | *++ | gcc* | *-gcc* | xlc*)
|
||||
mode=link
|
||||
for arg
|
||||
do
|
||||
|
@ -467,7 +478,7 @@ if test -z "$show_help"; then
|
|||
pic_mode=default
|
||||
;;
|
||||
esac
|
||||
if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
|
||||
if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
|
||||
# non-PIC code in shared libraries is not supported
|
||||
pic_mode=default
|
||||
fi
|
||||
|
@ -992,7 +1003,7 @@ compiler."
|
|||
# so, if we see these flags be careful not to treat them like -L
|
||||
-L[A-Z][A-Z]*:*)
|
||||
case $with_gcc/$host in
|
||||
no/*-*-irix*)
|
||||
no/*-*-irix* | no/*-*-nonstopux*)
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
;;
|
||||
|
@ -1043,14 +1054,14 @@ compiler."
|
|||
# These systems don't actually have a C library (as such)
|
||||
test "X$arg" = "X-lc" && continue
|
||||
;;
|
||||
*-*-openbsd*)
|
||||
*-*-openbsd* | *-*-freebsd*)
|
||||
# Do not include libc due to us having libc/libc_r.
|
||||
test "X$arg" = "X-lc" && continue
|
||||
;;
|
||||
esac
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd*)
|
||||
*-*-openbsd* | *-*-freebsd*)
|
||||
# Do not include libc_r directly, use -pthread flag.
|
||||
continue
|
||||
;;
|
||||
|
@ -1330,9 +1341,11 @@ compiler."
|
|||
# Find all interdependent deplibs by searching for libraries
|
||||
# that are linked more than once (e.g. -la -lb -la)
|
||||
for deplib in $deplibs; do
|
||||
case "$libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
if test "X$duplicate_deps" = "Xyes" ; then
|
||||
case "$libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
fi
|
||||
libs="$libs $deplib"
|
||||
done
|
||||
deplibs=
|
||||
|
@ -1461,10 +1474,12 @@ compiler."
|
|||
lib)
|
||||
if test "$deplibs_check_method" != pass_all; then
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $deplib."
|
||||
echo "*** Warning: Trying to link with static lib archive $deplib."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
echo "*** shared version of the library, which you do not appear to have"
|
||||
echo "*** because the file extensions .$libext of this argument makes me believe"
|
||||
echo "*** that it is just a static archive that I should not used here."
|
||||
else
|
||||
echo
|
||||
echo "*** Warning: Linking the shared library $output against the"
|
||||
|
@ -1508,7 +1523,7 @@ compiler."
|
|||
fi
|
||||
|
||||
# Check to see that this really is a libtool archive.
|
||||
if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
else
|
||||
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
||||
exit 1
|
||||
|
@ -1555,9 +1570,11 @@ compiler."
|
|||
tmp_libs=
|
||||
for deplib in $dependency_libs; do
|
||||
deplibs="$deplib $deplibs"
|
||||
case "$tmp_libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
if test "X$duplicate_deps" = "Xyes" ; then
|
||||
case "$tmp_libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
fi
|
||||
tmp_libs="$tmp_libs $deplib"
|
||||
done
|
||||
elif test $linkmode != prog && test $linkmode != lib; then
|
||||
|
@ -1680,9 +1697,11 @@ compiler."
|
|||
# or/and link against static libraries
|
||||
newdependency_libs="$deplib $newdependency_libs"
|
||||
fi
|
||||
case "$tmp_libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
if test "X$duplicate_deps" = "Xyes" ; then
|
||||
case "$tmp_libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
fi
|
||||
tmp_libs="$tmp_libs $deplib"
|
||||
done # for deplib
|
||||
continue
|
||||
|
@ -1766,8 +1785,8 @@ compiler."
|
|||
|
||||
# Make a new name for the extract_expsyms_cmds to use
|
||||
soroot="$soname"
|
||||
soname=`echo $soroot | sed -e 's/^.*\///'`
|
||||
newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
|
||||
soname=`echo $soroot | ${SED} -e 's/^.*\///'`
|
||||
newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
|
||||
|
||||
# If the library has no export list, then create one now
|
||||
if test -f "$output_objdir/$soname-def"; then :
|
||||
|
@ -1926,13 +1945,14 @@ compiler."
|
|||
# Just print a warning and add the library to dependency_libs so
|
||||
# that the program can be linked against the static library.
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $lib."
|
||||
echo "*** Warning: This system can not link to static lib archive $lib."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
if test "$module" = yes; then
|
||||
echo "*** Therefore, libtool will create a static module, that should work "
|
||||
echo "*** as long as the dlopening application is linked with the -dlopen flag."
|
||||
echo "*** But as you try to build a module library, libtool will still create "
|
||||
echo "*** a static module, that should work as long as the dlopening application"
|
||||
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
|
||||
if test -z "$global_symbol_pipe"; then
|
||||
echo
|
||||
echo "*** However, this would only work if libtool was able to extract symbol"
|
||||
|
@ -1981,9 +2001,11 @@ compiler."
|
|||
tmp_libs=
|
||||
for deplib in $dependency_libs; do
|
||||
newdependency_libs="$deplib $newdependency_libs"
|
||||
case "$tmp_libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
if test "X$duplicate_deps" = "Xyes" ; then
|
||||
case "$tmp_libs " in
|
||||
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
|
||||
esac
|
||||
fi
|
||||
tmp_libs="$tmp_libs $deplib"
|
||||
done
|
||||
|
||||
|
@ -2009,7 +2031,7 @@ compiler."
|
|||
if grep "^installed=no" $deplib > /dev/null; then
|
||||
path="-L$absdir/$objdir"
|
||||
else
|
||||
eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
if test -z "$libdir"; then
|
||||
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
||||
exit 1
|
||||
|
@ -2273,16 +2295,21 @@ compiler."
|
|||
versuffix=".$current";
|
||||
;;
|
||||
|
||||
irix)
|
||||
irix | nonstopux)
|
||||
major=`expr $current - $age + 1`
|
||||
verstring="sgi$major.$revision"
|
||||
|
||||
case $version_type in
|
||||
nonstopux) verstring_prefix=nonstopux ;;
|
||||
*) verstring_prefix=sgi ;;
|
||||
esac
|
||||
verstring="$verstring_prefix$major.$revision"
|
||||
|
||||
# Add in all the interfaces that we are compatible with.
|
||||
loop=$revision
|
||||
while test $loop != 0; do
|
||||
iface=`expr $revision - $loop`
|
||||
loop=`expr $loop - 1`
|
||||
verstring="sgi$major.$iface:$verstring"
|
||||
verstring="$verstring_prefix$major.$iface:$verstring"
|
||||
done
|
||||
|
||||
# Before this point, $major must not contain `.'.
|
||||
|
@ -2296,7 +2323,7 @@ compiler."
|
|||
;;
|
||||
|
||||
osf)
|
||||
major=`expr $current - $age`
|
||||
major=.`expr $current - $age`
|
||||
versuffix=".$current.$age.$revision"
|
||||
verstring="$current.$age.$revision"
|
||||
|
||||
|
@ -2388,9 +2415,9 @@ compiler."
|
|||
|
||||
# Eliminate all temporary directories.
|
||||
for path in $notinst_path; do
|
||||
lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
|
||||
deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
|
||||
dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
|
||||
lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
|
||||
deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
|
||||
dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
|
||||
done
|
||||
|
||||
if test -n "$xrpath"; then
|
||||
|
@ -2441,7 +2468,7 @@ compiler."
|
|||
*-*-netbsd*)
|
||||
# Don't link with libc until the a.out ld.so is fixed.
|
||||
;;
|
||||
*-*-openbsd*)
|
||||
*-*-openbsd* | *-*-freebsd*)
|
||||
# Do not include libc due to us having libc/libc_r.
|
||||
;;
|
||||
*)
|
||||
|
@ -2502,18 +2529,20 @@ EOF
|
|||
else
|
||||
droppeddeps=yes
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $i."
|
||||
echo "*** Warning: dynamic linker does not accept needed library $i."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
echo "*** shared version of the library, which I believe you do not have"
|
||||
echo "*** because a test_compile did reveal that the linker did not use it for"
|
||||
echo "*** its dynamic dependency list that programs get resolved with at runtime."
|
||||
fi
|
||||
else
|
||||
newdeplibs="$newdeplibs $i"
|
||||
fi
|
||||
done
|
||||
else
|
||||
# Error occured in the first compile. Let's try to salvage the situation:
|
||||
# Compile a seperate program for each library.
|
||||
# Error occured in the first compile. Let's try to salvage
|
||||
# the situation: Compile a separate program for each library.
|
||||
for i in $deplibs; do
|
||||
name="`expr $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
|
@ -2532,10 +2561,12 @@ EOF
|
|||
else
|
||||
droppeddeps=yes
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $i."
|
||||
echo "*** Warning: dynamic linker does not accept needed library $i."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
echo "*** shared version of the library, which you do not appear to have"
|
||||
echo "*** because a test_compile did reveal that the linker did not use this one"
|
||||
echo "*** as a dynamic dependency that programs can get resolved with at runtime."
|
||||
fi
|
||||
else
|
||||
droppeddeps=yes
|
||||
|
@ -2574,14 +2605,14 @@ EOF
|
|||
# but so what?
|
||||
potlib="$potent_lib"
|
||||
while test -h "$potlib" 2>/dev/null; do
|
||||
potliblink=`ls -ld $potlib | sed 's/.* -> //'`
|
||||
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
|
||||
case $potliblink in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
|
||||
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
|
||||
esac
|
||||
done
|
||||
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
|
||||
| sed 10q \
|
||||
| ${SED} 10q \
|
||||
| egrep "$file_magic_regex" > /dev/null; then
|
||||
newdeplibs="$newdeplibs $a_deplib"
|
||||
a_deplib=""
|
||||
|
@ -2592,10 +2623,17 @@ EOF
|
|||
if test -n "$a_deplib" ; then
|
||||
droppeddeps=yes
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $a_deplib."
|
||||
echo "*** Warning: linker path does not have real file for library $a_deplib."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
echo "*** shared version of the library, which you do not appear to have"
|
||||
echo "*** because I did check the linker path looking for a file starting"
|
||||
if test -z "$potlib" ; then
|
||||
echo "*** with $libname but no candidates were found. (...for file magic test)"
|
||||
else
|
||||
echo "*** with $libname and none of the candidates passed a file format test"
|
||||
echo "*** using a file magic. Last file checked: $potlib"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# Add a -L argument.
|
||||
|
@ -2614,8 +2652,9 @@ EOF
|
|||
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
||||
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
|
||||
for potent_lib in $potential_libs; do
|
||||
potlib="$potent_lib" # see symlink-check below in file_magic test
|
||||
if eval echo \"$potent_lib\" 2>/dev/null \
|
||||
| sed 10q \
|
||||
| ${SED} 10q \
|
||||
| egrep "$match_pattern_regex" > /dev/null; then
|
||||
newdeplibs="$newdeplibs $a_deplib"
|
||||
a_deplib=""
|
||||
|
@ -2626,10 +2665,17 @@ EOF
|
|||
if test -n "$a_deplib" ; then
|
||||
droppeddeps=yes
|
||||
echo
|
||||
echo "*** Warning: This library needs some functionality provided by $a_deplib."
|
||||
echo "*** Warning: linker path does not have real file for library $a_deplib."
|
||||
echo "*** I have the capability to make that library automatically link in when"
|
||||
echo "*** you link to this library. But I can only do this if you have a"
|
||||
echo "*** shared version of the library, which you do not appear to have."
|
||||
echo "*** shared version of the library, which you do not appear to have"
|
||||
echo "*** because I did check the linker path looking for a file starting"
|
||||
if test -z "$potlib" ; then
|
||||
echo "*** with $libname but no candidates were found. (...for regex pattern test)"
|
||||
else
|
||||
echo "*** with $libname and none of the candidates passed a file format test"
|
||||
echo "*** using a regex pattern. Last file checked: $potlib"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# Add a -L argument.
|
||||
|
@ -2894,7 +2940,18 @@ EOF
|
|||
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
||||
eval cmds=\"$archive_expsym_cmds\"
|
||||
else
|
||||
save_deplibs="$deplibs"
|
||||
for conv in $convenience; do
|
||||
tmp_deplibs=
|
||||
for test_deplib in $deplibs; do
|
||||
if test "$test_deplib" != "$conv"; then
|
||||
tmp_deplibs="$tmp_deplibs $test_deplib"
|
||||
fi
|
||||
done
|
||||
deplibs="$tmp_deplibs"
|
||||
done
|
||||
eval cmds=\"$archive_cmds\"
|
||||
deplibs="$save_deplibs"
|
||||
fi
|
||||
save_ifs="$IFS"; IFS='~'
|
||||
for cmd in $cmds; do
|
||||
|
@ -3093,7 +3150,7 @@ EOF
|
|||
|
||||
prog)
|
||||
case $host in
|
||||
*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
|
||||
*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
|
||||
esac
|
||||
if test -n "$vinfo"; then
|
||||
$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
|
||||
|
@ -3115,6 +3172,13 @@ EOF
|
|||
# On Rhapsody replace the C library is the System framework
|
||||
compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
|
||||
finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
|
||||
case $host in
|
||||
*darwin*)
|
||||
# Don't allow lazy linking, it breaks C++ global constructors
|
||||
compile_command="$compile_command ${wl}-bind_at_load"
|
||||
finalize_command="$finalize_command ${wl}-bind_at_load"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -3281,9 +3345,9 @@ extern \"C\" {
|
|||
if test -z "$export_symbols"; then
|
||||
export_symbols="$output_objdir/$output.exp"
|
||||
$run $rm $export_symbols
|
||||
$run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
||||
$run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
||||
else
|
||||
$run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
|
||||
$run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
|
||||
$run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
|
||||
$run eval 'mv "$nlist"T "$nlist"'
|
||||
fi
|
||||
|
@ -3291,7 +3355,7 @@ extern \"C\" {
|
|||
|
||||
for arg in $dlprefiles; do
|
||||
$show "extracting global C symbols from \`$arg'"
|
||||
name=`echo "$arg" | sed -e 's%^.*/%%'`
|
||||
name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
|
||||
$run eval 'echo ": $name " >> "$nlist"'
|
||||
$run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
|
||||
done
|
||||
|
@ -3306,7 +3370,13 @@ extern \"C\" {
|
|||
fi
|
||||
|
||||
# Try sorting and uniquifying the output.
|
||||
if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
|
||||
if grep -v "^: " < "$nlist" |
|
||||
if sort -k 3 </dev/null >/dev/null 2>&1; then
|
||||
sort -k 3
|
||||
else
|
||||
sort +2
|
||||
fi |
|
||||
uniq > "$nlist"S; then
|
||||
:
|
||||
else
|
||||
grep -v "^: " < "$nlist" > "$nlist"S
|
||||
|
@ -3528,7 +3598,7 @@ static const void *lt_preloaded_setup() {
|
|||
relink_command="$var=\"$var_value\"; export $var; $relink_command"
|
||||
fi
|
||||
done
|
||||
relink_command="cd `pwd`; $relink_command"
|
||||
relink_command="(cd `pwd`; $relink_command)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
fi
|
||||
|
||||
|
@ -3548,7 +3618,7 @@ static const void *lt_preloaded_setup() {
|
|||
# win32 will think the script is a binary if it has
|
||||
# a .exe suffix, so we strip it off here.
|
||||
case $output in
|
||||
*.exe) output=`echo $output|sed 's,.exe$,,'` ;;
|
||||
*.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
|
||||
esac
|
||||
# test for cygwin because mv fails w/o .exe extensions
|
||||
case $host in
|
||||
|
@ -3572,7 +3642,7 @@ static const void *lt_preloaded_setup() {
|
|||
|
||||
# Sed substitution that helps us do robust quoting. It backslashifies
|
||||
# metacharacters that are still active within double-quoted strings.
|
||||
Xsed='sed -e 1s/^X//'
|
||||
Xsed="${SED}"' -e 1s/^X//'
|
||||
sed_quote_subst='$sed_quote_subst'
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
|
@ -3610,7 +3680,7 @@ else
|
|||
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
|
||||
|
||||
# Follow symbolic links until we get to the real thisdir.
|
||||
file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
|
||||
file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
|
||||
while test -n \"\$file\"; do
|
||||
destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
|
||||
|
||||
|
@ -3623,7 +3693,7 @@ else
|
|||
fi
|
||||
|
||||
file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
|
||||
file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
|
||||
file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
|
||||
done
|
||||
|
||||
# Try to get the absolute directory name.
|
||||
|
@ -3637,7 +3707,7 @@ else
|
|||
progdir=\"\$thisdir/$objdir\"
|
||||
|
||||
if test ! -f \"\$progdir/\$program\" || \\
|
||||
{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
|
||||
{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
|
||||
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
|
||||
|
||||
file=\"\$\$-\$program\"
|
||||
|
@ -3683,7 +3753,7 @@ else
|
|||
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
|
||||
|
||||
# Some systems cannot cope with colon-terminated $shlibpath_var
|
||||
# The second colon is a workaround for a bug in BeOS R4 sed
|
||||
# The second colon is a workaround for a bug in BeOS R4 ${SED}
|
||||
$shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
|
||||
|
||||
export $shlibpath_var
|
||||
|
@ -3858,7 +3928,7 @@ fi\
|
|||
fi
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
|
||||
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
|
||||
# Only create the output if not a dry run.
|
||||
|
@ -3875,7 +3945,7 @@ fi\
|
|||
case $deplib in
|
||||
*.la)
|
||||
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|
||||
eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
if test -z "$libdir"; then
|
||||
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
||||
exit 1
|
||||
|
@ -3889,7 +3959,7 @@ fi\
|
|||
newdlfiles=
|
||||
for lib in $dlfiles; do
|
||||
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
|
||||
eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
if test -z "$libdir"; then
|
||||
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
||||
exit 1
|
||||
|
@ -3900,7 +3970,7 @@ fi\
|
|||
newdlprefiles=
|
||||
for lib in $dlprefiles; do
|
||||
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
|
||||
eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
if test -z "$libdir"; then
|
||||
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
||||
exit 1
|
||||
|
@ -4124,7 +4194,7 @@ relink_command=\"$relink_command\""
|
|||
|
||||
*.la)
|
||||
# Check to see that this really is a libtool archive.
|
||||
if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
else
|
||||
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
|
||||
$echo "$help" 1>&2
|
||||
|
@ -4273,19 +4343,27 @@ relink_command=\"$relink_command\""
|
|||
fi
|
||||
|
||||
# Do a test to see if this is really a libtool program.
|
||||
if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
case $host in
|
||||
*cygwin*|*mingw*)
|
||||
wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
|
||||
;;
|
||||
*)
|
||||
wrapper=$file
|
||||
;;
|
||||
esac
|
||||
if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
|
||||
notinst_deplibs=
|
||||
relink_command=
|
||||
|
||||
# If there is no directory component, then add one.
|
||||
case $file in
|
||||
*/* | *\\*) . $file ;;
|
||||
*) . ./$file ;;
|
||||
*/* | *\\*) . $wrapper ;;
|
||||
*) . ./$wrapper ;;
|
||||
esac
|
||||
|
||||
# Check the variables that should have been set.
|
||||
if test -z "$notinst_deplibs"; then
|
||||
$echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
|
||||
$echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -4310,8 +4388,8 @@ relink_command=\"$relink_command\""
|
|||
relink_command=
|
||||
# If there is no directory component, then add one.
|
||||
case $file in
|
||||
*/* | *\\*) . $file ;;
|
||||
*) . ./$file ;;
|
||||
*/* | *\\*) . $wrapper ;;
|
||||
*) . ./$wrapper ;;
|
||||
esac
|
||||
|
||||
outputname=
|
||||
|
@ -4359,7 +4437,7 @@ relink_command=\"$relink_command\""
|
|||
destfile=$destfile.exe
|
||||
;;
|
||||
*:*.exe)
|
||||
destfile=`echo $destfile | sed -e 's,.exe$,,'`
|
||||
destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
@ -4507,7 +4585,7 @@ relink_command=\"$relink_command\""
|
|||
case $file in
|
||||
*.la)
|
||||
# Check to see that this really is a libtool archive.
|
||||
if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
|
||||
else
|
||||
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
|
||||
$echo "$help" 1>&2
|
||||
|
@ -4578,7 +4656,7 @@ relink_command=\"$relink_command\""
|
|||
-*) ;;
|
||||
*)
|
||||
# Do a test to see if this is really a libtool program.
|
||||
if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
# If there is no directory component, then add one.
|
||||
case $file in
|
||||
*/* | *\\*) . $file ;;
|
||||
|
@ -4610,7 +4688,7 @@ relink_command=\"$relink_command\""
|
|||
fi
|
||||
|
||||
# Now prepare to actually exec the command.
|
||||
exec_cmd='"$cmd"$args'
|
||||
exec_cmd="\$cmd$args"
|
||||
else
|
||||
# Display what would be done.
|
||||
if test -n "$shlibpath_var"; then
|
||||
|
@ -4687,7 +4765,7 @@ relink_command=\"$relink_command\""
|
|||
case $name in
|
||||
*.la)
|
||||
# Possibly a libtool archive, so verify it.
|
||||
if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
. $dir/$name
|
||||
|
||||
# Delete the libtool libraries and symlinks.
|
||||
|
@ -4742,7 +4820,7 @@ relink_command=\"$relink_command\""
|
|||
*)
|
||||
# Do a test to see if this is a libtool program.
|
||||
if test $mode = clean &&
|
||||
(sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
(${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
relink_command=
|
||||
. $dir/$file
|
||||
|
||||
|
|
|
@ -4,37 +4,108 @@
|
|||
# Created: 1993-05-16
|
||||
# Public domain
|
||||
|
||||
# $Id$
|
||||
|
||||
errstatus=0
|
||||
dirmode=""
|
||||
|
||||
usage="\
|
||||
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
|
||||
|
||||
# process command line arguments
|
||||
while test $# -gt 0 ; do
|
||||
case $1 in
|
||||
-h | --help | --h*) # -h for help
|
||||
echo "$usage" 1>&2
|
||||
exit 0
|
||||
;;
|
||||
-m) # -m PERM arg
|
||||
shift
|
||||
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
|
||||
dirmode=$1
|
||||
shift
|
||||
;;
|
||||
--) # stop option processing
|
||||
shift
|
||||
break
|
||||
;;
|
||||
-*) # unknown option
|
||||
echo "$usage" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
*) # first non-opt arg
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
for file
|
||||
do
|
||||
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
|
||||
shift
|
||||
if test -d "$file"; then
|
||||
shift
|
||||
else
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
pathcomp=
|
||||
for d
|
||||
do
|
||||
pathcomp="$pathcomp$d"
|
||||
case "$pathcomp" in
|
||||
-* ) pathcomp=./$pathcomp ;;
|
||||
esac
|
||||
case $# in
|
||||
0) exit 0 ;;
|
||||
esac
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
echo "mkdir $pathcomp" 1>&2
|
||||
case $dirmode in
|
||||
'')
|
||||
if mkdir -p -- . 2>/dev/null; then
|
||||
echo "mkdir -p -- $*"
|
||||
exec mkdir -p -- "$@"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
|
||||
echo "mkdir -m $dirmode -p -- $*"
|
||||
exec mkdir -m "$dirmode" -p -- "$@"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
mkdir "$pathcomp" || lasterr=$?
|
||||
for file
|
||||
do
|
||||
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
|
||||
shift
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
fi
|
||||
fi
|
||||
pathcomp=
|
||||
for d
|
||||
do
|
||||
pathcomp="$pathcomp$d"
|
||||
case $pathcomp in
|
||||
-*) pathcomp=./$pathcomp ;;
|
||||
esac
|
||||
|
||||
pathcomp="$pathcomp/"
|
||||
done
|
||||
if test ! -d "$pathcomp"; then
|
||||
echo "mkdir $pathcomp"
|
||||
|
||||
mkdir "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -d "$pathcomp"; then
|
||||
errstatus=$lasterr
|
||||
else
|
||||
if test ! -z "$dirmode"; then
|
||||
echo "chmod $dirmode $pathcomp"
|
||||
lasterr=""
|
||||
chmod "$dirmode" "$pathcomp" || lasterr=$?
|
||||
|
||||
if test ! -z "$lasterr"; then
|
||||
errstatus=$lasterr
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
pathcomp="$pathcomp/"
|
||||
done
|
||||
done
|
||||
|
||||
exit $errstatus
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# End:
|
||||
# mkinstalldirs ends here
|
||||
|
|
Loading…
Reference in New Issue