regen
This commit is contained in:
parent
dc5e2c7159
commit
1dd9fa7be4
@ -119,6 +119,7 @@ DEPDIR = @DEPDIR@
|
|||||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
DRIVER_NAME = @DRIVER_NAME@
|
DRIVER_NAME = @DRIVER_NAME@
|
||||||
|
DSYMUTIL = @DSYMUTIL@
|
||||||
ECHO = @ECHO@
|
ECHO = @ECHO@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
@ -129,6 +130,7 @@ F77 = @F77@
|
|||||||
FFLAGS = @FFLAGS@
|
FFLAGS = @FFLAGS@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
|
GREP = @GREP@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
@ -147,6 +149,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
|||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
|
NMEDIT = @NMEDIT@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
@ -157,19 +160,16 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
|||||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
|
SED = @SED@
|
||||||
SET_MAKE = @SET_MAKE@
|
SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
XORG_CFLAGS = @XORG_CFLAGS@
|
XORG_CFLAGS = @XORG_CFLAGS@
|
||||||
XORG_LIBS = @XORG_LIBS@
|
XORG_LIBS = @XORG_LIBS@
|
||||||
ac_ct_AR = @ac_ct_AR@
|
|
||||||
ac_ct_CC = @ac_ct_CC@
|
ac_ct_CC = @ac_ct_CC@
|
||||||
ac_ct_CXX = @ac_ct_CXX@
|
ac_ct_CXX = @ac_ct_CXX@
|
||||||
ac_ct_F77 = @ac_ct_F77@
|
ac_ct_F77 = @ac_ct_F77@
|
||||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
||||||
ac_ct_STRIP = @ac_ct_STRIP@
|
|
||||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
|
||||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||||
@ -186,24 +186,31 @@ build_cpu = @build_cpu@
|
|||||||
build_os = @build_os@
|
build_os = @build_os@
|
||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
|
datarootdir = @datarootdir@
|
||||||
|
docdir = @docdir@
|
||||||
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
host = @host@
|
host = @host@
|
||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
host_cpu = @host_cpu@
|
host_cpu = @host_cpu@
|
||||||
host_os = @host_os@
|
host_os = @host_os@
|
||||||
host_vendor = @host_vendor@
|
host_vendor = @host_vendor@
|
||||||
|
htmldir = @htmldir@
|
||||||
includedir = @includedir@
|
includedir = @includedir@
|
||||||
infodir = @infodir@
|
infodir = @infodir@
|
||||||
install_sh = @install_sh@
|
install_sh = @install_sh@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
libexecdir = @libexecdir@
|
libexecdir = @libexecdir@
|
||||||
|
localedir = @localedir@
|
||||||
localstatedir = @localstatedir@
|
localstatedir = @localstatedir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @mkdir_p@
|
||||||
moduledir = @moduledir@
|
moduledir = @moduledir@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
|
pdfdir = @pdfdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
|
psdir = @psdir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
sharedstatedir = @sharedstatedir@
|
sharedstatedir = @sharedstatedir@
|
||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
|
772
driver/xf86-video-wsfb/aclocal.m4
vendored
772
driver/xf86-video-wsfb/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@ -32,6 +32,12 @@
|
|||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
#undef HAVE_UNISTD_H
|
#undef HAVE_UNISTD_H
|
||||||
|
|
||||||
|
/* Have 1bpp support */
|
||||||
|
#undef HAVE_XF1BPP
|
||||||
|
|
||||||
|
/* Have 4bpp support */
|
||||||
|
#undef HAVE_XF4BPP
|
||||||
|
|
||||||
/* Name of package */
|
/* Name of package */
|
||||||
#undef PACKAGE
|
#undef PACKAGE
|
||||||
|
|
||||||
|
10662
driver/xf86-video-wsfb/configure
vendored
10662
driver/xf86-video-wsfb/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,8 @@
|
|||||||
# ltmain.sh - Provide generalized library-building support services.
|
# ltmain.sh - Provide generalized library-building support services.
|
||||||
# NOTE: Changing this file will not affect anything until you rerun configure.
|
# NOTE: Changing this file will not affect anything until you rerun configure.
|
||||||
#
|
#
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
||||||
# Free Software Foundation, Inc.
|
# 2007, 2008 Free Software Foundation, Inc.
|
||||||
# Originally by 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
|
# This program is free software; you can redistribute it and/or modify
|
||||||
@ -43,14 +43,22 @@ EXIT_FAILURE=1
|
|||||||
|
|
||||||
PROGRAM=ltmain.sh
|
PROGRAM=ltmain.sh
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION=1.5.22
|
VERSION=1.5.26
|
||||||
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
|
||||||
|
|
||||||
# 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
|
||||||
|
else
|
||||||
|
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||||
fi
|
fi
|
||||||
|
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||||
|
DUALCASE=1; export DUALCASE # for MKS sh
|
||||||
|
|
||||||
# Check that we have a working $echo.
|
# Check that we have a working $echo.
|
||||||
if test "X$1" = X--no-reexec; then
|
if test "X$1" = X--no-reexec; then
|
||||||
@ -105,11 +113,19 @@ 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
|
lt_env=
|
||||||
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
|
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
fi
|
do
|
||||||
if test "${LANG+set}" = set; then
|
eval "if test \"\${$lt_var+set}\" = set; then
|
||||||
save_LANG="$LANG"; LANG=C; export LANG
|
save_$lt_var=\$$lt_var
|
||||||
|
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
|
||||||
|
$lt_var=C
|
||||||
|
export $lt_var
|
||||||
|
fi"
|
||||||
|
done
|
||||||
|
|
||||||
|
if test -n "$lt_env"; then
|
||||||
|
lt_env="env $lt_env"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Make sure IFS has a sensible default
|
# Make sure IFS has a sensible default
|
||||||
@ -136,6 +152,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=
|
||||||
|
extracted_serial=0
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# Shell function definitions:
|
# Shell function definitions:
|
||||||
@ -196,7 +214,13 @@ func_win32_libid ()
|
|||||||
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
||||||
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||||
win32_nmres=`eval $NM -f posix -A $1 | \
|
win32_nmres=`eval $NM -f posix -A $1 | \
|
||||||
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
|
$SED -n -e '1,100{
|
||||||
|
/ I /{
|
||||||
|
s,.*,import,
|
||||||
|
p
|
||||||
|
q
|
||||||
|
}
|
||||||
|
}'`
|
||||||
case $win32_nmres in
|
case $win32_nmres in
|
||||||
import*) win32_libid_type="x86 archive import";;
|
import*) win32_libid_type="x86 archive import";;
|
||||||
*) win32_libid_type="x86 archive static";;
|
*) win32_libid_type="x86 archive static";;
|
||||||
@ -327,7 +351,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"
|
||||||
@ -454,11 +488,12 @@ do
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
--version)
|
--version)
|
||||||
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
|
echo "\
|
||||||
$echo
|
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
|
||||||
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
|
|
||||||
$echo "This is free software; see the source for copying conditions. There is NO"
|
Copyright (C) 2008 Free Software Foundation, Inc.
|
||||||
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
This is free software; see the source for copying conditions. There is NO
|
||||||
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||||
exit $?
|
exit $?
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -755,9 +790,11 @@ if test -z "$show_help"; then
|
|||||||
*.class) xform=class ;;
|
*.class) xform=class ;;
|
||||||
*.cpp) xform=cpp ;;
|
*.cpp) xform=cpp ;;
|
||||||
*.cxx) xform=cxx ;;
|
*.cxx) xform=cxx ;;
|
||||||
*.f90) xform=f90 ;;
|
*.[fF][09]?) xform=[fF][09]. ;;
|
||||||
*.for) xform=for ;;
|
*.for) xform=for ;;
|
||||||
*.java) xform=java ;;
|
*.java) xform=java ;;
|
||||||
|
*.obj) xform=obj ;;
|
||||||
|
*.sx) xform=sx ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
||||||
@ -926,7 +963,7 @@ EOF
|
|||||||
$run $rm "$lobj" "$output_obj"
|
$run $rm "$lobj" "$output_obj"
|
||||||
|
|
||||||
$show "$command"
|
$show "$command"
|
||||||
if $run eval "$command"; then :
|
if $run eval $lt_env "$command"; then :
|
||||||
else
|
else
|
||||||
test -n "$output_obj" && $run $rm $removelist
|
test -n "$output_obj" && $run $rm $removelist
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
@ -998,7 +1035,7 @@ EOF
|
|||||||
command="$command$suppress_output"
|
command="$command$suppress_output"
|
||||||
$run $rm "$obj" "$output_obj"
|
$run $rm "$obj" "$output_obj"
|
||||||
$show "$command"
|
$show "$command"
|
||||||
if $run eval "$command"; then :
|
if $run eval $lt_env "$command"; then :
|
||||||
else
|
else
|
||||||
$run $rm $removelist
|
$run $rm $removelist
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
@ -1131,6 +1168,7 @@ EOF
|
|||||||
thread_safe=no
|
thread_safe=no
|
||||||
vinfo=
|
vinfo=
|
||||||
vinfo_number=no
|
vinfo_number=no
|
||||||
|
single_module="${wl}-single_module"
|
||||||
|
|
||||||
func_infer_tag $base_compile
|
func_infer_tag $base_compile
|
||||||
|
|
||||||
@ -1138,8 +1176,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
|
||||||
@ -1147,12 +1186,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
|
||||||
@ -1600,7 +1647,7 @@ EOF
|
|||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||||
compiler_flags="$compiler_flags $arg"
|
compiler_flags="$compiler_flags $arg"
|
||||||
compile_command="$compile_command $arg"
|
compile_command="$compile_command $arg"
|
||||||
finalize_command="$finalize_command $arg"
|
finalize_command="$finalize_command $arg"
|
||||||
@ -1608,6 +1655,11 @@ EOF
|
|||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
-multi_module)
|
||||||
|
single_module="${wl}-multi_module"
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
|
||||||
-module)
|
-module)
|
||||||
module=yes
|
module=yes
|
||||||
continue
|
continue
|
||||||
@ -1621,10 +1673,11 @@ EOF
|
|||||||
# -m* pass through architecture-specific compiler args for GCC
|
# -m* pass through architecture-specific compiler args for GCC
|
||||||
# -m*, -t[45]*, -txscale* pass through architecture-specific
|
# -m*, -t[45]*, -txscale* pass through architecture-specific
|
||||||
# compiler args for GCC
|
# compiler args for GCC
|
||||||
# -pg pass through profiling flag for GCC
|
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
|
||||||
|
# -F/path gives path to uninstalled frameworks, gcc on darwin
|
||||||
# @file GCC response files
|
# @file GCC response files
|
||||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
|
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
||||||
-t[45]*|-txscale*|@*)
|
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
|
||||||
|
|
||||||
# Unknown arguments in both finalize_command and compile_command need
|
# Unknown arguments in both finalize_command and compile_command need
|
||||||
# to be aesthetically quoted because they are evaled later.
|
# to be aesthetically quoted because they are evaled later.
|
||||||
@ -1652,9 +1705,9 @@ EOF
|
|||||||
|
|
||||||
-no-install)
|
-no-install)
|
||||||
case $host in
|
case $host in
|
||||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
|
||||||
# The PATH hackery in wrapper scripts is required on Windows
|
# The PATH hackery in wrapper scripts is required on Windows
|
||||||
# in order for the loader to find any dlls it needs.
|
# and Darwin in order for the loader to find any dlls it needs.
|
||||||
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
|
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
|
||||||
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
||||||
fast_install=no
|
fast_install=no
|
||||||
@ -1713,7 +1766,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
|
||||||
@ -2106,7 +2159,7 @@ EOF
|
|||||||
lib=
|
lib=
|
||||||
found=no
|
found=no
|
||||||
case $deplib in
|
case $deplib in
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
if test "$linkmode,$pass" = "prog,link"; then
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
compile_deplibs="$deplib $compile_deplibs"
|
||||||
finalize_deplibs="$deplib $finalize_deplibs"
|
finalize_deplibs="$deplib $finalize_deplibs"
|
||||||
@ -2122,7 +2175,12 @@ EOF
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
||||||
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
if test "$linkmode" = lib; then
|
||||||
|
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
|
||||||
|
else
|
||||||
|
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
|
||||||
|
fi
|
||||||
|
for searchdir in $searchdirs; do
|
||||||
for search_ext in .la $std_shrext .so .a; do
|
for search_ext in .la $std_shrext .so .a; do
|
||||||
# Search the libtool library
|
# Search the libtool library
|
||||||
lib="$searchdir/lib${name}${search_ext}"
|
lib="$searchdir/lib${name}${search_ext}"
|
||||||
@ -2503,7 +2561,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.
|
||||||
@ -2916,12 +2976,18 @@ EOF
|
|||||||
# we do not want to link against static libs,
|
# we do not want to link against static libs,
|
||||||
# but need to link against shared
|
# but need to link against shared
|
||||||
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
||||||
|
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||||
if test -n "$deplibrary_names" ; then
|
if test -n "$deplibrary_names" ; then
|
||||||
for tmp in $deplibrary_names ; do
|
for tmp in $deplibrary_names ; do
|
||||||
depdepl=$tmp
|
depdepl=$tmp
|
||||||
done
|
done
|
||||||
if test -f "$path/$depdepl" ; then
|
if test -f "$deplibdir/$depdepl" ; then
|
||||||
|
depdepl="$deplibdir/$depdepl"
|
||||||
|
elif test -f "$path/$depdepl" ; then
|
||||||
depdepl="$path/$depdepl"
|
depdepl="$path/$depdepl"
|
||||||
|
else
|
||||||
|
# Can't find it, oh well...
|
||||||
|
depdepl=
|
||||||
fi
|
fi
|
||||||
# do not add paths which are already there
|
# do not add paths which are already there
|
||||||
case " $newlib_search_path " in
|
case " $newlib_search_path " in
|
||||||
@ -3069,9 +3135,10 @@ EOF
|
|||||||
|
|
||||||
case $linkmode in
|
case $linkmode in
|
||||||
oldlib)
|
oldlib)
|
||||||
if test -n "$deplibs"; then
|
case " $deplibs" in
|
||||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
|
*\ -l* | *\ -L*)
|
||||||
fi
|
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||||
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
||||||
@ -3199,7 +3266,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"
|
||||||
@ -3210,9 +3277,10 @@ EOF
|
|||||||
age="0"
|
age="0"
|
||||||
;;
|
;;
|
||||||
irix|nonstopux)
|
irix|nonstopux)
|
||||||
current=`expr $number_major + $number_minor - 1`
|
current=`expr $number_major + $number_minor`
|
||||||
age="$number_minor"
|
age="$number_minor"
|
||||||
revision="$number_minor"
|
revision="$number_minor"
|
||||||
|
lt_irix_increment=no
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
@ -3271,7 +3339,8 @@ EOF
|
|||||||
versuffix="$major.$age.$revision"
|
versuffix="$major.$age.$revision"
|
||||||
# Darwin ld doesn't like 0 for these options...
|
# Darwin ld doesn't like 0 for these options...
|
||||||
minor_current=`expr $current + 1`
|
minor_current=`expr $current + 1`
|
||||||
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||||
|
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
freebsd-aout)
|
freebsd-aout)
|
||||||
@ -3285,8 +3354,11 @@ EOF
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
irix | nonstopux)
|
irix | nonstopux)
|
||||||
major=`expr $current - $age + 1`
|
if test "X$lt_irix_increment" = "Xno"; then
|
||||||
|
major=`expr $current - $age`
|
||||||
|
else
|
||||||
|
major=`expr $current - $age + 1`
|
||||||
|
fi
|
||||||
case $version_type in
|
case $version_type in
|
||||||
nonstopux) verstring_prefix=nonstopux ;;
|
nonstopux) verstring_prefix=nonstopux ;;
|
||||||
*) verstring_prefix=sgi ;;
|
*) verstring_prefix=sgi ;;
|
||||||
@ -3437,11 +3509,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.
|
||||||
@ -3542,13 +3614,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 "*)
|
||||||
@ -3587,9 +3658,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
|
||||||
@ -3621,7 +3690,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
|
||||||
@ -3907,7 +3976,10 @@ EOF
|
|||||||
test -n "$hardcode_libdirs"; then
|
test -n "$hardcode_libdirs"; then
|
||||||
libdir="$hardcode_libdirs"
|
libdir="$hardcode_libdirs"
|
||||||
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
||||||
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
case $archive_cmds in
|
||||||
|
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
|
||||||
|
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
|
||||||
|
esac
|
||||||
else
|
else
|
||||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
||||||
fi
|
fi
|
||||||
@ -4217,9 +4289,10 @@ EOF
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
obj)
|
obj)
|
||||||
if test -n "$deplibs"; then
|
case " $deplibs" in
|
||||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
|
*\ -l* | *\ -L*)
|
||||||
fi
|
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||||
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
||||||
@ -4266,12 +4339,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"
|
||||||
@ -4719,16 +4794,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
|
||||||
;;
|
;;
|
||||||
@ -4743,13 +4818,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.
|
||||||
@ -4836,7 +4911,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=
|
||||||
@ -4873,7 +4948,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.
|
||||||
@ -5280,6 +5355,20 @@ 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
|
||||||
|
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||||
|
DUALCASE=1; export DUALCASE # for MKS sh
|
||||||
|
|
||||||
# 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
|
||||||
@ -5422,7 +5511,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
|
||||||
@ -5608,7 +5697,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
|
||||||
@ -5957,9 +6046,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
|
||||||
@ -6168,7 +6257,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 :
|
||||||
@ -6345,8 +6434,10 @@ relink_command=\"$relink_command\""
|
|||||||
if test -f "$dir/$objdir/$dlname"; then
|
if test -f "$dir/$objdir/$dlname"; then
|
||||||
dir="$dir/$objdir"
|
dir="$dir/$objdir"
|
||||||
else
|
else
|
||||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
if test ! -f "$dir/$dlname"; then
|
||||||
exit $EXIT_FAILURE
|
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||||
|
exit $EXIT_FAILURE
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -6410,12 +6501,12 @@ 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 LANGUAGE 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
|
fi"
|
||||||
fi
|
done
|
||||||
|
|
||||||
# Now prepare to actually exec the command.
|
# Now prepare to actually exec the command.
|
||||||
exec_cmd="\$cmd$args"
|
exec_cmd="\$cmd$args"
|
||||||
@ -6772,9 +6863,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
|
||||||
@ -6788,9 +6879,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.
|
||||||
|
|
||||||
|
@ -111,6 +111,7 @@ DEPDIR = @DEPDIR@
|
|||||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
DRIVER_NAME = @DRIVER_NAME@
|
DRIVER_NAME = @DRIVER_NAME@
|
||||||
|
DSYMUTIL = @DSYMUTIL@
|
||||||
ECHO = @ECHO@
|
ECHO = @ECHO@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
@ -121,6 +122,7 @@ F77 = @F77@
|
|||||||
FFLAGS = @FFLAGS@
|
FFLAGS = @FFLAGS@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
|
GREP = @GREP@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
@ -139,6 +141,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
|||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
|
NMEDIT = @NMEDIT@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
@ -149,19 +152,16 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
|||||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
|
SED = sed
|
||||||
SET_MAKE = @SET_MAKE@
|
SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
XORG_CFLAGS = @XORG_CFLAGS@
|
XORG_CFLAGS = @XORG_CFLAGS@
|
||||||
XORG_LIBS = @XORG_LIBS@
|
XORG_LIBS = @XORG_LIBS@
|
||||||
ac_ct_AR = @ac_ct_AR@
|
|
||||||
ac_ct_CC = @ac_ct_CC@
|
ac_ct_CC = @ac_ct_CC@
|
||||||
ac_ct_CXX = @ac_ct_CXX@
|
ac_ct_CXX = @ac_ct_CXX@
|
||||||
ac_ct_F77 = @ac_ct_F77@
|
ac_ct_F77 = @ac_ct_F77@
|
||||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
||||||
ac_ct_STRIP = @ac_ct_STRIP@
|
|
||||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
|
||||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||||
@ -178,24 +178,31 @@ build_cpu = @build_cpu@
|
|||||||
build_os = @build_os@
|
build_os = @build_os@
|
||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
|
datarootdir = @datarootdir@
|
||||||
|
docdir = @docdir@
|
||||||
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
host = @host@
|
host = @host@
|
||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
host_cpu = @host_cpu@
|
host_cpu = @host_cpu@
|
||||||
host_os = @host_os@
|
host_os = @host_os@
|
||||||
host_vendor = @host_vendor@
|
host_vendor = @host_vendor@
|
||||||
|
htmldir = @htmldir@
|
||||||
includedir = @includedir@
|
includedir = @includedir@
|
||||||
infodir = @infodir@
|
infodir = @infodir@
|
||||||
install_sh = @install_sh@
|
install_sh = @install_sh@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
libexecdir = @libexecdir@
|
libexecdir = @libexecdir@
|
||||||
|
localedir = @localedir@
|
||||||
localstatedir = @localstatedir@
|
localstatedir = @localstatedir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @mkdir_p@
|
||||||
moduledir = @moduledir@
|
moduledir = @moduledir@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
|
pdfdir = @pdfdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
|
psdir = @psdir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
sharedstatedir = @sharedstatedir@
|
sharedstatedir = @sharedstatedir@
|
||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
@ -205,7 +212,6 @@ driverman_PRE = @DRIVER_NAME@.man
|
|||||||
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
|
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
|
||||||
EXTRA_DIST = @DRIVER_NAME@.man
|
EXTRA_DIST = @DRIVER_NAME@.man
|
||||||
CLEANFILES = $(driverman_DATA)
|
CLEANFILES = $(driverman_DATA)
|
||||||
SED = sed
|
|
||||||
|
|
||||||
# Strings to replace in man pages
|
# Strings to replace in man pages
|
||||||
XORGRELSTRING = @PACKAGE_STRING@
|
XORGRELSTRING = @PACKAGE_STRING@
|
||||||
|
@ -121,6 +121,7 @@ DEPDIR = @DEPDIR@
|
|||||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
DRIVER_NAME = @DRIVER_NAME@
|
DRIVER_NAME = @DRIVER_NAME@
|
||||||
|
DSYMUTIL = @DSYMUTIL@
|
||||||
ECHO = @ECHO@
|
ECHO = @ECHO@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
@ -131,6 +132,7 @@ F77 = @F77@
|
|||||||
FFLAGS = @FFLAGS@
|
FFLAGS = @FFLAGS@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
|
GREP = @GREP@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
@ -149,6 +151,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
|||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
|
NMEDIT = @NMEDIT@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
@ -159,19 +162,16 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
|||||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
|
SED = @SED@
|
||||||
SET_MAKE = @SET_MAKE@
|
SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
XORG_CFLAGS = @XORG_CFLAGS@
|
XORG_CFLAGS = @XORG_CFLAGS@
|
||||||
XORG_LIBS = @XORG_LIBS@
|
XORG_LIBS = @XORG_LIBS@
|
||||||
ac_ct_AR = @ac_ct_AR@
|
|
||||||
ac_ct_CC = @ac_ct_CC@
|
ac_ct_CC = @ac_ct_CC@
|
||||||
ac_ct_CXX = @ac_ct_CXX@
|
ac_ct_CXX = @ac_ct_CXX@
|
||||||
ac_ct_F77 = @ac_ct_F77@
|
ac_ct_F77 = @ac_ct_F77@
|
||||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
|
||||||
ac_ct_STRIP = @ac_ct_STRIP@
|
|
||||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
|
||||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||||
@ -188,24 +188,31 @@ build_cpu = @build_cpu@
|
|||||||
build_os = @build_os@
|
build_os = @build_os@
|
||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
|
datarootdir = @datarootdir@
|
||||||
|
docdir = @docdir@
|
||||||
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
host = @host@
|
host = @host@
|
||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
host_cpu = @host_cpu@
|
host_cpu = @host_cpu@
|
||||||
host_os = @host_os@
|
host_os = @host_os@
|
||||||
host_vendor = @host_vendor@
|
host_vendor = @host_vendor@
|
||||||
|
htmldir = @htmldir@
|
||||||
includedir = @includedir@
|
includedir = @includedir@
|
||||||
infodir = @infodir@
|
infodir = @infodir@
|
||||||
install_sh = @install_sh@
|
install_sh = @install_sh@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
libexecdir = @libexecdir@
|
libexecdir = @libexecdir@
|
||||||
|
localedir = @localedir@
|
||||||
localstatedir = @localstatedir@
|
localstatedir = @localstatedir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @mkdir_p@
|
||||||
moduledir = @moduledir@
|
moduledir = @moduledir@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
|
pdfdir = @pdfdir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
|
psdir = @psdir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
sharedstatedir = @sharedstatedir@
|
sharedstatedir = @sharedstatedir@
|
||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
|
Loading…
Reference in New Issue
Block a user