Build system update
Update the build system, including AM_MAINTAINER_MODE and a libtool update. Gbp-Pq: Name autotools_update.patch
This commit is contained in:
parent
5d760ed3e4
commit
49a95f62af
22
Makefile.in
22
Makefile.in
|
@ -163,6 +163,7 @@ EGREP = @EGREP@
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
F77 = @F77@
|
F77 = @F77@
|
||||||
FFLAGS = @FFLAGS@
|
FFLAGS = @FFLAGS@
|
||||||
|
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@
|
||||||
|
@ -173,6 +174,9 @@ LIBS = @LIBS@
|
||||||
LIBTOOL = @LIBTOOL@
|
LIBTOOL = @LIBTOOL@
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
|
MAINT = @MAINT@
|
||||||
|
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||||
|
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
|
@ -197,12 +201,9 @@ SOLARIS_IO_FALSE = @SOLARIS_IO_FALSE@
|
||||||
SOLARIS_IO_TRUE = @SOLARIS_IO_TRUE@
|
SOLARIS_IO_TRUE = @SOLARIS_IO_TRUE@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
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@
|
|
||||||
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@
|
||||||
|
@ -219,25 +220,32 @@ 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@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
|
pdfdir = @pdfdir@
|
||||||
pkgpyexecdir = @pkgpyexecdir@
|
pkgpyexecdir = @pkgpyexecdir@
|
||||||
pkgpythondir = @pkgpythondir@
|
pkgpythondir = @pkgpythondir@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
|
psdir = @psdir@
|
||||||
pyexecdir = @pyexecdir@
|
pyexecdir = @pyexecdir@
|
||||||
pythondir = @pythondir@
|
pythondir = @pythondir@
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
|
@ -325,7 +333,7 @@ all: all-am
|
||||||
.SUFFIXES: .c .lo .o .obj
|
.SUFFIXES: .c .lo .o .obj
|
||||||
am--refresh:
|
am--refresh:
|
||||||
@:
|
@:
|
||||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||||
@for dep in $?; do \
|
@for dep in $?; do \
|
||||||
case '$(am__configure_deps)' in \
|
case '$(am__configure_deps)' in \
|
||||||
*$$dep*) \
|
*$$dep*) \
|
||||||
|
@ -352,9 +360,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||||
$(SHELL) ./config.status --recheck
|
$(SHELL) ./config.status --recheck
|
||||||
|
|
||||||
$(top_srcdir)/configure: $(am__configure_deps)
|
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(srcdir) && $(AUTOCONF)
|
cd $(srcdir) && $(AUTOCONF)
|
||||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||||
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
||||||
|
|
||||||
include/config.h: include/stamp-h1
|
include/config.h: include/stamp-h1
|
||||||
|
@ -366,7 +374,7 @@ include/config.h: include/stamp-h1
|
||||||
include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
|
include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
|
||||||
@rm -f include/stamp-h1
|
@rm -f include/stamp-h1
|
||||||
cd $(top_builddir) && $(SHELL) ./config.status include/config.h
|
cd $(top_builddir) && $(SHELL) ./config.status include/config.h
|
||||||
$(top_srcdir)/include/config.h.in: $(am__configure_deps)
|
$(top_srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(top_srcdir) && $(AUTOHEADER)
|
cd $(top_srcdir) && $(AUTOHEADER)
|
||||||
rm -f include/stamp-h1
|
rm -f include/stamp-h1
|
||||||
touch $@
|
touch $@
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
149
ltmain.sh
149
ltmain.sh
|
@ -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 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,8 +43,8 @@ EXIT_FAILURE=1
|
||||||
|
|
||||||
PROGRAM=ltmain.sh
|
PROGRAM=ltmain.sh
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION=1.5.22
|
VERSION="1.5.24 Debian 1.5.24-1"
|
||||||
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
|
||||||
|
|
||||||
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||||
|
@ -57,6 +57,8 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||||
else
|
else
|
||||||
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
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
|
||||||
|
@ -114,10 +116,10 @@ esac
|
||||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
do
|
do
|
||||||
eval "if test \"\${$lt_var+set}\" = set; then
|
eval "if test \"\${$lt_var+set}\" = set; then
|
||||||
save_$lt_var=\$$lt_var
|
save_$lt_var=\$$lt_var
|
||||||
$lt_var=C
|
$lt_var=C
|
||||||
export $lt_var
|
export $lt_var
|
||||||
fi"
|
fi"
|
||||||
done
|
done
|
||||||
|
|
||||||
# Make sure IFS has a sensible default
|
# Make sure IFS has a sensible default
|
||||||
|
@ -206,7 +208,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";;
|
||||||
|
@ -340,11 +348,11 @@ func_extract_archives ()
|
||||||
my_xlib_u=$my_xlib
|
my_xlib_u=$my_xlib
|
||||||
while :; do
|
while :; do
|
||||||
case " $extracted_archives " in
|
case " $extracted_archives " in
|
||||||
*" $my_xlib_u "*)
|
*" $my_xlib_u "*)
|
||||||
extracted_serial=`expr $extracted_serial + 1`
|
extracted_serial=`expr $extracted_serial + 1`
|
||||||
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
||||||
*) break ;;
|
*) break ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
extracted_archives="$extracted_archives $my_xlib_u"
|
extracted_archives="$extracted_archives $my_xlib_u"
|
||||||
my_xdir="$my_gentop/$my_xlib_u"
|
my_xdir="$my_gentop/$my_xlib_u"
|
||||||
|
@ -474,11 +482,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) 2007 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 $?
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -775,7 +784,7 @@ 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 ;;
|
*.obj) xform=obj ;;
|
||||||
|
@ -1160,8 +1169,8 @@ EOF
|
||||||
do
|
do
|
||||||
case $arg in
|
case $arg in
|
||||||
-all-static | -static | -static-libtool-libs)
|
-all-static | -static | -static-libtool-libs)
|
||||||
case $arg in
|
case $arg in
|
||||||
-all-static)
|
-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
|
||||||
|
@ -1170,19 +1179,19 @@ EOF
|
||||||
fi
|
fi
|
||||||
prefer_static_libs=yes
|
prefer_static_libs=yes
|
||||||
;;
|
;;
|
||||||
-static)
|
-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
|
||||||
;;
|
;;
|
||||||
-static-libtool-libs)
|
-static-libtool-libs)
|
||||||
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=yes
|
prefer_static_libs=yes
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
build_libtool_libs=no
|
build_libtool_libs=no
|
||||||
build_old_libs=yes
|
build_old_libs=yes
|
||||||
break
|
break
|
||||||
|
@ -1630,7 +1639,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"
|
||||||
|
@ -1650,10 +1659,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.
|
||||||
|
@ -1681,9 +1691,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
|
||||||
|
@ -2112,7 +2122,10 @@ EOF
|
||||||
case $pass in
|
case $pass in
|
||||||
dlopen) libs="$dlfiles" ;;
|
dlopen) libs="$dlfiles" ;;
|
||||||
dlpreopen) libs="$dlprefiles" ;;
|
dlpreopen) libs="$dlprefiles" ;;
|
||||||
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
|
link)
|
||||||
|
libs="$deplibs %DEPLIBS%"
|
||||||
|
test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if test "$pass" = dlopen; then
|
if test "$pass" = dlopen; then
|
||||||
|
@ -2124,7 +2137,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"
|
||||||
|
@ -2520,9 +2533,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 "$prefer_static_libs" = no ||
|
||||||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
||||||
test -z "$old_library"; }; then
|
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.
|
||||||
|
@ -3229,9 +3242,15 @@ 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
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
$echo "$modename: unknown library version type \`$version_type'" 1>&2
|
||||||
|
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
|
||||||
|
exit $EXIT_FAILURE
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
@ -3290,7 +3309,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)
|
||||||
|
@ -3304,8 +3324,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 ;;
|
||||||
|
@ -3442,11 +3465,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.
|
||||||
|
@ -3547,7 +3570,7 @@ EOF
|
||||||
int main() { return 0; }
|
int main() { return 0; }
|
||||||
EOF
|
EOF
|
||||||
$rm conftest
|
$rm conftest
|
||||||
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; 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\(.*\)'`
|
||||||
|
@ -3909,7 +3932,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
|
||||||
|
@ -4275,7 +4301,7 @@ EOF
|
||||||
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 tmp_whole_archive_flags=\"$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'`
|
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"
|
||||||
|
@ -5295,6 +5321,8 @@ if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
|
||||||
else
|
else
|
||||||
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
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
|
||||||
|
|
||||||
# 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.
|
||||||
|
@ -6391,8 +6419,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
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -6458,14 +6488,11 @@ relink_command=\"$relink_command\""
|
||||||
# Restore saved environment variables
|
# Restore saved environment variables
|
||||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
do
|
do
|
||||||
eval "if test \"\${save_$lt_var+set}\" = set; then
|
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||||
$lt_var=\$save_$lt_var; export $lt_var
|
$lt_var=\$save_$lt_var; export $lt_var
|
||||||
else
|
fi"
|
||||||
$lt_unset $lt_var
|
|
||||||
fi"
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
# Now prepare to actually exec the command.
|
# Now prepare to actually exec the command.
|
||||||
exec_cmd="\$cmd$args"
|
exec_cmd="\$cmd$args"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue