You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1013 lines
34 KiB
1013 lines
34 KiB
Index: ltmain.sh |
|
--- ltmain.sh.orig 2003-04-01 17:20:20.000000000 +0200 |
|
+++ ltmain.sh 2003-09-16 16:55:08.000000000 +0200 |
|
@@ -49,14 +49,14 @@ |
|
fi |
|
|
|
# The name of this program. |
|
-progname=`$echo "$0" | ${SED} 's%^.*/%%'` |
|
+progname=`$echo "$0" | sed 's%^.*/%%'` |
|
modename="$progname" |
|
|
|
# Constants. |
|
PROGRAM=ltmain.sh |
|
PACKAGE=libtool |
|
-VERSION=1.4.3 |
|
-TIMESTAMP=" (1.922.2.110 2002/10/23 01:39:54)" |
|
+VERSION=1.4 |
|
+TIMESTAMP=" (1.920 2001/04/24 23:26:18)" |
|
|
|
default_mode= |
|
help="Try \`$progname --help' for more information." |
|
@@ -67,19 +67,10 @@ |
|
|
|
# Sed substitution that helps us do robust quoting. It backslashifies |
|
# metacharacters that are still active within double-quoted strings. |
|
-Xsed="${SED}"' -e 1s/^X//' |
|
+Xsed='sed -e 1s/^X//' |
|
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' |
|
-# test EBCDIC or ASCII |
|
-case `echo A|od -x` in |
|
- *[Cc]1*) # EBCDIC based system |
|
- SP2NL="tr '\100' '\n'" |
|
- NL2SP="tr '\r\n' '\100\100'" |
|
- ;; |
|
- *) # Assume ASCII based system |
|
- SP2NL="tr '\040' '\012'" |
|
- NL2SP="tr '\015\012' '\040\040'" |
|
- ;; |
|
-esac |
|
+SP2NL='tr \040 \012' |
|
+NL2SP='tr \015\012 \040\040' |
|
|
|
# NLS nuisances. |
|
# Only set LANG and LC_ALL to C if already set. |
|
@@ -93,9 +84,6 @@ |
|
save_LANG="$LANG"; LANG=C; export LANG |
|
fi |
|
|
|
-# Make sure IFS has a sensible default |
|
-: ${IFS=" "} |
|
- |
|
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
|
echo "$modename: not configured to build any kind of library" 1>&2 |
|
echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 |
|
@@ -153,7 +141,7 @@ |
|
;; |
|
|
|
--config) |
|
- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 |
|
+ sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 |
|
exit 0 |
|
;; |
|
|
|
@@ -186,8 +174,6 @@ |
|
--mode) prevopt="--mode" prev=mode ;; |
|
--mode=*) mode="$optarg" ;; |
|
|
|
- --preserve-dup-deps) duplicate_deps="yes" ;; |
|
- |
|
--quiet | --silent) |
|
show=: |
|
;; |
|
@@ -216,17 +202,12 @@ |
|
exit 1 |
|
fi |
|
|
|
-# If this variable is set in any of the actions, the command in it |
|
-# will be execed at the end. This prevents here-documents from being |
|
-# left over by shells. |
|
-exec_cmd= |
|
- |
|
if test -z "$show_help"; then |
|
|
|
# Infer the operation mode. |
|
if test -z "$mode"; then |
|
case $nonopt in |
|
- *cc | *++ | gcc* | *-gcc* | xlc*) |
|
+ *cc | *++ | gcc* | *-gcc*) |
|
mode=link |
|
for arg |
|
do |
|
@@ -348,7 +329,7 @@ |
|
-Wc,*) |
|
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` |
|
lastarg= |
|
- save_ifs="$IFS"; IFS=',' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' |
|
for arg in $args; do |
|
IFS="$save_ifs" |
|
|
|
@@ -478,7 +459,7 @@ |
|
pic_mode=default |
|
;; |
|
esac |
|
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then |
|
+ if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then |
|
# non-PIC code in shared libraries is not supported |
|
pic_mode=default |
|
fi |
|
@@ -634,10 +615,6 @@ |
|
# Now arrange that obj and lo_libobj become the same file |
|
$show "(cd $xdir && $LN_S $baseobj $libobj)" |
|
if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then |
|
- # Unlock the critical section if it was locked |
|
- if test "$need_locks" != no; then |
|
- $run $rm "$lockfile" |
|
- fi |
|
exit 0 |
|
else |
|
error=$? |
|
@@ -1003,7 +980,7 @@ |
|
# so, if we see these flags be careful not to treat them like -L |
|
-L[A-Z][A-Z]*:*) |
|
case $with_gcc/$host in |
|
- no/*-*-irix* | no/*-*-nonstopux*) |
|
+ no/*-*-irix*) |
|
compile_command="$compile_command $arg" |
|
finalize_command="$finalize_command $arg" |
|
;; |
|
@@ -1054,17 +1031,6 @@ |
|
# These systems don't actually have a C library (as such) |
|
test "X$arg" = "X-lc" && continue |
|
;; |
|
- *-*-openbsd* | *-*-freebsd*) |
|
- # Do not include libc due to us having libc/libc_r. |
|
- test "X$arg" = "X-lc" && continue |
|
- ;; |
|
- esac |
|
- elif test "X$arg" = "X-lc_r"; then |
|
- case $host in |
|
- *-*-openbsd* | *-*-freebsd*) |
|
- # Do not include libc_r directly, use -pthread flag. |
|
- continue |
|
- ;; |
|
esac |
|
fi |
|
deplibs="$deplibs $arg" |
|
@@ -1156,7 +1122,7 @@ |
|
-Wc,*) |
|
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` |
|
arg= |
|
- save_ifs="$IFS"; IFS=',' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' |
|
for flag in $args; do |
|
IFS="$save_ifs" |
|
case $flag in |
|
@@ -1174,7 +1140,7 @@ |
|
-Wl,*) |
|
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` |
|
arg= |
|
- save_ifs="$IFS"; IFS=',' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' |
|
for flag in $args; do |
|
IFS="$save_ifs" |
|
case $flag in |
|
@@ -1341,11 +1307,9 @@ |
|
# Find all interdependent deplibs by searching for libraries |
|
# that are linked more than once (e.g. -la -lb -la) |
|
for deplib in $deplibs; do |
|
- if test "X$duplicate_deps" = "Xyes" ; then |
|
- case "$libs " in |
|
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
- esac |
|
- fi |
|
+ case "$libs " in |
|
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
+ esac |
|
libs="$libs $deplib" |
|
done |
|
deplibs= |
|
@@ -1474,12 +1438,10 @@ |
|
lib) |
|
if test "$deplibs_check_method" != pass_all; then |
|
echo |
|
- echo "*** Warning: Trying to link with static lib archive $deplib." |
|
+ echo "*** Warning: This library needs some functionality provided by $deplib." |
|
echo "*** I have the capability to make that library automatically link in when" |
|
echo "*** you link to this library. But I can only do this if you have a" |
|
- echo "*** shared version of the library, which you do not appear to have" |
|
- echo "*** because the file extensions .$libext of this argument makes me believe" |
|
- echo "*** that it is just a static archive that I should not used here." |
|
+ echo "*** shared version of the library, which you do not appear to have." |
|
else |
|
echo |
|
echo "*** Warning: Linking the shared library $output against the" |
|
@@ -1523,7 +1485,7 @@ |
|
fi |
|
|
|
# Check to see that this really is a libtool archive. |
|
- if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : |
|
+ if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : |
|
else |
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
|
exit 1 |
|
@@ -1570,11 +1532,9 @@ |
|
tmp_libs= |
|
for deplib in $dependency_libs; do |
|
deplibs="$deplib $deplibs" |
|
- if test "X$duplicate_deps" = "Xyes" ; then |
|
- case "$tmp_libs " in |
|
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
- esac |
|
- fi |
|
+ case "$tmp_libs " in |
|
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
+ esac |
|
tmp_libs="$tmp_libs $deplib" |
|
done |
|
elif test $linkmode != prog && test $linkmode != lib; then |
|
@@ -1697,11 +1657,9 @@ |
|
# or/and link against static libraries |
|
newdependency_libs="$deplib $newdependency_libs" |
|
fi |
|
- if test "X$duplicate_deps" = "Xyes" ; then |
|
- case "$tmp_libs " in |
|
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
- esac |
|
- fi |
|
+ case "$tmp_libs " in |
|
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
+ esac |
|
tmp_libs="$tmp_libs $deplib" |
|
done # for deplib |
|
continue |
|
@@ -1785,14 +1743,14 @@ |
|
|
|
# Make a new name for the extract_expsyms_cmds to use |
|
soroot="$soname" |
|
- soname=`echo $soroot | ${SED} -e 's/^.*\///'` |
|
- newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" |
|
+ soname=`echo $soroot | sed -e 's/^.*\///'` |
|
+ newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" |
|
|
|
# If the library has no export list, then create one now |
|
if test -f "$output_objdir/$soname-def"; then : |
|
else |
|
$show "extracting exported symbol list from \`$soname'" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
eval cmds=\"$extract_expsyms_cmds\" |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
@@ -1805,7 +1763,7 @@ |
|
# Create $newlib |
|
if test -f "$output_objdir/$newlib"; then :; else |
|
$show "generating import library for \`$soname'" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
eval cmds=\"$old_archive_from_expsyms_cmds\" |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
@@ -1945,26 +1903,25 @@ |
|
# Just print a warning and add the library to dependency_libs so |
|
# that the program can be linked against the static library. |
|
echo |
|
- echo "*** Warning: This system can not link to static lib archive $lib." |
|
+ echo "*** Warning: This library needs some functionality provided by $lib." |
|
echo "*** I have the capability to make that library automatically link in when" |
|
echo "*** you link to this library. But I can only do this if you have a" |
|
echo "*** shared version of the library, which you do not appear to have." |
|
if test "$module" = yes; then |
|
- echo "*** But as you try to build a module library, libtool will still create " |
|
- echo "*** a static module, that should work as long as the dlopening application" |
|
- echo "*** is linked with the -dlopen flag to resolve symbols at runtime." |
|
+ echo "*** Therefore, libtool will create a static module, that should work " |
|
+ echo "*** as long as the dlopening application is linked with the -dlopen flag." |
|
if test -z "$global_symbol_pipe"; then |
|
- echo |
|
- echo "*** However, this would only work if libtool was able to extract symbol" |
|
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" |
|
- echo "*** not find such a program. So, this module is probably useless." |
|
- echo "*** \`nm' from GNU binutils and a full rebuild may help." |
|
+ echo |
|
+ echo "*** However, this would only work if libtool was able to extract symbol" |
|
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" |
|
+ echo "*** not find such a program. So, this module is probably useless." |
|
+ echo "*** \`nm' from GNU binutils and a full rebuild may help." |
|
fi |
|
if test "$build_old_libs" = no; then |
|
- build_libtool_libs=module |
|
- build_old_libs=yes |
|
+ build_libtool_libs=module |
|
+ build_old_libs=yes |
|
else |
|
- build_libtool_libs=no |
|
+ build_libtool_libs=no |
|
fi |
|
fi |
|
else |
|
@@ -2001,11 +1958,9 @@ |
|
tmp_libs= |
|
for deplib in $dependency_libs; do |
|
newdependency_libs="$deplib $newdependency_libs" |
|
- if test "X$duplicate_deps" = "Xyes" ; then |
|
- case "$tmp_libs " in |
|
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
- esac |
|
- fi |
|
+ case "$tmp_libs " in |
|
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
|
+ esac |
|
tmp_libs="$tmp_libs $deplib" |
|
done |
|
|
|
@@ -2031,7 +1986,7 @@ |
|
if grep "^installed=no" $deplib > /dev/null; then |
|
path="-L$absdir/$objdir" |
|
else |
|
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
|
+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
|
if test -z "$libdir"; then |
|
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
|
exit 1 |
|
@@ -2220,7 +2175,7 @@ |
|
else |
|
|
|
# Parse the version information argument. |
|
- save_ifs="$IFS"; IFS=':' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' |
|
set dummy $vinfo 0 0 0 |
|
IFS="$save_ifs" |
|
|
|
@@ -2295,21 +2250,16 @@ |
|
versuffix=".$current"; |
|
;; |
|
|
|
- irix | nonstopux) |
|
+ irix) |
|
major=`expr $current - $age + 1` |
|
- |
|
- case $version_type in |
|
- nonstopux) verstring_prefix=nonstopux ;; |
|
- *) verstring_prefix=sgi ;; |
|
- esac |
|
- verstring="$verstring_prefix$major.$revision" |
|
+ verstring="sgi$major.$revision" |
|
|
|
# Add in all the interfaces that we are compatible with. |
|
loop=$revision |
|
while test $loop != 0; do |
|
iface=`expr $revision - $loop` |
|
loop=`expr $loop - 1` |
|
- verstring="$verstring_prefix$major.$iface:$verstring" |
|
+ verstring="sgi$major.$iface:$verstring" |
|
done |
|
|
|
# Before this point, $major must not contain `.'. |
|
@@ -2323,7 +2273,7 @@ |
|
;; |
|
|
|
osf) |
|
- major=.`expr $current - $age` |
|
+ major=`expr $current - $age` |
|
versuffix=".$current.$age.$revision" |
|
verstring="$current.$age.$revision" |
|
|
|
@@ -2362,16 +2312,6 @@ |
|
if test -z "$vinfo" && test -n "$release"; then |
|
major= |
|
verstring="0.0" |
|
- case $version_type in |
|
- darwin) |
|
- # we can't check for "0.0" in archive_cmds due to quoting |
|
- # problems, so we reset it completely |
|
- verstring="" |
|
- ;; |
|
- *) |
|
- verstring="0.0" |
|
- ;; |
|
- esac |
|
if test "$need_version" = no; then |
|
versuffix= |
|
else |
|
@@ -2415,9 +2355,9 @@ |
|
|
|
# Eliminate all temporary directories. |
|
for path in $notinst_path; do |
|
- lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'` |
|
- deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'` |
|
- dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` |
|
+ lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` |
|
+ deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` |
|
+ dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` |
|
done |
|
|
|
if test -n "$xrpath"; then |
|
@@ -2468,9 +2408,6 @@ |
|
*-*-netbsd*) |
|
# Don't link with libc until the a.out ld.so is fixed. |
|
;; |
|
- *-*-openbsd* | *-*-freebsd*) |
|
- # Do not include libc due to us having libc/libc_r. |
|
- ;; |
|
*) |
|
# Add libc to deplibs on all other systems if necessary. |
|
if test $build_libtool_need_lc = "yes"; then |
|
@@ -2529,20 +2466,18 @@ |
|
else |
|
droppeddeps=yes |
|
echo |
|
- echo "*** Warning: dynamic linker does not accept needed library $i." |
|
+ echo "*** Warning: This library needs some functionality provided by $i." |
|
echo "*** I have the capability to make that library automatically link in when" |
|
echo "*** you link to this library. But I can only do this if you have a" |
|
- echo "*** shared version of the library, which I believe you do not have" |
|
- echo "*** because a test_compile did reveal that the linker did not use it for" |
|
- echo "*** its dynamic dependency list that programs get resolved with at runtime." |
|
+ echo "*** shared version of the library, which you do not appear to have." |
|
fi |
|
else |
|
newdeplibs="$newdeplibs $i" |
|
fi |
|
done |
|
else |
|
- # Error occured in the first compile. Let's try to salvage |
|
- # the situation: Compile a separate program for each library. |
|
+ # Error occured in the first compile. Let's try to salvage the situation: |
|
+ # Compile a seperate program for each library. |
|
for i in $deplibs; do |
|
name="`expr $i : '-l\(.*\)'`" |
|
# If $name is empty we are operating on a -L argument. |
|
@@ -2561,12 +2496,10 @@ |
|
else |
|
droppeddeps=yes |
|
echo |
|
- echo "*** Warning: dynamic linker does not accept needed library $i." |
|
+ echo "*** Warning: This library needs some functionality provided by $i." |
|
echo "*** I have the capability to make that library automatically link in when" |
|
echo "*** you link to this library. But I can only do this if you have a" |
|
- echo "*** shared version of the library, which you do not appear to have" |
|
- echo "*** because a test_compile did reveal that the linker did not use this one" |
|
- echo "*** as a dynamic dependency that programs can get resolved with at runtime." |
|
+ echo "*** shared version of the library, which you do not appear to have." |
|
fi |
|
else |
|
droppeddeps=yes |
|
@@ -2605,14 +2538,14 @@ |
|
# but so what? |
|
potlib="$potent_lib" |
|
while test -h "$potlib" 2>/dev/null; do |
|
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` |
|
+ potliblink=`ls -ld $potlib | sed 's/.* -> //'` |
|
case $potliblink in |
|
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; |
|
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; |
|
esac |
|
done |
|
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ |
|
- | ${SED} 10q \ |
|
+ | sed 10q \ |
|
| egrep "$file_magic_regex" > /dev/null; then |
|
newdeplibs="$newdeplibs $a_deplib" |
|
a_deplib="" |
|
@@ -2623,17 +2556,10 @@ |
|
if test -n "$a_deplib" ; then |
|
droppeddeps=yes |
|
echo |
|
- echo "*** Warning: linker path does not have real file for library $a_deplib." |
|
+ echo "*** Warning: This library needs some functionality provided by $a_deplib." |
|
echo "*** I have the capability to make that library automatically link in when" |
|
echo "*** you link to this library. But I can only do this if you have a" |
|
- echo "*** shared version of the library, which you do not appear to have" |
|
- echo "*** because I did check the linker path looking for a file starting" |
|
- if test -z "$potlib" ; then |
|
- echo "*** with $libname but no candidates were found. (...for file magic test)" |
|
- else |
|
- echo "*** with $libname and none of the candidates passed a file format test" |
|
- echo "*** using a file magic. Last file checked: $potlib" |
|
- fi |
|
+ echo "*** shared version of the library, which you do not appear to have." |
|
fi |
|
else |
|
# Add a -L argument. |
|
@@ -2652,9 +2578,8 @@ |
|
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do |
|
potential_libs=`ls $i/$libname[.-]* 2>/dev/null` |
|
for potent_lib in $potential_libs; do |
|
- potlib="$potent_lib" # see symlink-check below in file_magic test |
|
if eval echo \"$potent_lib\" 2>/dev/null \ |
|
- | ${SED} 10q \ |
|
+ | sed 10q \ |
|
| egrep "$match_pattern_regex" > /dev/null; then |
|
newdeplibs="$newdeplibs $a_deplib" |
|
a_deplib="" |
|
@@ -2665,17 +2590,10 @@ |
|
if test -n "$a_deplib" ; then |
|
droppeddeps=yes |
|
echo |
|
- echo "*** Warning: linker path does not have real file for library $a_deplib." |
|
+ echo "*** Warning: This library needs some functionality provided by $a_deplib." |
|
echo "*** I have the capability to make that library automatically link in when" |
|
echo "*** you link to this library. But I can only do this if you have a" |
|
- echo "*** shared version of the library, which you do not appear to have" |
|
- echo "*** because I did check the linker path looking for a file starting" |
|
- if test -z "$potlib" ; then |
|
- echo "*** with $libname but no candidates were found. (...for regex pattern test)" |
|
- else |
|
- echo "*** with $libname and none of the candidates passed a file format test" |
|
- echo "*** using a regex pattern. Last file checked: $potlib" |
|
- fi |
|
+ echo "*** shared version of the library, which you do not appear to have." |
|
fi |
|
else |
|
# Add a -L argument. |
|
@@ -2866,7 +2784,7 @@ |
|
export_symbols="$output_objdir/$libname.exp" |
|
$run $rm $export_symbols |
|
eval cmds=\"$export_symbols_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -2940,20 +2858,9 @@ |
|
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then |
|
eval cmds=\"$archive_expsym_cmds\" |
|
else |
|
- save_deplibs="$deplibs" |
|
- for conv in $convenience; do |
|
- tmp_deplibs= |
|
- for test_deplib in $deplibs; do |
|
- if test "$test_deplib" != "$conv"; then |
|
- tmp_deplibs="$tmp_deplibs $test_deplib" |
|
- fi |
|
- done |
|
- deplibs="$tmp_deplibs" |
|
- done |
|
eval cmds=\"$archive_cmds\" |
|
- deplibs="$save_deplibs" |
|
fi |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -3081,7 +2988,7 @@ |
|
|
|
output="$obj" |
|
eval cmds=\"$reload_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -3117,7 +3024,7 @@ |
|
reload_objs="$libobjs $reload_conv_objs" |
|
output="$libobj" |
|
eval cmds=\"$reload_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -3150,7 +3057,7 @@ |
|
|
|
prog) |
|
case $host in |
|
- *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; |
|
+ *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; |
|
esac |
|
if test -n "$vinfo"; then |
|
$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 |
|
@@ -3172,13 +3079,6 @@ |
|
# On Rhapsody replace the C library is the System framework |
|
compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` |
|
finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` |
|
- case $host in |
|
- *darwin*) |
|
- # Don't allow lazy linking, it breaks C++ global constructors |
|
- compile_command="$compile_command ${wl}-bind_at_load" |
|
- finalize_command="$finalize_command ${wl}-bind_at_load" |
|
- ;; |
|
- esac |
|
;; |
|
esac |
|
|
|
@@ -3345,9 +3245,9 @@ |
|
if test -z "$export_symbols"; then |
|
export_symbols="$output_objdir/$output.exp" |
|
$run $rm $export_symbols |
|
- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' |
|
+ $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' |
|
else |
|
- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' |
|
+ $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' |
|
$run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' |
|
$run eval 'mv "$nlist"T "$nlist"' |
|
fi |
|
@@ -3355,7 +3255,7 @@ |
|
|
|
for arg in $dlprefiles; do |
|
$show "extracting global C symbols from \`$arg'" |
|
- name=`echo "$arg" | ${SED} -e 's%^.*/%%'` |
|
+ name=`echo "$arg" | sed -e 's%^.*/%%'` |
|
$run eval 'echo ": $name " >> "$nlist"' |
|
$run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" |
|
done |
|
@@ -3370,13 +3270,7 @@ |
|
fi |
|
|
|
# Try sorting and uniquifying the output. |
|
- if grep -v "^: " < "$nlist" | |
|
- if sort -k 3 </dev/null >/dev/null 2>&1; then |
|
- sort -k 3 |
|
- else |
|
- sort +2 |
|
- fi | |
|
- uniq > "$nlist"S; then |
|
+ if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then |
|
: |
|
else |
|
grep -v "^: " < "$nlist" > "$nlist"S |
|
@@ -3393,25 +3287,27 @@ |
|
#undef lt_preloaded_symbols |
|
|
|
#if defined (__STDC__) && __STDC__ |
|
-# define lt_ptr void * |
|
+# define lt_ptr_t void * |
|
#else |
|
-# define lt_ptr char * |
|
+# define lt_ptr_t char * |
|
# define const |
|
#endif |
|
|
|
/* The mapping between symbol names and symbols. */ |
|
const struct { |
|
const char *name; |
|
- lt_ptr address; |
|
+ lt_ptr_t address; |
|
} |
|
lt_preloaded_symbols[] = |
|
{\ |
|
" |
|
|
|
- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" |
|
+ sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \ |
|
+ -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \ |
|
+ < "$nlist" >> "$output_objdir/$dlsyms" |
|
|
|
$echo >> "$output_objdir/$dlsyms" "\ |
|
- {0, (lt_ptr) 0} |
|
+ {0, (lt_ptr_t) 0} |
|
}; |
|
|
|
/* This works around a problem in FreeBSD linker */ |
|
@@ -3598,7 +3494,7 @@ |
|
relink_command="$var=\"$var_value\"; export $var; $relink_command" |
|
fi |
|
done |
|
- relink_command="(cd `pwd`; $relink_command)" |
|
+ relink_command="cd `pwd`; $relink_command" |
|
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
|
fi |
|
|
|
@@ -3618,7 +3514,7 @@ |
|
# win32 will think the script is a binary if it has |
|
# a .exe suffix, so we strip it off here. |
|
case $output in |
|
- *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;; |
|
+ *.exe) output=`echo $output|sed 's,.exe$,,'` ;; |
|
esac |
|
# test for cygwin because mv fails w/o .exe extensions |
|
case $host in |
|
@@ -3642,7 +3538,7 @@ |
|
|
|
# Sed substitution that helps us do robust quoting. It backslashifies |
|
# metacharacters that are still active within double-quoted strings. |
|
-Xsed="${SED}"' -e 1s/^X//' |
|
+Xsed='sed -e 1s/^X//' |
|
sed_quote_subst='$sed_quote_subst' |
|
|
|
# The HP-UX ksh and POSIX shell print the target directory to stdout |
|
@@ -3680,7 +3576,7 @@ |
|
test \"x\$thisdir\" = \"x\$file\" && thisdir=. |
|
|
|
# Follow symbolic links until we get to the real thisdir. |
|
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` |
|
+ file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` |
|
while test -n \"\$file\"; do |
|
destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` |
|
|
|
@@ -3693,7 +3589,7 @@ |
|
fi |
|
|
|
file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` |
|
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` |
|
+ file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` |
|
done |
|
|
|
# Try to get the absolute directory name. |
|
@@ -3707,7 +3603,7 @@ |
|
progdir=\"\$thisdir/$objdir\" |
|
|
|
if test ! -f \"\$progdir/\$program\" || \\ |
|
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ |
|
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ |
|
test \"X\$file\" != \"X\$progdir/\$program\"; }; then |
|
|
|
file=\"\$\$-\$program\" |
|
@@ -3722,9 +3618,8 @@ |
|
|
|
# relink executable if necessary |
|
if test -n \"\$relink_command\"; then |
|
- if relink_command_output=\`eval \$relink_command 2>&1\`; then : |
|
+ if (eval \$relink_command); then : |
|
else |
|
- $echo \"\$relink_command_output\" >&2 |
|
$rm \"\$progdir/\$file\" |
|
exit 1 |
|
fi |
|
@@ -3753,7 +3648,7 @@ |
|
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\" |
|
|
|
# Some systems cannot cope with colon-terminated $shlibpath_var |
|
- # The second colon is a workaround for a bug in BeOS R4 ${SED} |
|
+ # The second colon is a workaround for a bug in BeOS R4 sed |
|
$shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` |
|
|
|
export $shlibpath_var |
|
@@ -3895,7 +3790,7 @@ |
|
|
|
eval cmds=\"$old_archive_cmds\" |
|
fi |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -3928,7 +3823,7 @@ |
|
fi |
|
done |
|
# Quote the link command for shipping. |
|
- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" |
|
+ relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" |
|
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` |
|
|
|
# Only create the output if not a dry run. |
|
@@ -3945,7 +3840,7 @@ |
|
case $deplib in |
|
*.la) |
|
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` |
|
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
|
+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
|
if test -z "$libdir"; then |
|
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 |
|
exit 1 |
|
@@ -3959,7 +3854,7 @@ |
|
newdlfiles= |
|
for lib in $dlfiles; do |
|
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` |
|
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
|
+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
|
if test -z "$libdir"; then |
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
|
exit 1 |
|
@@ -3970,7 +3865,7 @@ |
|
newdlprefiles= |
|
for lib in $dlprefiles; do |
|
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` |
|
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
|
+ eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
|
if test -z "$libdir"; then |
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
|
exit 1 |
|
@@ -4194,7 +4089,7 @@ |
|
|
|
*.la) |
|
# Check to see that this really is a libtool archive. |
|
- if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : |
|
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : |
|
else |
|
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2 |
|
$echo "$help" 1>&2 |
|
@@ -4270,7 +4165,7 @@ |
|
# Do each command in the postinstall commands. |
|
lib="$destdir/$realname" |
|
eval cmds=\"$postinstall_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -4343,27 +4238,19 @@ |
|
fi |
|
|
|
# Do a test to see if this is really a libtool program. |
|
- case $host in |
|
- *cygwin*|*mingw*) |
|
- wrapper=`echo $file | ${SED} -e 's,.exe$,,'` |
|
- ;; |
|
- *) |
|
- wrapper=$file |
|
- ;; |
|
- esac |
|
- if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then |
|
+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
|
notinst_deplibs= |
|
relink_command= |
|
|
|
# If there is no directory component, then add one. |
|
case $file in |
|
- */* | *\\*) . $wrapper ;; |
|
- *) . ./$wrapper ;; |
|
+ */* | *\\*) . $file ;; |
|
+ *) . ./$file ;; |
|
esac |
|
|
|
# Check the variables that should have been set. |
|
if test -z "$notinst_deplibs"; then |
|
- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 |
|
+ $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 |
|
exit 1 |
|
fi |
|
|
|
@@ -4388,8 +4275,8 @@ |
|
relink_command= |
|
# If there is no directory component, then add one. |
|
case $file in |
|
- */* | *\\*) . $wrapper ;; |
|
- *) . ./$wrapper ;; |
|
+ */* | *\\*) . $file ;; |
|
+ *) . ./$file ;; |
|
esac |
|
|
|
outputname= |
|
@@ -4437,7 +4324,7 @@ |
|
destfile=$destfile.exe |
|
;; |
|
*:*.exe) |
|
- destfile=`echo $destfile | ${SED} -e 's,.exe$,,'` |
|
+ destfile=`echo $destfile | sed -e 's,.exe$,,'` |
|
;; |
|
esac |
|
;; |
|
@@ -4465,7 +4352,7 @@ |
|
|
|
# Do each command in the postinstall commands. |
|
eval cmds=\"$old_postinstall_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -4481,10 +4368,11 @@ |
|
if test -n "$current_libdirs"; then |
|
# Maybe just do a dry run. |
|
test -n "$run" && current_libdirs=" -n$current_libdirs" |
|
- exec_cmd='$SHELL $0 --finish$current_libdirs' |
|
- else |
|
- exit 0 |
|
+ exec $SHELL $0 --finish$current_libdirs |
|
+ exit 1 |
|
fi |
|
+ |
|
+ exit 0 |
|
;; |
|
|
|
# libtool finish mode |
|
@@ -4503,7 +4391,7 @@ |
|
if test -n "$finish_cmds"; then |
|
# Do each command in the finish commands. |
|
eval cmds=\"$finish_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -4585,7 +4473,7 @@ |
|
case $file in |
|
*.la) |
|
# Check to see that this really is a libtool archive. |
|
- if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : |
|
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : |
|
else |
|
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 |
|
$echo "$help" 1>&2 |
|
@@ -4656,7 +4544,7 @@ |
|
-*) ;; |
|
*) |
|
# Do a test to see if this is really a libtool program. |
|
- if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
|
+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
|
# If there is no directory component, then add one. |
|
case $file in |
|
*/* | *\\*) . $file ;; |
|
@@ -4687,8 +4575,11 @@ |
|
LANG="$save_LANG"; export LANG |
|
fi |
|
|
|
- # Now prepare to actually exec the command. |
|
- exec_cmd="\$cmd$args" |
|
+ # Now actually exec the command. |
|
+ eval "exec \$cmd$args" |
|
+ |
|
+ $echo "$modename: cannot exec \$cmd$args" |
|
+ exit 1 |
|
else |
|
# Display what would be done. |
|
if test -n "$shlibpath_var"; then |
|
@@ -4750,14 +4641,14 @@ |
|
|
|
# Don't error if the file doesn't exist and rm -f was used. |
|
if (test -L "$file") >/dev/null 2>&1 \ |
|
- || (test -h "$file") >/dev/null 2>&1 \ |
|
+ || (test -h "$file") >/dev/null 2>&1 \ |
|
|| test -f "$file"; then |
|
- : |
|
+ : |
|
elif test -d "$file"; then |
|
- exit_status=1 |
|
+ exit_status=1 |
|
continue |
|
elif test "$rmforce" = yes; then |
|
- continue |
|
+ continue |
|
fi |
|
|
|
rmfiles="$file" |
|
@@ -4765,7 +4656,7 @@ |
|
case $name in |
|
*.la) |
|
# Possibly a libtool archive, so verify it. |
|
- if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
|
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
|
. $dir/$name |
|
|
|
# Delete the libtool libraries and symlinks. |
|
@@ -4779,7 +4670,7 @@ |
|
if test -n "$library_names"; then |
|
# Do each command in the postuninstall commands. |
|
eval cmds=\"$postuninstall_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -4794,7 +4685,7 @@ |
|
if test -n "$old_library"; then |
|
# Do each command in the old_postuninstall commands. |
|
eval cmds=\"$old_postuninstall_cmds\" |
|
- save_ifs="$IFS"; IFS='~' |
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' |
|
for cmd in $cmds; do |
|
IFS="$save_ifs" |
|
$show "$cmd" |
|
@@ -4820,7 +4711,7 @@ |
|
*) |
|
# Do a test to see if this is a libtool program. |
|
if test $mode = clean && |
|
- (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
|
+ (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then |
|
relink_command= |
|
. $dir/$file |
|
|
|
@@ -4853,17 +4744,10 @@ |
|
;; |
|
esac |
|
|
|
- if test -z "$exec_cmd"; then |
|
- $echo "$modename: invalid operation mode \`$mode'" 1>&2 |
|
- $echo "$generic_help" 1>&2 |
|
- exit 1 |
|
- fi |
|
-fi # test -z "$show_help" |
|
- |
|
-if test -n "$exec_cmd"; then |
|
- eval exec $exec_cmd |
|
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2 |
|
+ $echo "$generic_help" 1>&2 |
|
exit 1 |
|
-fi |
|
+fi # test -z "$show_help" |
|
|
|
# We need to display help for each of the modes. |
|
case $mode in |
|
|
|
Index: configure.in |
|
--- configure.in.orig Wed Sep 3 01:08:42 2003 |
|
+++ configure.in Tue Sep 16 16:51:37 2003 |
|
@@ -420,9 +420,9 @@ |
|
|
|
AC_MSG_CHECKING(whether to build the GGI driver) |
|
AC_MSG_RESULT($with_ggi) |
|
+build_ggi_fbdev_target=auto |
|
+build_ggi_genkgi_driver=auto |
|
if test "x$with_ggi" = xyes; then |
|
- build_ggi_fbdev_target=auto |
|
- build_ggi_genkgi_driver=auto |
|
AC_ARG_ENABLE(ggi_fbdev, |
|
[ --disable-ggi-fbdev Don't build the GGIMesa fbdev target], |
|
build_ggi_fbdev_target=$enableval) |
|
@@ -458,9 +458,9 @@ |
|
AC_MSG_RESULT(yes) |
|
fi |
|
|
|
- AM_CONDITIONAL(HAVE_GGI_FBDEV, test $build_ggi_fbdev_target = yes) |
|
- AM_CONDITIONAL(HAVE_GGI_GENKGI, test $build_ggi_genkgi_driver = yes) |
|
fi |
|
+AM_CONDITIONAL(HAVE_GGI_FBDEV, test $build_ggi_fbdev_target = yes) |
|
+AM_CONDITIONAL(HAVE_GGI_GENKGI, test $build_ggi_genkgi_driver = yes) |
|
ggi_confdir=$prefix/etc |
|
ggi_libdir=$prefix/lib |
|
AC_SUBST(ggi_confdir)
|
|
|