mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
Test for sched_yield as the native yield function first. Corrected typo
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * configure.in: Test for sched_yield as the native yield function first. Corrected typo g_thread_sleep -> g_usleep. Corrected message for the pthread_create test. Negative Priorities are allowed (and used on Solaris), so consider sched_get_priority_min failed only if it returns -1, not <0. Check for sched_get_priority_min also in -lrt, if not found in -lpthread alone and add -lrt to G_THREAD_LIBS then. Remove special case handling of priorities for older solaris versions and posix threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting some of those changes. * config.guess, config.sub, ltconfig, ltmain.sh: Upgrade to libtool 1.3.4.
This commit is contained in:
Sebastian Wilhelmi
Sebastian Wilhelmi
parent
fdb55f623a
commit
762a2befa4
16
ChangeLog
16
ChangeLog
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2000-03-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* configure.in: Test for sched_yield as the native yield function
|
||||
first. Corrected typo g_thread_sleep -> g_usleep. Corrected
|
||||
message for the pthread_create test. Negative Priorities are
|
||||
allowed (and used on Solaris), so consider
|
||||
sched_get_priority_min failed only if it returns -1, not <0. Check
|
||||
for sched_get_priority_min also in -lrt, if not found in -lpthread
|
||||
alone and add -lrt to G_THREAD_LIBS then. Remove special case
|
||||
handling of priorities for older solaris versions and posix
|
||||
threads. Thanks to Wan-Teh Chang <wtc@netscape.com> for suggesting
|
||||
some of those changes.
|
||||
|
||||
* config.guess, config.sub, ltconfig, ltmain.sh:
|
||||
Upgrade to libtool 1.3.4.
|
||||
|
||||
2000-03-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* glib.h, configure.in, gutils.h: always define G_GNUC_EXTENSION,
|
||||
|
||||
94
config.guess
vendored
94
config.guess
vendored
@ -24,7 +24,7 @@
|
||||
|
||||
# Written by Per Bothner <bothner@cygnus.com>.
|
||||
# The master version of this file is at the FSF in /home/gd/gnu/lib.
|
||||
# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
|
||||
# Please send patches to <autoconf-patches@gnu.org>.
|
||||
#
|
||||
# This script attempts to guess a canonical system name similar to
|
||||
# config.sub. If it succeeds, it prints the system name on stdout, and
|
||||
@ -156,6 +156,9 @@ EOF
|
||||
wgrisc:OpenBSD:*:*)
|
||||
echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:OS/390:*:*)
|
||||
echo i370-ibm-openedition
|
||||
exit 0 ;;
|
||||
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
||||
echo arm-acorn-riscix${UNAME_RELEASE}
|
||||
exit 0;;
|
||||
@ -328,15 +331,18 @@ EOF
|
||||
AViiON:dgux:*:*)
|
||||
# DG/UX returns AViiON for all architectures
|
||||
UNAME_PROCESSOR=`/usr/bin/uname -p`
|
||||
if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
|
||||
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
|
||||
-o ${TARGET_BINARY_INTERFACE}x = x ] ; then
|
||||
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
|
||||
then
|
||||
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
|
||||
[ ${TARGET_BINARY_INTERFACE}x = x ]
|
||||
then
|
||||
echo m88k-dg-dgux${UNAME_RELEASE}
|
||||
else
|
||||
else
|
||||
echo m88k-dg-dguxbcs${UNAME_RELEASE}
|
||||
fi
|
||||
else
|
||||
echo i586-dg-dgux${UNAME_RELEASE}
|
||||
fi
|
||||
else echo i586-dg-dgux${UNAME_RELEASE}
|
||||
fi
|
||||
exit 0 ;;
|
||||
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
|
||||
echo m88k-dolphin-sysv3
|
||||
@ -453,7 +459,7 @@ EOF
|
||||
exit (0);
|
||||
}
|
||||
EOF
|
||||
($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
|
||||
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
|
||||
rm -f $dummy.c $dummy
|
||||
esac
|
||||
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
|
||||
@ -550,7 +556,7 @@ EOF
|
||||
echo t90-cray-unicos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
CRAY*T3E:*:*:*)
|
||||
echo t3e-cray-unicosmk${UNAME_RELEASE}
|
||||
echo alpha-cray-unicosmk${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
CRAY-2:*:*:*)
|
||||
echo cray2-cray-unicos
|
||||
@ -588,7 +594,7 @@ EOF
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
exit 0 ;;
|
||||
*:NetBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
|
||||
exit 0 ;;
|
||||
*:OpenBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
@ -618,12 +624,6 @@ EOF
|
||||
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
exit 0 ;;
|
||||
*:Linux:*:*)
|
||||
# uname on the ARM produces all sorts of strangeness, and we need to
|
||||
# filter it out.
|
||||
case "$UNAME_MACHINE" in
|
||||
armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
|
||||
arm* | sa110*) UNAME_MACHINE="arm" ;;
|
||||
esac
|
||||
|
||||
# The BFD linker knows what the default object file format is, so
|
||||
# first see if it will tell us. cd to the root directory to prevent
|
||||
@ -636,11 +636,38 @@ EOF
|
||||
s/ .*//
|
||||
p'`
|
||||
case "$ld_supported_emulations" in
|
||||
i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
|
||||
i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
|
||||
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
|
||||
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
|
||||
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
|
||||
*ia64)
|
||||
echo "${UNAME_MACHINE}-unknown-linux"
|
||||
exit 0
|
||||
;;
|
||||
i?86linux)
|
||||
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
||||
exit 0
|
||||
;;
|
||||
i?86coff)
|
||||
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
|
||||
exit 0
|
||||
;;
|
||||
sparclinux)
|
||||
echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
|
||||
exit 0
|
||||
;;
|
||||
armlinux)
|
||||
echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
|
||||
exit 0
|
||||
;;
|
||||
elf32arm*)
|
||||
echo "${UNAME_MACHINE}-unknown-linux-gnu"
|
||||
exit 0
|
||||
;;
|
||||
armelf_linux*)
|
||||
echo "${UNAME_MACHINE}-unknown-linux-gnu"
|
||||
exit 0
|
||||
;;
|
||||
m68klinux)
|
||||
echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
|
||||
exit 0
|
||||
;;
|
||||
elf32ppc)
|
||||
# Determine Lib Version
|
||||
cat >$dummy.c <<EOF
|
||||
@ -670,7 +697,9 @@ EOF
|
||||
fi
|
||||
fi
|
||||
rm -f $dummy.c $dummy
|
||||
echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
|
||||
echo powerpc-unknown-linux-gnu${LIBC}
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "${UNAME_MACHINE}" = "alpha" ; then
|
||||
@ -797,19 +826,21 @@ EOF
|
||||
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
|
||||
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
|
||||
echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
|
||||
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
|
||||
else
|
||||
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
|
||||
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
|
||||
fi
|
||||
exit 0 ;;
|
||||
i?86:*:5:7*)
|
||||
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
|
||||
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
|
||||
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
|
||||
(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
|
||||
(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
|
||||
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
|
||||
# Fixed at (any) Pentium or better
|
||||
UNAME_MACHINE=i586
|
||||
if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
|
||||
echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
|
||||
else
|
||||
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
|
||||
fi
|
||||
exit 0 ;;
|
||||
i?86:*:3.2:*)
|
||||
if test -f /usr/options/cb.name; then
|
||||
@ -943,6 +974,9 @@ EOF
|
||||
*:Rhapsody:*:*)
|
||||
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:QNX:*:4*)
|
||||
echo i386-qnx-qnx${UNAME_VERSION}
|
||||
exit 0 ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
|
||||
45
config.sub
vendored
45
config.sub
vendored
@ -105,7 +105,7 @@ case $os in
|
||||
-scout)
|
||||
;;
|
||||
-wrs)
|
||||
os=vxworks
|
||||
os=-vxworks
|
||||
basic_machine=$1
|
||||
;;
|
||||
-hiux*)
|
||||
@ -156,13 +156,17 @@ case $os in
|
||||
-psos*)
|
||||
os=-psos
|
||||
;;
|
||||
-mint | -mint[0-9]*)
|
||||
basic_machine=m68k-atari
|
||||
os=-mint
|
||||
;;
|
||||
esac
|
||||
|
||||
# Decode aliases for certain CPU-COMPANY combinations.
|
||||
case $basic_machine in
|
||||
# Recognize the basic CPU types without company name.
|
||||
# Some are omitted here because they have special meanings below.
|
||||
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
|
||||
tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
|
||||
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
|
||||
| 580 | i960 | h8300 \
|
||||
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
|
||||
@ -171,12 +175,12 @@ case $basic_machine in
|
||||
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
|
||||
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
|
||||
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
|
||||
| mips64vr5000 | miprs64vr5000el \
|
||||
| mips64vr5000 | miprs64vr5000el | mcore \
|
||||
| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
|
||||
| thumb | d10v)
|
||||
| thumb | d10v | fr30)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
|
||||
;;
|
||||
|
||||
# We use `pc' rather than `unknown'
|
||||
@ -191,7 +195,8 @@ case $basic_machine in
|
||||
exit 1
|
||||
;;
|
||||
# Recognize the basic CPU types with company name.
|
||||
vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
|
||||
# FIXME: clean up the formatting here.
|
||||
vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
|
||||
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
|
||||
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
|
||||
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
|
||||
@ -204,10 +209,10 @@ case $basic_machine in
|
||||
| sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
|
||||
| mips64el-* | mips64orion-* | mips64orionel-* \
|
||||
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| mipstx39-* | mipstx39el-* | mcore-* \
|
||||
| f301-* | armv*-* | t3e-* \
|
||||
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
|
||||
| thumb-* | v850-* | d30v-* | tic30-* | c30-* )
|
||||
| thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
|
||||
;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
@ -425,7 +430,6 @@ case $basic_machine in
|
||||
;;
|
||||
i370-ibm* | ibm*)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
;;
|
||||
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
|
||||
i[34567]86v32)
|
||||
@ -460,6 +464,9 @@ case $basic_machine in
|
||||
basic_machine=i386-unknown
|
||||
os=-mingw32
|
||||
;;
|
||||
i386-qnx | qnx)
|
||||
basic_machine=i386-qnx
|
||||
;;
|
||||
iris | iris4d)
|
||||
basic_machine=mips-sgi
|
||||
case $os in
|
||||
@ -488,7 +495,7 @@ case $basic_machine in
|
||||
miniframe)
|
||||
basic_machine=m68000-convergent
|
||||
;;
|
||||
*mint | *MiNT)
|
||||
*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
|
||||
basic_machine=m68k-atari
|
||||
os=-mint
|
||||
;;
|
||||
@ -514,6 +521,10 @@ case $basic_machine in
|
||||
basic_machine=i386-unknown
|
||||
os=-msdos
|
||||
;;
|
||||
mvs)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
;;
|
||||
ncr3000)
|
||||
basic_machine=i486-ncr
|
||||
os=-sysv4
|
||||
@ -523,7 +534,7 @@ case $basic_machine in
|
||||
os=-netbsd
|
||||
;;
|
||||
netwinder)
|
||||
basic_machine=armv4l-corel
|
||||
basic_machine=armv4l-rebel
|
||||
os=-linux
|
||||
;;
|
||||
news | news700 | news800 | news900)
|
||||
@ -907,7 +918,7 @@ case $os in
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
|
||||
| -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
|
||||
@ -926,6 +937,9 @@ case $os in
|
||||
-sunos6*)
|
||||
os=`echo $os | sed -e 's|sunos6|solaris3|'`
|
||||
;;
|
||||
-opened*)
|
||||
os=-openedition
|
||||
;;
|
||||
-osfrose*)
|
||||
os=-osfrose
|
||||
;;
|
||||
@ -963,6 +977,9 @@ case $os in
|
||||
-oss*)
|
||||
os=-sysv3
|
||||
;;
|
||||
-qnx)
|
||||
os=-qnx4
|
||||
;;
|
||||
-svr4)
|
||||
os=-sysv4
|
||||
;;
|
||||
@ -1012,7 +1029,7 @@ case $basic_machine in
|
||||
*-acorn)
|
||||
os=-riscix1.2
|
||||
;;
|
||||
arm*-corel)
|
||||
arm*-rebel)
|
||||
os=-linux
|
||||
;;
|
||||
arm*-semi)
|
||||
@ -1186,7 +1203,7 @@ case $basic_machine in
|
||||
-genix*)
|
||||
vendor=ns
|
||||
;;
|
||||
-mvs*)
|
||||
-mvs* | -opened*)
|
||||
vendor=ibm
|
||||
;;
|
||||
-ptx*)
|
||||
|
||||
30
configure.in
30
configure.in
@ -750,7 +750,7 @@ case $have_threads in
|
||||
|
||||
LIBS="$glib_save_LIBS $add_thread_lib"
|
||||
|
||||
AC_MSG_CHECKING(for pthread_join$IN)
|
||||
AC_MSG_CHECKING(for pthread_create$IN)
|
||||
AC_TRY_RUN([#include <pthread.h>
|
||||
void* func(void* data) {}
|
||||
main()
|
||||
@ -807,7 +807,6 @@ case $host in
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
AC_MSG_CHECKING(thread related libraries)
|
||||
AC_MSG_RESULT($G_THREAD_LIBS)
|
||||
|
||||
@ -909,14 +908,25 @@ if test x"$enable_threads" = xyes; then
|
||||
AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE)],
|
||||
[AC_MSG_RESULT(no)])
|
||||
# If sched_get_priority_min(SCHED_OTHER) returns something
|
||||
# negative, we ignore it. This happens on Solaris.
|
||||
# negative, we ignore it.
|
||||
AC_MSG_CHECKING(for minimal/maximal thread priority)
|
||||
AC_TRY_RUN([#include <pthread.h>
|
||||
int main ()
|
||||
{ return sched_get_priority_min(SCHED_OTHER) < 0;}],
|
||||
{ return sched_get_priority_min(SCHED_OTHER) == -1;}],
|
||||
[posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
|
||||
posix_priority_max="sched_get_priority_max(SCHED_OTHER)"],
|
||||
[posix_priority_min=none])
|
||||
# On some platforms we need to link to -lrt to use the
|
||||
# sched_* functions
|
||||
LIBS="$LIBS -lrt"
|
||||
AC_TRY_RUN([#include <pthread.h>
|
||||
int main ()
|
||||
{ return sched_get_priority_min(SCHED_OTHER) == -1;}],
|
||||
[posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
|
||||
posix_priority_max="sched_get_priority_max(SCHED_OTHER)"
|
||||
G_THREAD_LIBS="$G_THREAD_LIBS -lrt"],
|
||||
[posix_priority_min=none])
|
||||
LIBS="$glib_save_LIBS $G_THREAD_LIBS"
|
||||
if test x"$posix_priority_min" = xnone; then
|
||||
AC_EGREP_CPP(PX_PRIO_MIN,[#include <pthread.h>
|
||||
PX_PRIO_MIN],,[
|
||||
@ -929,14 +939,6 @@ if test x"$enable_threads" = xyes; then
|
||||
posix_priority_min=PRI_OTHER_MIN
|
||||
posix_priority_max=PRI_OTHER_MAX])
|
||||
fi
|
||||
if test x"$posix_priority_min" = xnone; then
|
||||
case $host in
|
||||
*-*-solaris*)
|
||||
posix_priority_min=1
|
||||
posix_priority_max=127
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
if test x"$posix_priority_min" = xnone; then
|
||||
AC_MSG_RESULT(none found)
|
||||
AC_MSG_WARN($POSIX_NO_PRIORITIES)
|
||||
@ -949,7 +951,7 @@ if test x"$enable_threads" = xyes; then
|
||||
fi
|
||||
posix_yield_func=none
|
||||
AC_MSG_CHECKING(for posix yield function)
|
||||
for yield_func in pthread_yield_np pthread_yield sched_yield \
|
||||
for yield_func in sched_yield pthread_yield_np pthread_yield \
|
||||
thr_yield; do
|
||||
AC_TRY_LINK([#include <pthread.h>],
|
||||
[$yield_func()],
|
||||
@ -959,7 +961,7 @@ if test x"$enable_threads" = xyes; then
|
||||
if test x"$posix_yield_func" = xnone; then
|
||||
AC_MSG_RESULT(none found)
|
||||
AC_MSG_WARN($POSIX_NO_YIELD)
|
||||
posix_yield_func="g_thread_sleep(1000)"
|
||||
posix_yield_func="g_usleep(1000)"
|
||||
else
|
||||
AC_MSG_RESULT($posix_yield_func)
|
||||
posix_yield_func="$posix_yield_func()"
|
||||
|
||||
185
ltconfig
185
ltconfig
@ -53,7 +53,7 @@ fi
|
||||
|
||||
# Find the correct PATH separator. Usually this is `:', but
|
||||
# DJGPP uses `;' like DOS.
|
||||
if test "X${PATH_SEPARATOR+set}" != "Xset"; then
|
||||
if test "X${PATH_SEPARATOR+set}" != Xset; then
|
||||
UNAME=${UNAME-`uname 2>/dev/null`}
|
||||
case X$UNAME in
|
||||
*-DOS) PATH_SEPARATOR=';' ;;
|
||||
@ -63,9 +63,9 @@ fi
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
|
||||
if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
|
||||
|
||||
if test "X${echo_test_string+set}" != "Xset"; then
|
||||
if test "X${echo_test_string+set}" != Xset; then
|
||||
# find a string as large as possible, as long as the shell can cope with it
|
||||
for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
|
||||
# expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
|
||||
@ -169,10 +169,10 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
|
||||
# Constants:
|
||||
PROGRAM=ltconfig
|
||||
PACKAGE=libtool
|
||||
VERSION=1.3.3
|
||||
TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
|
||||
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
|
||||
VERSION=1.3.4
|
||||
TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
rm="rm -f"
|
||||
|
||||
help="Try \`$progname --help' for more information."
|
||||
@ -369,8 +369,8 @@ exec 5>>./config.log
|
||||
# Only set LANG and LC_ALL to C if already set.
|
||||
# These must not be set unconditionally because not all systems understand
|
||||
# e.g. LANG=C (notably SCO).
|
||||
if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
|
||||
if test "${LANG+set}" = set; then LANG=C; export LANG; fi
|
||||
if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
|
||||
if test "X${LANG+set}" = Xset; then LANG=C; export LANG; fi
|
||||
|
||||
if test -n "$cache_file" && test -r "$cache_file"; then
|
||||
echo "loading cache $cache_file within ltconfig"
|
||||
@ -462,7 +462,7 @@ aix3*)
|
||||
# AIX sometimes has problems with the GCC collect2 program. For some
|
||||
# reason, if we set the COLLECT_NAMES environment variable, the problems
|
||||
# vanish in a puff of smoke.
|
||||
if test "${COLLECT_NAMES+set}" != set; then
|
||||
if test "X${COLLECT_NAMES+set}" != Xset; then
|
||||
COLLECT_NAMES=
|
||||
export COLLECT_NAMES
|
||||
fi
|
||||
@ -663,7 +663,7 @@ if test "$with_gcc" = yes; then
|
||||
link_static_flag='-static'
|
||||
|
||||
case "$host_os" in
|
||||
beos* | irix5* | irix6* | osf3* | osf4*)
|
||||
beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
aix*)
|
||||
@ -718,7 +718,7 @@ else
|
||||
# We can build DLLs from non-PIC.
|
||||
;;
|
||||
|
||||
osf3* | osf4*)
|
||||
osf3* | osf4* | osf5*)
|
||||
# All OSF/1 code is PIC.
|
||||
wl='-Wl,'
|
||||
link_static_flag='-non_shared'
|
||||
@ -1187,7 +1187,7 @@ EOF
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
||||
archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
|
||||
archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
||||
else
|
||||
@ -1196,7 +1196,7 @@ EOF
|
||||
fi
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
solaris* | sysv5*)
|
||||
if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
|
||||
ld_shlibs=no
|
||||
cat <<EOF 1>&2
|
||||
@ -1244,7 +1244,12 @@ EOF
|
||||
whole_archive_flag_spec=
|
||||
;;
|
||||
*)
|
||||
whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
# ancient GNU ld didn't support --whole-archive et. al.
|
||||
if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
|
||||
whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
else
|
||||
whole_archive_flag_spec=
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -1405,7 +1410,7 @@ else
|
||||
old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
|
||||
;;
|
||||
|
||||
osf3* | osf4*)
|
||||
osf3*)
|
||||
if test "$with_gcc" = yes; then
|
||||
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
|
||||
archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
|
||||
@ -1417,6 +1422,18 @@ else
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
|
||||
osf4* | osf5*) # As osf3* with the addition of the -msym flag
|
||||
if test "$with_gcc" = yes; then
|
||||
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
|
||||
archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
|
||||
else
|
||||
allow_undefined_flag=' -expect_unresolved \*'
|
||||
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
|
||||
fi
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
|
||||
sco3.2v5*)
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
hardcode_shlibpath_var=no
|
||||
@ -1461,6 +1478,18 @@ else
|
||||
export_dynamic_flag_spec='-Bexport'
|
||||
;;
|
||||
|
||||
sysv5*)
|
||||
no_undefined_flag=' -z text'
|
||||
# $CC -shared without GNU ld will not create a library from C++
|
||||
# object files and a static libstdc++, better avoid it by now
|
||||
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
|
||||
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
|
||||
hardcode_libdir_flag_spec=
|
||||
hardcode_shlibpath_var=no
|
||||
runpath_var='LD_RUN_PATH'
|
||||
;;
|
||||
|
||||
uts4*)
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
@ -1474,16 +1503,30 @@ else
|
||||
;;
|
||||
|
||||
sysv4*MP*)
|
||||
if test -d /usr/nec ;then
|
||||
# archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs'
|
||||
archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
|
||||
hardcode_shlibpath_var=no
|
||||
runpath_var=LD_RUN_PATH
|
||||
hardcode_runpath_var=yes
|
||||
ld_shlibs=yes
|
||||
if test -d /usr/nec; then
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
hardcode_shlibpath_var=no
|
||||
runpath_var=LD_RUN_PATH
|
||||
hardcode_runpath_var=yes
|
||||
ld_shlibs=yes
|
||||
fi
|
||||
;;
|
||||
|
||||
sysv4.2uw2*)
|
||||
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
|
||||
hardcode_direct=yes
|
||||
hardcode_minus_L=no
|
||||
hardcode_shlibpath_var=no
|
||||
hardcode_runpath_var=yes
|
||||
runpath_var=LD_RUN_PATH
|
||||
;;
|
||||
|
||||
unixware7*)
|
||||
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
|
||||
runpath_var='LD_RUN_PATH'
|
||||
hardcode_shlibpath_var=no
|
||||
;;
|
||||
|
||||
*)
|
||||
ld_shlibs=no
|
||||
;;
|
||||
@ -1589,11 +1632,11 @@ void nm_test_func(){}
|
||||
main(){nm_test_var='a';nm_test_func();return(0);}
|
||||
EOF
|
||||
|
||||
echo "$progname:1592: checking if global_symbol_pipe works" >&5
|
||||
if { (eval echo $progname:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
|
||||
echo "$progname:1635: checking if global_symbol_pipe works" >&5
|
||||
if { (eval echo $progname:1636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
|
||||
# Now try to grab the symbols.
|
||||
nlist=conftest.nm
|
||||
if { echo "$progname:1596: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
|
||||
if { echo "$progname:1639: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
|
||||
|
||||
# Try sorting and uniquifying the output.
|
||||
if sort "$nlist" | uniq > "$nlist"T; then
|
||||
@ -1645,7 +1688,7 @@ EOF
|
||||
save_CFLAGS="$CFLAGS"
|
||||
LIBS="conftstm.$objext"
|
||||
CFLAGS="$CFLAGS$no_builtin_flag"
|
||||
if { (eval echo $progname:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo $progname:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
pipe_works=yes
|
||||
else
|
||||
echo "$progname: failed program was:" >&5
|
||||
@ -1787,8 +1830,9 @@ beos*)
|
||||
|
||||
bsdi4*)
|
||||
version_type=linux
|
||||
library_names_spec='${libname}.so$major ${libname}.so'
|
||||
soname_spec='${libname}.so'
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
|
||||
soname_spec='${libname}${release}.so$major'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
|
||||
@ -1796,6 +1840,7 @@ bsdi4*)
|
||||
file_magic_test_file=/shlib/libc.so
|
||||
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
|
||||
sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
|
||||
export_dynamic_flag_spec=-rdynamic
|
||||
# the default ld.so.conf also contains /usr/contrib/lib and
|
||||
# /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
|
||||
# libtool to hard-code these into programs
|
||||
@ -1841,10 +1886,9 @@ freebsd*)
|
||||
need_version=yes
|
||||
;;
|
||||
esac
|
||||
finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
case "$host_os" in
|
||||
freebsd2* | freebsd3.[01]*)
|
||||
freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
|
||||
shlibpath_overrides_runpath=yes
|
||||
;;
|
||||
*) # from 3.2 on
|
||||
@ -1896,8 +1940,6 @@ irix5* | irix6*)
|
||||
*-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
|
||||
*) libsuff= shlibsuff= libmagic=never-match;;
|
||||
esac
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
|
||||
;;
|
||||
esac
|
||||
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
|
||||
@ -1972,7 +2014,7 @@ os2*)
|
||||
shlibpath_var=LIBPATH
|
||||
;;
|
||||
|
||||
osf3* | osf4*)
|
||||
osf3* | osf4* | osf5*)
|
||||
version_type=osf
|
||||
need_version=no
|
||||
soname_spec='${libname}${release}.so'
|
||||
@ -2167,7 +2209,7 @@ else
|
||||
if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
|
||||
lt_cv_dlopen=no lt_cv_dlopen_libs=
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "$progname:2170: checking for dlopen in -ldl" >&5
|
||||
echo "$progname:2212: checking for dlopen in -ldl" >&5
|
||||
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2175,17 +2217,20 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2178 "ltconfig"
|
||||
#line 2220 "ltconfig"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char dlopen();
|
||||
|
||||
int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2204,18 +2249,21 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "$progname:2207: checking for dlopen" >&5
|
||||
echo "$progname:2252: checking for dlopen" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2212 "ltconfig"
|
||||
#line 2257 "ltconfig"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
#include <assert.h>
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char dlopen();
|
||||
|
||||
int main() {
|
||||
@ -2231,7 +2279,7 @@ dlopen();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_dlopen=yes"
|
||||
else
|
||||
@ -2248,7 +2296,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
|
||||
echo "$progname:2251: checking for dld_link in -ldld" >&5
|
||||
echo "$progname:2299: checking for dld_link in -ldld" >&5
|
||||
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2256,17 +2304,20 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2259 "ltconfig"
|
||||
#line 2307 "ltconfig"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char dld_link();
|
||||
|
||||
int main() {
|
||||
dld_link()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2285,18 +2336,21 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
|
||||
echo "$progname:2288: checking for shl_load" >&5
|
||||
echo "$progname:2339: checking for shl_load" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2293 "ltconfig"
|
||||
#line 2344 "ltconfig"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char shl_load(); below. */
|
||||
#include <assert.h>
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char shl_load();
|
||||
|
||||
int main() {
|
||||
@ -2312,7 +2366,7 @@ shl_load();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_shl_load=yes"
|
||||
else
|
||||
@ -2330,7 +2384,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
|
||||
echo "$progname:2333: checking for shl_load in -ldld" >&5
|
||||
echo "$progname:2387: checking for shl_load in -ldld" >&5
|
||||
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -2338,18 +2392,21 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2341 "ltconfig"
|
||||
#line 2395 "ltconfig"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char shl_load();
|
||||
|
||||
int main() {
|
||||
shl_load()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo $progname:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo $progname:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -2392,17 +2449,17 @@ fi
|
||||
for ac_hdr in dlfcn.h; do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "$progname:2395: checking for $ac_hdr" >&5
|
||||
echo "$progname:2452: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2400 "ltconfig"
|
||||
#line 2457 "ltconfig"
|
||||
#include <$ac_hdr>
|
||||
int fnord = 0;
|
||||
EOF
|
||||
ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo $progname:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_try="$ac_compile >/dev/null 2>conftest.out"
|
||||
{ (eval echo $progname:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -2430,7 +2487,7 @@ done
|
||||
LIBS="$lt_cv_dlopen_libs $LIBS"
|
||||
|
||||
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
|
||||
echo "$progname:2433: checking whether a program can dlopen itself" >&5
|
||||
echo "$progname:2490: checking whether a program can dlopen itself" >&5
|
||||
if test "${lt_cv_dlopen_self+set}" = set; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -2438,7 +2495,7 @@ else
|
||||
lt_cv_dlopen_self=cross
|
||||
else
|
||||
cat > conftest.c <<EOF
|
||||
#line 2441 "ltconfig"
|
||||
#line 2498 "ltconfig"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
@ -2484,7 +2541,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo $progname:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
lt_cv_dlopen_self=yes
|
||||
else
|
||||
@ -2503,7 +2560,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
|
||||
if test "$lt_cv_dlopen_self" = yes; then
|
||||
LDFLAGS="$LDFLAGS $link_static_flag"
|
||||
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
|
||||
echo "$progname:2506: checking whether a statically linked program can dlopen itself" >&5
|
||||
echo "$progname:2563: checking whether a statically linked program can dlopen itself" >&5
|
||||
if test "${lt_cv_dlopen_self_static+set}" = set; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -2511,7 +2568,7 @@ else
|
||||
lt_cv_dlopen_self_static=cross
|
||||
else
|
||||
cat > conftest.c <<EOF
|
||||
#line 2514 "ltconfig"
|
||||
#line 2571 "ltconfig"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
#include <dlfcn.h>
|
||||
@ -2557,7 +2614,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
|
||||
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
|
||||
|
||||
EOF
|
||||
if { (eval echo $progname:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo $progname:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
lt_cv_dlopen_self_static=yes
|
||||
else
|
||||
@ -2649,7 +2706,7 @@ case "$ltmain" in
|
||||
# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
|
||||
#
|
||||
# Copyright (C) 1996-1999 Free Software Foundation, Inc.
|
||||
# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
# 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
|
||||
@ -2675,7 +2732,7 @@ Xsed="sed -e s/^X//"
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
|
||||
if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
|
||||
|
||||
### BEGIN LIBTOOL CONFIG
|
||||
EOF
|
||||
@ -2938,7 +2995,7 @@ case "$ltmain" in
|
||||
# AIX sometimes has problems with the GCC collect2 program. For some
|
||||
# reason, if we set the COLLECT_NAMES environment variable, the problems
|
||||
# vanish in a puff of smoke.
|
||||
if test "${COLLECT_NAMES+set}" != set; then
|
||||
if test "X${COLLECT_NAMES+set}" != Xset; then
|
||||
COLLECT_NAMES=
|
||||
export COLLECT_NAMES
|
||||
fi
|
||||
@ -2948,6 +3005,10 @@ EOF
|
||||
|
||||
# Append the ltmain.sh script.
|
||||
sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
|
||||
# We use sed instead of cat because bash on DJGPP gets confused if
|
||||
# if finds mixed CR/LF and LF-only lines. Since sed operates in
|
||||
# text mode, it properly converts lines to CR/LF. This bash problem
|
||||
# is reportedly fixed, but why not run on old versions too?
|
||||
|
||||
chmod +x "$ofile"
|
||||
;;
|
||||
|
||||
103
ltmain.sh
103
ltmain.sh
@ -54,8 +54,8 @@ modename="$progname"
|
||||
# Constants.
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.3.3
|
||||
TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
|
||||
VERSION=1.3.4
|
||||
TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
@ -435,7 +435,7 @@ compiler."
|
||||
fbsd_hideous_sh_bug=$base_compile
|
||||
|
||||
# All platforms use -DPIC, to notify preprocessed assembler code.
|
||||
command="$base_compile $pic_flag -DPIC $srcfile"
|
||||
command="$base_compile $srcfile $pic_flag -DPIC"
|
||||
if test "$build_old_libs" = yes; then
|
||||
lo_libobj="$libobj"
|
||||
dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
@ -521,9 +521,17 @@ compiler."
|
||||
exit $error
|
||||
fi
|
||||
|
||||
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$obj"; then
|
||||
xdir="."
|
||||
else
|
||||
xdir="$xdir"
|
||||
fi
|
||||
baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
|
||||
libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
|
||||
# Now arrange that obj and lo_libobj become the same file
|
||||
$show "$LN_S $obj $lo_libobj"
|
||||
if $run $LN_S $obj $lo_libobj; then
|
||||
$show "(cd $xdir && $LN_S $baseobj $libobj)"
|
||||
if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
|
||||
exit 0
|
||||
else
|
||||
error=$?
|
||||
@ -613,8 +621,6 @@ compiler."
|
||||
# libtool link mode
|
||||
link)
|
||||
modename="$modename: link"
|
||||
C_compiler="$CC" # save it, to compile generated C sources
|
||||
CC="$nonopt"
|
||||
case "$host" in
|
||||
*-*-cygwin* | *-*-mingw* | *-*-os2*)
|
||||
# It is impossible to link a dll without this setting, and
|
||||
@ -802,8 +808,8 @@ compiler."
|
||||
allow_undefined=yes
|
||||
;;
|
||||
esac
|
||||
compile_command="$CC"
|
||||
finalize_command="$CC"
|
||||
compile_command="$nonopt"
|
||||
finalize_command="$nonopt"
|
||||
|
||||
compile_rpath=
|
||||
finalize_rpath=
|
||||
@ -1851,7 +1857,7 @@ compiler."
|
||||
int main() { return 0; }
|
||||
EOF
|
||||
$rm conftest
|
||||
$C_compiler -o conftest conftest.c $deplibs
|
||||
$CC -o conftest conftest.c $deplibs
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
@ -1884,7 +1890,7 @@ EOF
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
$rm conftest
|
||||
$C_compiler -o conftest conftest.c $i
|
||||
$CC -o conftest conftest.c $i
|
||||
# Did it work?
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
@ -2047,12 +2053,19 @@ EOF
|
||||
done
|
||||
|
||||
# Ensure that we have .o objects for linkers which dislike .lo
|
||||
# (e.g. aix) incase we are running --disable-static
|
||||
# (e.g. aix) in case we are running --disable-static
|
||||
for obj in $libobjs; do
|
||||
oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"`
|
||||
if test ! -f $oldobj; then
|
||||
$show "${LN_S} $obj $oldobj"
|
||||
$run ${LN_S} $obj $oldobj || exit $?
|
||||
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$obj"; then
|
||||
xdir="."
|
||||
else
|
||||
xdir="$xdir"
|
||||
fi
|
||||
baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
|
||||
oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
|
||||
if test ! -f $xdir/$oldobj; then
|
||||
$show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
|
||||
$run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
|
||||
fi
|
||||
done
|
||||
|
||||
@ -2311,8 +2324,16 @@ EOF
|
||||
# Just create a symlink.
|
||||
$show $rm $libobj
|
||||
$run $rm $libobj
|
||||
$show "$LN_S $obj $libobj"
|
||||
$run $LN_S $obj $libobj || exit $?
|
||||
xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$libobj"; then
|
||||
xdir="."
|
||||
else
|
||||
xdir="$xdir"
|
||||
fi
|
||||
baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
|
||||
oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
|
||||
$show "(cd $xdir && $LN_S $oldobj $baseobj)"
|
||||
$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
|
||||
fi
|
||||
|
||||
if test -n "$gentop"; then
|
||||
@ -2598,16 +2619,21 @@ static const void *lt_preloaded_setup() {
|
||||
# linked before any other PIC object. But we must not use
|
||||
# pic_flag when linking with -static. The problem exists in
|
||||
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
|
||||
*-*-freebsd2*|*-*-freebsd3.0*)
|
||||
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
|
||||
case "$compile_command " in
|
||||
*" -static "*) ;;
|
||||
*) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
|
||||
esac;;
|
||||
*-*-hpux*)
|
||||
case "$compile_command " in
|
||||
*" -static "*) ;;
|
||||
*) pic_flag_for_symtable=" $pic_flag -DPIC";;
|
||||
esac
|
||||
esac
|
||||
|
||||
# Now compile the dynamic symbol file.
|
||||
$show "(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
|
||||
$run eval '(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
|
||||
$show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
|
||||
$run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
|
||||
|
||||
# Clean up the generated files.
|
||||
$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
|
||||
@ -2776,7 +2802,7 @@ sed_quote_subst='$sed_quote_subst'
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
|
||||
if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
|
||||
|
||||
relink_command=\"$relink_command\"
|
||||
|
||||
@ -2865,7 +2891,7 @@ else
|
||||
fi"
|
||||
else
|
||||
echo >> $output "\
|
||||
program='$outputname$exeext'
|
||||
program='$outputname'
|
||||
progdir=\"\$thisdir/$objdir\"
|
||||
"
|
||||
fi
|
||||
@ -2995,14 +3021,21 @@ fi\
|
||||
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
|
||||
eval cmds=\"$old_archive_from_new_cmds\"
|
||||
else
|
||||
# Ensure that we have .o objects in place incase we decided
|
||||
# Ensure that we have .o objects in place in case we decided
|
||||
# not to build a shared library, and have fallen back to building
|
||||
# static libs even though --disable-static was passed!
|
||||
for oldobj in $oldobjs; do
|
||||
if test ! -f $oldobj; then
|
||||
obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"`
|
||||
$show "${LN_S} $obj $oldobj"
|
||||
$run ${LN_S} $obj $oldobj || exit $?
|
||||
xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
|
||||
if test "X$xdir" = "X$oldobj"; then
|
||||
xdir="."
|
||||
else
|
||||
xdir="$xdir"
|
||||
fi
|
||||
baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
|
||||
obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
|
||||
$show "(cd $xdir && ${LN_S} $obj $baseobj)"
|
||||
$run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
|
||||
fi
|
||||
done
|
||||
|
||||
@ -3288,8 +3321,8 @@ libdir='$install_libdir'\
|
||||
shift
|
||||
|
||||
# Install the shared library and build the symlinks.
|
||||
$show "$install_prog $dir/$realname $destdir/$realname"
|
||||
$run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
|
||||
$show "$install_prog$stripme $dir/$realname $destdir/$realname"
|
||||
$run eval "$install_prog$stripme $dir/$realname $destdir/$realname" || exit $?
|
||||
|
||||
if test $# -gt 0; then
|
||||
# Delete the old symlinks, and create new ones.
|
||||
@ -3672,8 +3705,10 @@ libdir='$install_libdir'\
|
||||
done
|
||||
|
||||
if test -z "$run"; then
|
||||
# Export the shlibpath_var.
|
||||
eval "export $shlibpath_var"
|
||||
if test -n "$shlibpath_var"; then
|
||||
# Export the shlibpath_var.
|
||||
eval "export $shlibpath_var"
|
||||
fi
|
||||
|
||||
# Restore saved enviroment variables
|
||||
if test "${save_LC_ALL+set}" = set; then
|
||||
@ -3690,8 +3725,10 @@ libdir='$install_libdir'\
|
||||
exit 1
|
||||
else
|
||||
# Display what would be done.
|
||||
eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
|
||||
$echo "export $shlibpath_var"
|
||||
if test -n "$shlibpath_var"; then
|
||||
eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
|
||||
$echo "export $shlibpath_var"
|
||||
fi
|
||||
$echo "$cmd$args"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user