add iks-reconf target
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11646 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
2005e1862f
commit
3ec66344ea
|
@ -376,6 +376,12 @@ oz-reconf:
|
||||||
cd libs/openzap && sh ./configure.gnu --prefix=$(PREFIX)
|
cd libs/openzap && sh ./configure.gnu --prefix=$(PREFIX)
|
||||||
$(MAKE) mod_openzap-clean
|
$(MAKE) mod_openzap-clean
|
||||||
|
|
||||||
|
iks-reconf:
|
||||||
|
cd libs/iksemel && $(MAKE) clean
|
||||||
|
cd libs/iksemel && autoreconf -fi
|
||||||
|
cd libs/iksemel && sh ./configure.gnu --prefix=$(PREFIX)
|
||||||
|
$(MAKE) mod_dingaling-clean
|
||||||
|
|
||||||
sofia-reconf:
|
sofia-reconf:
|
||||||
cd libs/sofia-sip && sh ./autogen.sh
|
cd libs/sofia-sip && sh ./autogen.sh
|
||||||
cd libs/sofia-sip && $(MAKE) clean
|
cd libs/sofia-sip && $(MAKE) clean
|
||||||
|
|
|
@ -1,27 +1,43 @@
|
||||||
|
Installation Instructions
|
||||||
|
*************************
|
||||||
|
|
||||||
|
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
|
||||||
|
Software Foundation, Inc.
|
||||||
|
|
||||||
|
This file is free documentation; the Free Software Foundation gives
|
||||||
|
unlimited permission to copy, distribute and modify it.
|
||||||
|
|
||||||
Basic Installation
|
Basic Installation
|
||||||
==================
|
==================
|
||||||
|
|
||||||
These are generic installation instructions.
|
These are generic installation instructions.
|
||||||
|
|
||||||
The `configure' shell script attempts to guess correct values for
|
The `configure' shell script attempts to guess correct values for
|
||||||
various system-dependent variables used during compilation. It uses
|
various system-dependent variables used during compilation. It uses
|
||||||
those values to create a `Makefile' in each directory of the package.
|
those values to create a `Makefile' in each directory of the package.
|
||||||
It may also create one or more `.h' files containing system-dependent
|
It may also create one or more `.h' files containing system-dependent
|
||||||
definitions. Finally, it creates a shell script `config.status' that
|
definitions. Finally, it creates a shell script `config.status' that
|
||||||
you can run in the future to recreate the current configuration, a file
|
you can run in the future to recreate the current configuration, and a
|
||||||
`config.cache' that saves the results of its tests to speed up
|
file `config.log' containing compiler output (useful mainly for
|
||||||
reconfiguring, and a file `config.log' containing compiler output
|
debugging `configure').
|
||||||
(useful mainly for debugging `configure').
|
|
||||||
|
It can also use an optional file (typically called `config.cache'
|
||||||
|
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||||
|
the results of its tests to speed up reconfiguring. (Caching is
|
||||||
|
disabled by default to prevent problems with accidental use of stale
|
||||||
|
cache files.)
|
||||||
|
|
||||||
If you need to do unusual things to compile the package, please try
|
If you need to do unusual things to compile the package, please try
|
||||||
to figure out how `configure' could check whether to do them, and mail
|
to figure out how `configure' could check whether to do them, and mail
|
||||||
diffs or instructions to the address given in the `README' so they can
|
diffs or instructions to the address given in the `README' so they can
|
||||||
be considered for the next release. If at some point `config.cache'
|
be considered for the next release. If you are using the cache, and at
|
||||||
contains results you don't want to keep, you may remove or edit it.
|
some point `config.cache' contains results you don't want to keep, you
|
||||||
|
may remove or edit it.
|
||||||
|
|
||||||
The file `configure.in' is used to create `configure' by a program
|
The file `configure.ac' (or `configure.in') is used to create
|
||||||
called `autoconf'. You only need `configure.in' if you want to change
|
`configure' by a program called `autoconf'. You only need
|
||||||
it or regenerate `configure' using a newer version of `autoconf'.
|
`configure.ac' if you want to change it or regenerate `configure' using
|
||||||
|
a newer version of `autoconf'.
|
||||||
|
|
||||||
The simplest way to compile this package is:
|
The simplest way to compile this package is:
|
||||||
|
|
||||||
|
@ -54,20 +70,22 @@ The simplest way to compile this package is:
|
||||||
Compilers and Options
|
Compilers and Options
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
Some systems require unusual options for compilation or linking that
|
Some systems require unusual options for compilation or linking that the
|
||||||
the `configure' script does not know about. You can give `configure'
|
`configure' script does not know about. Run `./configure --help' for
|
||||||
initial values for variables by setting them in the environment. Using
|
details on some of the pertinent environment variables.
|
||||||
a Bourne-compatible shell, you can do that on the command line like
|
|
||||||
this:
|
|
||||||
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
|
|
||||||
|
|
||||||
Or on systems that have the `env' program, you can do it like this:
|
You can give `configure' initial values for configuration parameters
|
||||||
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
|
by setting variables in the command line or in the environment. Here
|
||||||
|
is an example:
|
||||||
|
|
||||||
|
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
|
||||||
|
|
||||||
|
*Note Defining Variables::, for more details.
|
||||||
|
|
||||||
Compiling For Multiple Architectures
|
Compiling For Multiple Architectures
|
||||||
====================================
|
====================================
|
||||||
|
|
||||||
You can compile the package for more than one kind of computer at the
|
You can compile the package for more than one kind of computer at the
|
||||||
same time, by placing the object files for each architecture in their
|
same time, by placing the object files for each architecture in their
|
||||||
own directory. To do this, you must use a version of `make' that
|
own directory. To do this, you must use a version of `make' that
|
||||||
supports the `VPATH' variable, such as GNU `make'. `cd' to the
|
supports the `VPATH' variable, such as GNU `make'. `cd' to the
|
||||||
|
@ -75,28 +93,28 @@ directory where you want the object files and executables to go and run
|
||||||
the `configure' script. `configure' automatically checks for the
|
the `configure' script. `configure' automatically checks for the
|
||||||
source code in the directory that `configure' is in and in `..'.
|
source code in the directory that `configure' is in and in `..'.
|
||||||
|
|
||||||
If you have to use a `make' that does not supports the `VPATH'
|
If you have to use a `make' that does not support the `VPATH'
|
||||||
variable, you have to compile the package for one architecture at a time
|
variable, you have to compile the package for one architecture at a
|
||||||
in the source code directory. After you have installed the package for
|
time in the source code directory. After you have installed the
|
||||||
one architecture, use `make distclean' before reconfiguring for another
|
package for one architecture, use `make distclean' before reconfiguring
|
||||||
architecture.
|
for another architecture.
|
||||||
|
|
||||||
Installation Names
|
Installation Names
|
||||||
==================
|
==================
|
||||||
|
|
||||||
By default, `make install' will install the package's files in
|
By default, `make install' installs the package's commands under
|
||||||
`/usr/local/bin', `/usr/local/man', etc. You can specify an
|
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||||
installation prefix other than `/usr/local' by giving `configure' the
|
can specify an installation prefix other than `/usr/local' by giving
|
||||||
option `--prefix=PATH'.
|
`configure' the option `--prefix=PREFIX'.
|
||||||
|
|
||||||
You can specify separate installation prefixes for
|
You can specify separate installation prefixes for
|
||||||
architecture-specific files and architecture-independent files. If you
|
architecture-specific files and architecture-independent files. If you
|
||||||
give `configure' the option `--exec-prefix=PATH', the package will use
|
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||||
PATH as the prefix for installing programs and libraries.
|
PREFIX as the prefix for installing programs and libraries.
|
||||||
Documentation and other data files will still use the regular prefix.
|
Documentation and other data files still use the regular prefix.
|
||||||
|
|
||||||
In addition, if you use an unusual directory layout you can give
|
In addition, if you use an unusual directory layout you can give
|
||||||
options like `--bindir=PATH' to specify different values for particular
|
options like `--bindir=DIR' to specify different values for particular
|
||||||
kinds of files. Run `configure --help' for a list of the directories
|
kinds of files. Run `configure --help' for a list of the directories
|
||||||
you can set and what kinds of files go in them.
|
you can set and what kinds of files go in them.
|
||||||
|
|
||||||
|
@ -107,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||||
Optional Features
|
Optional Features
|
||||||
=================
|
=================
|
||||||
|
|
||||||
Some packages pay attention to `--enable-FEATURE' options to
|
Some packages pay attention to `--enable-FEATURE' options to
|
||||||
`configure', where FEATURE indicates an optional part of the package.
|
`configure', where FEATURE indicates an optional part of the package.
|
||||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||||
is something like `gnu-as' or `x' (for the X Window System). The
|
is something like `gnu-as' or `x' (for the X Window System). The
|
||||||
|
@ -122,48 +140,86 @@ you can use the `configure' options `--x-includes=DIR' and
|
||||||
Specifying the System Type
|
Specifying the System Type
|
||||||
==========================
|
==========================
|
||||||
|
|
||||||
There may be some features `configure' can not figure out
|
There may be some features `configure' cannot figure out automatically,
|
||||||
automatically, but needs to determine by the type of host the package
|
but needs to determine by the type of machine the package will run on.
|
||||||
will run on. Usually `configure' can figure that out, but if it prints
|
Usually, assuming the package is built to be run on the _same_
|
||||||
a message saying it can not guess the host type, give it the
|
architectures, `configure' can figure that out, but if it prints a
|
||||||
`--host=TYPE' option. TYPE can either be a short name for the system
|
message saying it cannot guess the machine type, give it the
|
||||||
type, such as `sun4', or a canonical name with three fields:
|
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||||
|
type, such as `sun4', or a canonical name which has the form:
|
||||||
|
|
||||||
CPU-COMPANY-SYSTEM
|
CPU-COMPANY-SYSTEM
|
||||||
|
|
||||||
See the file `config.sub' for the possible values of each field. If
|
where SYSTEM can have one of these forms:
|
||||||
`config.sub' isn't included in this package, then this package doesn't
|
|
||||||
need to know the host type.
|
|
||||||
|
|
||||||
If you are building compiler tools for cross-compiling, you can also
|
OS KERNEL-OS
|
||||||
use the `--target=TYPE' option to select the type of system they will
|
|
||||||
produce code for and the `--build=TYPE' option to select the type of
|
See the file `config.sub' for the possible values of each field. If
|
||||||
system on which you are compiling the package.
|
`config.sub' isn't included in this package, then this package doesn't
|
||||||
|
need to know the machine type.
|
||||||
|
|
||||||
|
If you are _building_ compiler tools for cross-compiling, you should
|
||||||
|
use the option `--target=TYPE' to select the type of system they will
|
||||||
|
produce code for.
|
||||||
|
|
||||||
|
If you want to _use_ a cross compiler, that generates code for a
|
||||||
|
platform different from the build platform, you should specify the
|
||||||
|
"host" platform (i.e., that on which the generated programs will
|
||||||
|
eventually be run) with `--host=TYPE'.
|
||||||
|
|
||||||
Sharing Defaults
|
Sharing Defaults
|
||||||
================
|
================
|
||||||
|
|
||||||
If you want to set default values for `configure' scripts to share,
|
If you want to set default values for `configure' scripts to share, you
|
||||||
you can create a site shell script called `config.site' that gives
|
can create a site shell script called `config.site' that gives default
|
||||||
default values for variables like `CC', `cache_file', and `prefix'.
|
values for variables like `CC', `cache_file', and `prefix'.
|
||||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||||
`CONFIG_SITE' environment variable to the location of the site script.
|
`CONFIG_SITE' environment variable to the location of the site script.
|
||||||
A warning: not all `configure' scripts look for a site script.
|
A warning: not all `configure' scripts look for a site script.
|
||||||
|
|
||||||
Operation Controls
|
Defining Variables
|
||||||
==================
|
==================
|
||||||
|
|
||||||
`configure' recognizes the following options to control how it
|
Variables not defined in a site shell script can be set in the
|
||||||
operates.
|
environment passed to `configure'. However, some packages may run
|
||||||
|
configure again during the build, and the customized values of these
|
||||||
|
variables may be lost. In order to avoid this problem, you should set
|
||||||
|
them in the `configure' command line, using `VAR=value'. For example:
|
||||||
|
|
||||||
`--cache-file=FILE'
|
./configure CC=/usr/local2/bin/gcc
|
||||||
Use and save the results of the tests in FILE instead of
|
|
||||||
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
|
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||||
debugging `configure'.
|
overridden in the site shell script). Here is a another example:
|
||||||
|
|
||||||
|
/bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||||
|
|
||||||
|
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
|
||||||
|
configuration-related scripts to be executed by `/bin/bash'.
|
||||||
|
|
||||||
|
`configure' Invocation
|
||||||
|
======================
|
||||||
|
|
||||||
|
`configure' recognizes the following options to control how it operates.
|
||||||
|
|
||||||
`--help'
|
`--help'
|
||||||
|
`-h'
|
||||||
Print a summary of the options to `configure', and exit.
|
Print a summary of the options to `configure', and exit.
|
||||||
|
|
||||||
|
`--version'
|
||||||
|
`-V'
|
||||||
|
Print the version of Autoconf used to generate the `configure'
|
||||||
|
script, and exit.
|
||||||
|
|
||||||
|
`--cache-file=FILE'
|
||||||
|
Enable the cache: use and save the results of the tests in FILE,
|
||||||
|
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||||
|
disable caching.
|
||||||
|
|
||||||
|
`--config-cache'
|
||||||
|
`-C'
|
||||||
|
Alias for `--cache-file=config.cache'.
|
||||||
|
|
||||||
`--quiet'
|
`--quiet'
|
||||||
`--silent'
|
`--silent'
|
||||||
`-q'
|
`-q'
|
||||||
|
@ -175,8 +231,6 @@ operates.
|
||||||
Look for the package's source code in directory DIR. Usually
|
Look for the package's source code in directory DIR. Usually
|
||||||
`configure' can determine that directory automatically.
|
`configure' can determine that directory automatically.
|
||||||
|
|
||||||
`--version'
|
`configure' also accepts some other, not widely useful, options. Run
|
||||||
Print the version of Autoconf used to generate the `configure'
|
`configure --help' for more details.
|
||||||
script, and exit.
|
|
||||||
|
|
||||||
`configure' also accepts some other, not widely useful, options.
|
|
||||||
|
|
|
@ -33,9 +33,6 @@ basename="s,^.*/,,g"
|
||||||
# function.
|
# function.
|
||||||
progpath="$0"
|
progpath="$0"
|
||||||
|
|
||||||
# define SED for historic ltconfig's generated by Libtool 1.3
|
|
||||||
test -z "$SED" && SED=sed
|
|
||||||
|
|
||||||
# The name of this program:
|
# The name of this program:
|
||||||
progname=`echo "$progpath" | $SED $basename`
|
progname=`echo "$progpath" | $SED $basename`
|
||||||
modename="$progname"
|
modename="$progname"
|
||||||
|
@ -49,17 +46,16 @@ PACKAGE=libtool
|
||||||
VERSION=1.5.22
|
VERSION=1.5.22
|
||||||
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
||||||
|
|
||||||
# See if we are running on zsh, and set the options which allow our
|
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||||
# commands through without removal of \ escapes.
|
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||||
if test -n "${ZSH_VERSION+set}" ; then
|
emulate sh
|
||||||
|
NULLCMD=:
|
||||||
|
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||||||
|
# is contrary to our usage. Disable this feature.
|
||||||
|
alias -g '${1+"$@"}'='"$@"'
|
||||||
setopt NO_GLOB_SUBST
|
setopt NO_GLOB_SUBST
|
||||||
fi
|
else
|
||||||
# Same for EGREP, and just to be sure, do LTCC as well
|
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||||
if test "X$EGREP" = X ; then
|
|
||||||
EGREP=egrep
|
|
||||||
fi
|
|
||||||
if test "X$LTCC" = X ; then
|
|
||||||
LTCC=${CC-gcc}
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check that we have a working $echo.
|
# Check that we have a working $echo.
|
||||||
|
@ -115,12 +111,14 @@ esac
|
||||||
# These must not be set unconditionally because not all systems understand
|
# These must not be set unconditionally because not all systems understand
|
||||||
# e.g. LANG=C (notably SCO).
|
# e.g. LANG=C (notably SCO).
|
||||||
# We save the old values to restore during execute mode.
|
# We save the old values to restore during execute mode.
|
||||||
if test "${LC_ALL+set}" = set; then
|
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
|
do
|
||||||
fi
|
eval "if test \"\${$lt_var+set}\" = set; then
|
||||||
if test "${LANG+set}" = set; then
|
save_$lt_var=\$$lt_var
|
||||||
save_LANG="$LANG"; LANG=C; export LANG
|
$lt_var=C
|
||||||
fi
|
export $lt_var
|
||||||
|
fi"
|
||||||
|
done
|
||||||
|
|
||||||
# Make sure IFS has a sensible default
|
# Make sure IFS has a sensible default
|
||||||
lt_nl='
|
lt_nl='
|
||||||
|
@ -146,30 +144,8 @@ duplicate_deps=no
|
||||||
preserve_args=
|
preserve_args=
|
||||||
lo2o="s/\\.lo\$/.${objext}/"
|
lo2o="s/\\.lo\$/.${objext}/"
|
||||||
o2lo="s/\\.${objext}\$/.lo/"
|
o2lo="s/\\.${objext}\$/.lo/"
|
||||||
|
extracted_archives=
|
||||||
if test -z "$max_cmd_len"; then
|
extracted_serial=0
|
||||||
i=0
|
|
||||||
testring="ABCD"
|
|
||||||
new_result=
|
|
||||||
|
|
||||||
# If test is not a shell built-in, we'll probably end up computing a
|
|
||||||
# maximum length that is only half of the actual maximum length, but
|
|
||||||
# we can't tell.
|
|
||||||
while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
|
|
||||||
= "XX$testring") >/dev/null 2>&1 &&
|
|
||||||
new_result=`expr "X$testring" : ".*" 2>&1` &&
|
|
||||||
max_cmd_len="$new_result" &&
|
|
||||||
test "$i" != 17 # 1/2 MB should be enough
|
|
||||||
do
|
|
||||||
i=`expr $i + 1`
|
|
||||||
testring="$testring$testring"
|
|
||||||
done
|
|
||||||
testring=
|
|
||||||
# Add a significant safety factor because C++ compilers can tack on massive
|
|
||||||
# amounts of additional arguments before passing them to the linker.
|
|
||||||
# It appears as though 1/2 is a usable value.
|
|
||||||
max_cmd_len=`expr $max_cmd_len \/ 2`
|
|
||||||
fi
|
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# Shell function definitions:
|
# Shell function definitions:
|
||||||
|
@ -291,17 +267,7 @@ func_infer_tag ()
|
||||||
esac
|
esac
|
||||||
CC_quoted="$CC_quoted $arg"
|
CC_quoted="$CC_quoted $arg"
|
||||||
done
|
done
|
||||||
# user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
|
|
||||||
trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
|
|
||||||
# and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
|
|
||||||
extendcc=${host}-${CC}
|
|
||||||
case "$@ " in
|
case "$@ " in
|
||||||
"cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
|
|
||||||
"gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
|
|
||||||
tagname=CC
|
|
||||||
break ;;
|
|
||||||
"$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
|
|
||||||
"$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
|
|
||||||
" $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
|
" $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
|
||||||
# The compiler in the base compile command matches
|
# The compiler in the base compile command matches
|
||||||
# the one in the tagged configuration.
|
# the one in the tagged configuration.
|
||||||
|
@ -371,7 +337,17 @@ func_extract_archives ()
|
||||||
*) my_xabs=`pwd`"/$my_xlib" ;;
|
*) my_xabs=`pwd`"/$my_xlib" ;;
|
||||||
esac
|
esac
|
||||||
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
|
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
|
||||||
my_xdir="$my_gentop/$my_xlib"
|
my_xlib_u=$my_xlib
|
||||||
|
while :; do
|
||||||
|
case " $extracted_archives " in
|
||||||
|
*" $my_xlib_u "*)
|
||||||
|
extracted_serial=`expr $extracted_serial + 1`
|
||||||
|
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
||||||
|
*) break ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
extracted_archives="$extracted_archives $my_xlib_u"
|
||||||
|
my_xdir="$my_gentop/$my_xlib_u"
|
||||||
|
|
||||||
$show "${rm}r $my_xdir"
|
$show "${rm}r $my_xdir"
|
||||||
$run ${rm}r "$my_xdir"
|
$run ${rm}r "$my_xdir"
|
||||||
|
@ -802,6 +778,7 @@ if test -z "$show_help"; then
|
||||||
*.f90) xform=f90 ;;
|
*.f90) xform=f90 ;;
|
||||||
*.for) xform=for ;;
|
*.for) xform=for ;;
|
||||||
*.java) xform=java ;;
|
*.java) xform=java ;;
|
||||||
|
*.obj) xform=obj ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
||||||
|
@ -895,7 +872,7 @@ if test -z "$show_help"; then
|
||||||
# Lock this critical section if it is needed
|
# Lock this critical section if it is needed
|
||||||
# We use this script file to make the link, it avoids creating a new file
|
# We use this script file to make the link, it avoids creating a new file
|
||||||
if test "$need_locks" = yes; then
|
if test "$need_locks" = yes; then
|
||||||
until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
|
until $run ln "$progpath" "$lockfile" 2>/dev/null; do
|
||||||
$show "Waiting for $lockfile to be removed"
|
$show "Waiting for $lockfile to be removed"
|
||||||
sleep 2
|
sleep 2
|
||||||
done
|
done
|
||||||
|
@ -1182,8 +1159,9 @@ EOF
|
||||||
for arg
|
for arg
|
||||||
do
|
do
|
||||||
case $arg in
|
case $arg in
|
||||||
-all-static | -static)
|
-all-static | -static | -static-libtool-libs)
|
||||||
if test "X$arg" = "X-all-static"; then
|
case $arg in
|
||||||
|
-all-static)
|
||||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||||
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
||||||
fi
|
fi
|
||||||
|
@ -1191,12 +1169,20 @@ EOF
|
||||||
dlopen_self=$dlopen_self_static
|
dlopen_self=$dlopen_self_static
|
||||||
fi
|
fi
|
||||||
prefer_static_libs=yes
|
prefer_static_libs=yes
|
||||||
else
|
;;
|
||||||
|
-static)
|
||||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||||
dlopen_self=$dlopen_self_static
|
dlopen_self=$dlopen_self_static
|
||||||
fi
|
fi
|
||||||
prefer_static_libs=built
|
prefer_static_libs=built
|
||||||
fi
|
;;
|
||||||
|
-static-libtool-libs)
|
||||||
|
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||||
|
dlopen_self=$dlopen_self_static
|
||||||
|
fi
|
||||||
|
prefer_static_libs=yes
|
||||||
|
;;
|
||||||
|
esac
|
||||||
build_libtool_libs=no
|
build_libtool_libs=no
|
||||||
build_old_libs=yes
|
build_old_libs=yes
|
||||||
break
|
break
|
||||||
|
@ -1756,7 +1742,7 @@ EOF
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-static)
|
-static | -static-libtool-libs)
|
||||||
# The effects of -static are defined in a previous loop.
|
# The effects of -static are defined in a previous loop.
|
||||||
# We used to do the same as -all-static on platforms that
|
# We used to do the same as -all-static on platforms that
|
||||||
# didn't have a PIC flag, but the assumption that the effects
|
# didn't have a PIC flag, but the assumption that the effects
|
||||||
|
@ -2534,7 +2520,9 @@ EOF
|
||||||
|
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
if test "$linkmode,$pass" = "prog,link"; then
|
||||||
if test -n "$library_names" &&
|
if test -n "$library_names" &&
|
||||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
{ { test "$prefer_static_libs" = no ||
|
||||||
|
test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
||||||
|
test -z "$old_library"; }; then
|
||||||
# We need to hardcode the library path
|
# We need to hardcode the library path
|
||||||
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
||||||
# Make sure the rpath contains only unique directories.
|
# Make sure the rpath contains only unique directories.
|
||||||
|
@ -3230,7 +3218,7 @@ EOF
|
||||||
# which has an extra 1 added just for fun
|
# which has an extra 1 added just for fun
|
||||||
#
|
#
|
||||||
case $version_type in
|
case $version_type in
|
||||||
darwin|linux|osf|windows)
|
darwin|linux|osf|windows|none)
|
||||||
current=`expr $number_major + $number_minor`
|
current=`expr $number_major + $number_minor`
|
||||||
age="$number_minor"
|
age="$number_minor"
|
||||||
revision="$number_revision"
|
revision="$number_revision"
|
||||||
|
@ -3454,11 +3442,11 @@ EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Eliminate all temporary directories.
|
# Eliminate all temporary directories.
|
||||||
for path in $notinst_path; do
|
# for path in $notinst_path; do
|
||||||
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||||
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||||
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||||
done
|
# done
|
||||||
|
|
||||||
if test -n "$xrpath"; then
|
if test -n "$xrpath"; then
|
||||||
# If the user specified any rpath flags, then add them.
|
# If the user specified any rpath flags, then add them.
|
||||||
|
@ -3559,13 +3547,12 @@ EOF
|
||||||
int main() { return 0; }
|
int main() { return 0; }
|
||||||
EOF
|
EOF
|
||||||
$rm conftest
|
$rm conftest
|
||||||
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
|
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
||||||
if test "$?" -eq 0 ; then
|
|
||||||
ldd_output=`ldd conftest`
|
ldd_output=`ldd conftest`
|
||||||
for i in $deplibs; do
|
for i in $deplibs; do
|
||||||
name=`expr $i : '-l\(.*\)'`
|
name=`expr $i : '-l\(.*\)'`
|
||||||
# If $name is empty we are operating on a -L argument.
|
# If $name is empty we are operating on a -L argument.
|
||||||
if test "$name" != "" && test "$name" -ne "0"; then
|
if test "$name" != "" && test "$name" != "0"; then
|
||||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||||
case " $predeps $postdeps " in
|
case " $predeps $postdeps " in
|
||||||
*" $i "*)
|
*" $i "*)
|
||||||
|
@ -3604,9 +3591,7 @@ EOF
|
||||||
# If $name is empty we are operating on a -L argument.
|
# If $name is empty we are operating on a -L argument.
|
||||||
if test "$name" != "" && test "$name" != "0"; then
|
if test "$name" != "" && test "$name" != "0"; then
|
||||||
$rm conftest
|
$rm conftest
|
||||||
$LTCC $LTCFLAGS -o conftest conftest.c $i
|
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
|
||||||
# Did it work?
|
|
||||||
if test "$?" -eq 0 ; then
|
|
||||||
ldd_output=`ldd conftest`
|
ldd_output=`ldd conftest`
|
||||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||||
case " $predeps $postdeps " in
|
case " $predeps $postdeps " in
|
||||||
|
@ -3638,7 +3623,7 @@ EOF
|
||||||
droppeddeps=yes
|
droppeddeps=yes
|
||||||
$echo
|
$echo
|
||||||
$echo "*** Warning! Library $i is needed by this library but I was not able to"
|
$echo "*** Warning! Library $i is needed by this library but I was not able to"
|
||||||
$echo "*** make it link in! You will probably need to install it or some"
|
$echo "*** make it link in! You will probably need to install it or some"
|
||||||
$echo "*** library that it depends on before this library will be fully"
|
$echo "*** library that it depends on before this library will be fully"
|
||||||
$echo "*** functional. Installing it before continuing would be even better."
|
$echo "*** functional. Installing it before continuing would be even better."
|
||||||
fi
|
fi
|
||||||
|
@ -3686,13 +3671,6 @@ EOF
|
||||||
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
|
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
# It is ok to link against an archive when
|
|
||||||
# building a shared library.
|
|
||||||
if $AR -t $potlib > /dev/null 2>&1; then
|
|
||||||
newdeplibs="$newdeplibs $a_deplib"
|
|
||||||
a_deplib=""
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
|
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
|
||||||
| ${SED} 10q \
|
| ${SED} 10q \
|
||||||
| $EGREP "$file_magic_regex" > /dev/null; then
|
| $EGREP "$file_magic_regex" > /dev/null; then
|
||||||
|
@ -4290,12 +4268,14 @@ EOF
|
||||||
reload_conv_objs=
|
reload_conv_objs=
|
||||||
gentop=
|
gentop=
|
||||||
# reload_cmds runs $LD directly, so let us get rid of
|
# reload_cmds runs $LD directly, so let us get rid of
|
||||||
# -Wl from whole_archive_flag_spec
|
# -Wl from whole_archive_flag_spec and hope we can get by with
|
||||||
|
# turning comma into space..
|
||||||
wl=
|
wl=
|
||||||
|
|
||||||
if test -n "$convenience"; then
|
if test -n "$convenience"; then
|
||||||
if test -n "$whole_archive_flag_spec"; then
|
if test -n "$whole_archive_flag_spec"; then
|
||||||
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
||||||
|
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
||||||
else
|
else
|
||||||
gentop="$output_objdir/${obj}x"
|
gentop="$output_objdir/${obj}x"
|
||||||
generated="$generated $gentop"
|
generated="$generated $gentop"
|
||||||
|
@ -4743,16 +4723,16 @@ static const void *lt_preloaded_setup() {
|
||||||
case $host in
|
case $host in
|
||||||
*cygwin* | *mingw* )
|
*cygwin* | *mingw* )
|
||||||
if test -f "$output_objdir/${outputname}.def" ; then
|
if test -f "$output_objdir/${outputname}.def" ; then
|
||||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||||
else
|
else
|
||||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
@ -4767,13 +4747,13 @@ static const void *lt_preloaded_setup() {
|
||||||
# really was required.
|
# really was required.
|
||||||
|
|
||||||
# Nullify the symbol file.
|
# Nullify the symbol file.
|
||||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
|
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
|
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
||||||
# Replace the output file specification.
|
# Replace the output file specification.
|
||||||
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
|
||||||
link_command="$compile_command$compile_rpath"
|
link_command="$compile_command$compile_rpath"
|
||||||
|
|
||||||
# We have no uninstalled library dependencies, so finalize right now.
|
# We have no uninstalled library dependencies, so finalize right now.
|
||||||
|
@ -4860,7 +4840,7 @@ static const void *lt_preloaded_setup() {
|
||||||
if test "$fast_install" != no; then
|
if test "$fast_install" != no; then
|
||||||
link_command="$finalize_var$compile_command$finalize_rpath"
|
link_command="$finalize_var$compile_command$finalize_rpath"
|
||||||
if test "$fast_install" = yes; then
|
if test "$fast_install" = yes; then
|
||||||
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
|
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
|
||||||
else
|
else
|
||||||
# fast_install is set to needless
|
# fast_install is set to needless
|
||||||
relink_command=
|
relink_command=
|
||||||
|
@ -4897,7 +4877,7 @@ static const void *lt_preloaded_setup() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
relink_command="(cd `pwd`; $relink_command)"
|
relink_command="(cd `pwd`; $relink_command)"
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Quote $echo for shipping.
|
# Quote $echo for shipping.
|
||||||
|
@ -5304,6 +5284,18 @@ EOF
|
||||||
Xsed='${SED} -e 1s/^X//'
|
Xsed='${SED} -e 1s/^X//'
|
||||||
sed_quote_subst='$sed_quote_subst'
|
sed_quote_subst='$sed_quote_subst'
|
||||||
|
|
||||||
|
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||||
|
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
|
||||||
|
emulate sh
|
||||||
|
NULLCMD=:
|
||||||
|
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
|
||||||
|
# is contrary to our usage. Disable this feature.
|
||||||
|
alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
||||||
|
setopt NO_GLOB_SUBST
|
||||||
|
else
|
||||||
|
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
||||||
|
fi
|
||||||
|
|
||||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||||
# if CDPATH is set.
|
# if CDPATH is set.
|
||||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||||
|
@ -5430,11 +5422,6 @@ else
|
||||||
$echo >> $output "\
|
$echo >> $output "\
|
||||||
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
||||||
# Run the actual program with our arguments.
|
# Run the actual program with our arguments.
|
||||||
|
|
||||||
# Make sure env LD_LIBRARY_PATH does not mess us up
|
|
||||||
if test -n \"\${LD_LIBRARY_PATH+set}\"; then
|
|
||||||
export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
|
|
||||||
fi
|
|
||||||
"
|
"
|
||||||
case $host in
|
case $host in
|
||||||
# Backslashes separate directories on plain windows
|
# Backslashes separate directories on plain windows
|
||||||
|
@ -5451,7 +5438,7 @@ else
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
$echo >> $output "\
|
$echo >> $output "\
|
||||||
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
|
\$echo \"\$0: cannot exec \$program \$*\"
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
@ -5637,7 +5624,7 @@ fi\
|
||||||
done
|
done
|
||||||
# Quote the link command for shipping.
|
# Quote the link command for shipping.
|
||||||
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||||
if test "$hardcode_automatic" = yes ; then
|
if test "$hardcode_automatic" = yes ; then
|
||||||
relink_command=
|
relink_command=
|
||||||
fi
|
fi
|
||||||
|
@ -5662,48 +5649,9 @@ fi\
|
||||||
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
fi
|
fi
|
||||||
if test "X$EGREP" = X ; then
|
newdependency_libs="$newdependency_libs $libdir/$name"
|
||||||
EGREP=egrep
|
|
||||||
fi
|
|
||||||
# We do not want PiSi's install root ($INSTALL_ROOT) present. Check only for
|
|
||||||
# this if the .la is being installed.
|
|
||||||
if test "$installed" = yes && test "$INSTALL_ROOT"; then
|
|
||||||
eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$INSTALL_ROOT:/:g" -e 's:/\+:/:g'`
|
|
||||||
else
|
|
||||||
mynewdependency_lib="$libdir/$name"
|
|
||||||
fi
|
|
||||||
# Do not add duplicates
|
|
||||||
if test "$mynewdependency_lib"; then
|
|
||||||
my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
if test -z "$my_little_ninja_foo_1"; then
|
|
||||||
newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
if test "$installed" = yes; then
|
|
||||||
# We do not want PiSi's build root ($WORK_DIR) present.
|
|
||||||
my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$WORK_DIR"`
|
|
||||||
# We do not want PiSi's install root ($INSTALL_ROOT) present.
|
|
||||||
my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$INSTALL_ROOT"`
|
|
||||||
if test -n "$my_little_ninja_foo_2" && test "$WORK_DIR"; then
|
|
||||||
mynewdependency_lib=""
|
|
||||||
elif test -n "$my_little_ninja_foo_3" && test "$INSTALL_DIR"; then
|
|
||||||
eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$INSTALL_DIR:/:g" -e 's:/\+:/:g'`
|
|
||||||
else
|
|
||||||
mynewdependency_lib="$deplib"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
mynewdependency_lib="$deplib"
|
|
||||||
fi
|
|
||||||
# Do not add duplicates
|
|
||||||
if test "$mynewdependency_lib"; then
|
|
||||||
my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
|
||||||
if test -z "$my_little_ninja_foo_4"; then
|
|
||||||
newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
|
*) newdependency_libs="$newdependency_libs $deplib" ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
dependency_libs="$newdependency_libs"
|
dependency_libs="$newdependency_libs"
|
||||||
|
@ -5755,10 +5703,6 @@ fi\
|
||||||
case $host,$output,$installed,$module,$dlname in
|
case $host,$output,$installed,$module,$dlname in
|
||||||
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
||||||
esac
|
esac
|
||||||
# Do not add duplicates
|
|
||||||
if test "$installed" = yes && test "$INSTALL_DIR"; then
|
|
||||||
install_libdir=`echo "$install_libdir" |sed -e "s:$INSTALL_DIR:/:g" -e 's:/\+:/:g'`
|
|
||||||
fi
|
|
||||||
$echo > $output "\
|
$echo > $output "\
|
||||||
# $outputname - a libtool library file
|
# $outputname - a libtool library file
|
||||||
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
|
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
|
||||||
|
@ -6025,9 +5969,9 @@ relink_command=\"$relink_command\""
|
||||||
|
|
||||||
if test -n "$inst_prefix_dir"; then
|
if test -n "$inst_prefix_dir"; then
|
||||||
# Stick the inst_prefix_dir data into the link command.
|
# Stick the inst_prefix_dir data into the link command.
|
||||||
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
|
||||||
else
|
else
|
||||||
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
$echo "$modename: warning: relinking \`$file'" 1>&2
|
||||||
|
@ -6236,7 +6180,7 @@ relink_command=\"$relink_command\""
|
||||||
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
|
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
|
||||||
outputname="$tmpdir/$file"
|
outputname="$tmpdir/$file"
|
||||||
# Replace the output file specification.
|
# Replace the output file specification.
|
||||||
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
|
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
|
||||||
|
|
||||||
$show "$relink_command"
|
$show "$relink_command"
|
||||||
if $run eval "$relink_command"; then :
|
if $run eval "$relink_command"; then :
|
||||||
|
@ -6512,12 +6456,15 @@ relink_command=\"$relink_command\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Restore saved environment variables
|
# Restore saved environment variables
|
||||||
if test "${save_LC_ALL+set}" = set; then
|
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
LC_ALL="$save_LC_ALL"; export LC_ALL
|
do
|
||||||
fi
|
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||||
if test "${save_LANG+set}" = set; then
|
$lt_var=\$save_$lt_var; export $lt_var
|
||||||
LANG="$save_LANG"; export LANG
|
else
|
||||||
fi
|
$lt_unset $lt_var
|
||||||
|
fi"
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
# Now prepare to actually exec the command.
|
# Now prepare to actually exec the command.
|
||||||
exec_cmd="\$cmd$args"
|
exec_cmd="\$cmd$args"
|
||||||
|
@ -6874,9 +6821,9 @@ The following components of LINK-COMMAND are treated specially:
|
||||||
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
|
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
|
||||||
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
||||||
-export-symbols SYMFILE
|
-export-symbols SYMFILE
|
||||||
try to export only the symbols listed in SYMFILE
|
try to export only the symbols listed in SYMFILE
|
||||||
-export-symbols-regex REGEX
|
-export-symbols-regex REGEX
|
||||||
try to export only the symbols matching REGEX
|
try to export only the symbols matching REGEX
|
||||||
-LLIBDIR search LIBDIR for required installed libraries
|
-LLIBDIR search LIBDIR for required installed libraries
|
||||||
-lNAME OUTPUT-FILE requires the installed library libNAME
|
-lNAME OUTPUT-FILE requires the installed library libNAME
|
||||||
-module build a library that can dlopened
|
-module build a library that can dlopened
|
||||||
|
@ -6890,9 +6837,11 @@ The following components of LINK-COMMAND are treated specially:
|
||||||
-release RELEASE specify package release information
|
-release RELEASE specify package release information
|
||||||
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
||||||
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
||||||
-static do not do any dynamic linking of libtool libraries
|
-static do not do any dynamic linking of uninstalled libtool libraries
|
||||||
|
-static-libtool-libs
|
||||||
|
do not do any dynamic linking of libtool libraries
|
||||||
-version-info CURRENT[:REVISION[:AGE]]
|
-version-info CURRENT[:REVISION[:AGE]]
|
||||||
specify library version info [each variable defaults to 0]
|
specify library version info [each variable defaults to 0]
|
||||||
|
|
||||||
All other options (arguments beginning with \`-') are ignored.
|
All other options (arguments beginning with \`-') are ignored.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue