r26120 - in /desktop/experimental/gvfs/debian: changelog control control.in patches/01_maintainer_mode.patch patches/02_deprecated.patch patches/90_relibtoolize.patch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Jan 4 00:13:27 UTC 2011
Author: pochu
Date: Tue Jan 4 00:13:18 2011
New Revision: 26120
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26120
Log:
* New upstream release.
+ debian/control.in:
- Updated build dependencies.
+ debian/patches/*:
- Refreshed.
Modified:
desktop/experimental/gvfs/debian/changelog
desktop/experimental/gvfs/debian/control
desktop/experimental/gvfs/debian/control.in
desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch
desktop/experimental/gvfs/debian/patches/02_deprecated.patch
desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch
Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=26120&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Jan 4 00:13:18 2011
@@ -1,8 +1,16 @@
-gvfs (1.7.0-2) UNRELEASED; urgency=low
-
+gvfs (1.7.1-1) UNRELEASED; urgency=low
+
+ [ Josselin Mouette ]
* 07_smb_initialdir.patch: new patch by Tomas Bzatek and myself. Take
into account initial path when doing a SMB mount, to avoid
permission issues. Closes: #533417.
+
+ [ Emilio Pozuelo Monfort ]
+ * New upstream release.
+ + debian/control.in:
+ - Updated build dependencies.
+ + debian/patches/*:
+ - Refreshed.
-- Josselin Mouette <joss at debian.org> Fri, 17 Dec 2010 18:01:11 +0100
Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=26120&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Tue Jan 4 00:13:18 2011
@@ -35,7 +35,8 @@
libsmbclient-dev (>= 3.0),
libarchive-dev,
libltdl-dev,
- libimobiledevice-dev (>= 0.9.7) [!hurd-any]
+ libimobiledevice-dev (>= 1.1.0) [!hurd-any],
+ libplist-dev
Standards-Version: 3.9.0
Section: libs
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-gnome/desktop/unstable/gvfs
Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=26120&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Tue Jan 4 00:13:18 2011
@@ -30,7 +30,8 @@
libsmbclient-dev (>= 3.0),
libarchive-dev,
libltdl-dev,
- libimobiledevice-dev (>= 0.9.7) [!hurd-any]
+ libimobiledevice-dev (>= 1.1.0) [!hurd-any],
+ libplist-dev
Standards-Version: 3.9.0
Section: libs
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-gnome/desktop/unstable/gvfs
Modified: desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch?rev=26120&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/01_maintainer_mode.patch [utf-8] Tue Jan 4 00:13:18 2011
@@ -3,7 +3,7 @@
@@ -1,6 +1,7 @@
AC_INIT(client/gdaemonvfs.h)
- AM_INIT_AUTOMAKE(gvfs, 1.7.0)
+ AM_INIT_AUTOMAKE(gvfs, 1.7.1)
+AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
Modified: desktop/experimental/gvfs/debian/patches/02_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/02_deprecated.patch?rev=26120&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/02_deprecated.patch [utf-8] Tue Jan 4 00:13:18 2011
@@ -13,8 +13,8 @@
-I$(top_srcdir) \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
-- -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
-+ -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
+- -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
++ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
-DDBUS_API_SUBJECT_TO_CHANGE
gvfs_fuse_daemon_LDADD = \
Modified: desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch?rev=26120&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/90_relibtoolize.patch [utf-8] Tue Jan 4 00:13:18 2011
@@ -12,13 +12,22 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
--[m4_warning([this file was generated for autoconf 2.66.
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -521,7 +521,7 @@
+
+ ifdef gsettings_ENUM_NAMESPACE
+ $(gsettings__enum_file): $(gsettings_ENUM_FILES)
+- $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE). at EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@
++ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE). at EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+ endif
+ '
+ _GSETTINGS_SUBST(GSETTINGS_RULES)
@@ -795,8 +795,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
@@ -84,7 +93,21 @@
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
-@@ -981,6 +973,7 @@
+@@ -962,13 +954,10 @@
+ dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+ m4_require([_LT_CMD_RELOAD])dnl
+ m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+ m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+ m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+-m4_require([_LT_WITH_SYSROOT])dnl
+
+ _LT_CONFIG_LIBTOOL_INIT([
+ # See if we are running on zsh, and set the options which allow our
+@@ -984,6 +973,7 @@
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
@@ -92,7 +115,7 @@
case $host_os in
aix3*)
-@@ -994,6 +987,23 @@
+@@ -997,6 +987,23 @@
;;
esac
@@ -116,7 +139,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -1034,28 +1044,6 @@
+@@ -1037,28 +1044,6 @@
])# _LT_SETUP
@@ -145,7 +168,7 @@
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
-@@ -1208,7 +1196,7 @@
+@@ -1211,7 +1196,7 @@
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
@@ -154,7 +177,7 @@
# _LT_CONFIG_STATUS_DECLARATIONS
-@@ -1218,7 +1206,7 @@
+@@ -1221,7 +1206,7 @@
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
@@ -163,7 +186,7 @@
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -1317,20 +1305,12 @@
+@@ -1320,20 +1305,12 @@
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
@@ -186,7 +209,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -1341,9 +1321,9 @@
+@@ -1344,9 +1321,9 @@
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
@@ -198,7 +221,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -1351,38 +1331,16 @@
+@@ -1354,38 +1331,16 @@
esac
done
@@ -244,7 +267,7 @@
# LT_OUTPUT
# ---------
-@@ -1392,11 +1350,20 @@
+@@ -1395,11 +1350,20 @@
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
@@ -268,7 +291,7 @@
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
-@@ -1422,7 +1389,7 @@
+@@ -1425,7 +1389,7 @@
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
@@ -277,7 +300,7 @@
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -1467,13 +1434,15 @@
+@@ -1470,13 +1434,15 @@
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -300,6 +323,26 @@
])# LT_OUTPUT
+@@ -1539,12 +1505,15 @@
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+- sed '$q' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
++ || (rm -f "$cfgfile"; exit 1)
+
+- _LT_PROG_REPLACE_SHELLFNS
++ _LT_PROG_XSI_SHELLFNS
+
+- mv -f "$cfgfile" "$ofile" ||
++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
++ || (rm -f "$cfgfile"; exit 1)
++
++ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+ ],
@@ -1650,13 +1619,11 @@
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
@@ -377,7 +420,64 @@
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1891,65 +1829,170 @@
+@@ -1861,141 +1799,202 @@
+ fi
+ ])
+
+-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+-# ----------------------------------
++# _LT_SYS_MODULE_PATH_AIX
++# -----------------------
+ # Links a minimal program and checks the executable
+ # for the system default hardcoded library path. In most cases,
+ # this is /usr/lib:/lib, but when the MPI compilers are used
+ # the location of the communication and MPI libs are included too.
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+-# Store the results from the different compilers for each TAGNAME.
+-# Allow to override them for all tags through lt_cv_aix_libpath.
+ m4_defun([_LT_SYS_MODULE_PATH_AIX],
+ [m4_require([_LT_DECL_SED])dnl
+-if test "${lt_cv_aix_libpath+set}" = set; then
+- aix_libpath=$lt_cv_aix_libpath
+-else
+- AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+- [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+- lt_aix_libpath_sed='[
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\([^ ]*\) *$/\1/
+- p
+- }
+- }]'
+- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+- # Check for a 64-bit object if we didn't find anything.
+- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+- fi],[])
+- if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+- fi
+- ])
+- aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+-fi
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_SYS_MODULE_PATH_AIX
+
+
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
@@ -407,7 +507,7 @@
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
--if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
@@ -469,7 +569,16 @@
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
+
+-m4_ifdef([_AS_DETECT_SUGGESTED],
+-[_AS_DETECT_SUGGESTED([
+- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+- PATH=/empty FPATH=/empty; export PATH FPATH
+- test "X`printf %s $ECHO`" = "X$ECHO" \
+- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
@@ -482,7 +591,10 @@
+ fi
+ done
+ fi
-+
+
+-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+-])# _LT_PROG_ECHO_BACKSLASH
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
@@ -506,7 +618,7 @@
+ fi
+ done
+ IFS="$lt_save_ifs"
-+
+
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
@@ -547,7 +659,35 @@
+ else
+ # maybe with a smaller string...
+ prev=:
-+
+
+-# _LT_WITH_SYSROOT
+-# ----------------
+-AC_DEFUN([_LT_WITH_SYSROOT],
+-[AC_MSG_CHECKING([for sysroot])
+-AC_ARG_WITH([sysroot],
+-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
+- (or the compiler's sysroot if not specified).],
+-[], [with_sysroot=no])
+-
+-dnl lt_sysroot will always be passed unquoted. We quote it here
+-dnl in case the user passed a directory name.
+-lt_sysroot=
+-case ${with_sysroot} in #(
+- yes)
+- if test "$GCC" = yes; then
+- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+- fi
+- ;; #(
+- /*)
+- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+- ;; #(
+- no|'')
+- ;; #(
+- *)
+- AC_MSG_RESULT([${with_sysroot}])
+- AC_MSG_ERROR([The sysroot must be an absolute path.])
+- ;;
+-esac
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
@@ -569,33 +709,28 @@
+ fi
+ fi
+fi
-
--m4_ifdef([_AS_DETECT_SUGGESTED],
--[_AS_DETECT_SUGGESTED([
-- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-- PATH=/empty FPATH=/empty; export PATH FPATH
-- test "X`printf %s $ECHO`" = "X$ECHO" \
-- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
++
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
-
++
+AC_SUBST(lt_ECHO)
+])
- _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
--_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+ [An echo program that does not interpret backslashes])
- ])# _LT_PROG_ECHO_BACKSLASH
-
-
-@@ -1981,7 +2024,7 @@
++])# _LT_PROG_ECHO_BACKSLASH
+
+- AC_MSG_RESULT([${lt_sysroot:-no}])
+-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+-[dependent libraries, and in which our libraries should be installed.])])
+
+ # _LT_ENABLE_LOCK
+ # ---------------
+@@ -2025,7 +2024,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -604,7 +739,60 @@
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -2133,19 +2176,10 @@
+@@ -2143,47 +2142,14 @@
+ ])# _LT_ENABLE_LOCK
+
+
+-# _LT_PROG_AR
+-# -----------
+-m4_defun([_LT_PROG_AR],
+-[AC_CHECK_TOOLS(AR, [ar], false)
+-: ${AR=ar}
+-: ${AR_FLAGS=cru}
+-_LT_DECL([], [AR], [1], [The archiver])
+-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+-
+-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+- [lt_cv_ar_at_file=no
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+- [echo conftest.$ac_objext > conftest.lst
+- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+- AC_TRY_EVAL([lt_ar_try])
+- if test "$ac_status" -eq 0; then
+- # Ensure the archiver fails upon bogus file names.
+- rm -f conftest.$ac_objext libconftest.a
+- AC_TRY_EVAL([lt_ar_try])
+- if test "$ac_status" -ne 0; then
+- lt_cv_ar_at_file=@
+- fi
+- fi
+- rm -f conftest.* libconftest.a
+- ])
+- ])
+-
+-if test "x$lt_cv_ar_at_file" = xno; then
+- archiver_list_spec=
+-else
+- archiver_list_spec=$lt_cv_ar_at_file
+-fi
+-_LT_DECL([], [archiver_list_spec], [1],
+- [How to feed a file listing to the archiver])
+-])# _LT_PROG_AR
+-
+-
+ # _LT_CMD_OLD_ARCHIVE
+ # -------------------
+ m4_defun([_LT_CMD_OLD_ARCHIVE],
+-[_LT_PROG_AR
++[AC_CHECK_TOOL(AR, ar, false)
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1])
+
+ AC_CHECK_TOOL(STRIP, strip, :)
+ test -z "$STRIP" && STRIP=:
+@@ -2210,19 +2176,10 @@
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -624,7 +812,7 @@
])# _LT_CMD_OLD_ARCHIVE
-@@ -2170,15 +2204,15 @@
+@@ -2247,15 +2204,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -643,7 +831,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -2218,7 +2252,7 @@
+@@ -2295,7 +2252,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
@@ -652,7 +840,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -2281,11 +2315,6 @@
+@@ -2358,11 +2315,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -664,7 +852,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -2350,8 +2379,8 @@
+@@ -2427,8 +2379,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -675,7 +863,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -2402,7 +2431,7 @@
+@@ -2479,7 +2431,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -684,22 +872,22 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -2443,13 +2472,7 @@
+@@ -2520,13 +2472,7 @@
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
+-int fnord () __attribute__((visibility("default")));
-#endif
-
--void fnord () { int i=42; }
+-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -2458,11 +2481,7 @@
+@@ -2535,11 +2481,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -712,7 +900,7 @@
/* dlclose (self); */
}
else
-@@ -2638,16 +2657,16 @@
+@@ -2715,16 +2657,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -732,7 +920,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2806,7 +2825,6 @@
+@@ -2883,7 +2825,6 @@
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -740,7 +928,7 @@
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-@@ -2815,23 +2833,16 @@
+@@ -2892,23 +2833,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -770,7 +958,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -2844,7 +2855,7 @@
+@@ -2921,7 +2855,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -779,7 +967,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -2864,13 +2875,7 @@
+@@ -2941,13 +2875,7 @@
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
@@ -794,7 +982,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
-@@ -2958,7 +2963,7 @@
+@@ -3035,7 +2963,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -803,7 +991,19 @@
;;
esac
;;
-@@ -3011,12 +3016,23 @@
+@@ -3066,9 +2994,8 @@
+ need_version=no
+ need_lib_prefix=no
+
+- case $GCC,$cc_basename in
+- yes,*)
+- # gcc
++ case $GCC,$host_os in
++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -3089,83 +3016,36 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -814,22 +1014,94 @@
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- ;;
+- pw32*)
+- # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- ;;
+- esac
+- dynamic_linker='Win32 ld.exe'
+- ;;
+-
+- *,cl*)
+- # Native MSVC
+- libname_spec='$name'
+- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- library_names_spec='${libname}.dll.lib'
+-
+- case $build_os in
+- mingw*)
+- sys_lib_search_path_spec=
+- lt_save_ifs=$IFS
+- IFS=';'
+- for lt_path in $LIB
+- do
+- IFS=$lt_save_ifs
+- # Let DOS variable expansion print the short 8.3 style file name.
+- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+- done
+- IFS=$lt_save_ifs
+- # Convert to MSYS style.
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+- ;;
+- cygwin*)
+- # Convert to unix form, then to dos form, then back to unix form
+- # but this time dos style (no spaces!) so that the unix form looks
+- # like /cygdrive/c/PROGRA~1:/cygdr...
+- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- ;;
+- *)
+- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+- # It is most probably a Windows format PATH.
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
+ fi
+- # FIXME: find the short name or the path components, as spaces are
+- # common. (e.g. "Program Files" -> "PROGRA~1")
++ ;;
++ pw32*)
++ # pw32 DLLs use 'pw' prefix rather than 'lib'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -3116,19 +3132,6 @@
+ esac
+-
+- # DLL is installed to $(libdir)/../bin by postinstall_cmds
+- postinstall_cmds='base_file=`basename \${file}`~
+- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+- dldir=$destdir/`dirname \$dlpath`~
+- test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
+- shlibpath_overrides_runpath=yes
+- dynamic_linker='Win32 link.exe'
+ ;;
+
+ *)
+- # Assume MSVC wrapper
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+- dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
++ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+@@ -3252,19 +3132,6 @@
hardcode_into_libs=yes
;;
@@ -849,7 +1121,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -3171,10 +3174,8 @@
+@@ -3307,10 +3174,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -861,7 +1133,7 @@
;;
interix[[3-9]]*)
-@@ -3241,35 +3242,26 @@
+@@ -3377,35 +3242,26 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -908,7 +1180,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3281,6 +3273,18 @@
+@@ -3417,6 +3273,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -927,7 +1199,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3501,8 +3505,6 @@
+@@ -3637,8 +3505,6 @@
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
@@ -936,7 +1208,7 @@
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
-@@ -3615,7 +3617,6 @@
+@@ -3751,7 +3617,6 @@
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
@@ -944,7 +1216,19 @@
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
-@@ -3745,8 +3746,8 @@
+@@ -3873,11 +3738,6 @@
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
+- if test "$GCC" != yes; then
+- reload_cmds=false
+- fi
+- ;;
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+@@ -3886,8 +3746,8 @@
fi
;;
esac
@@ -955,7 +1239,7 @@
])# _LT_CMD_RELOAD
-@@ -3798,18 +3799,16 @@
+@@ -3939,18 +3799,16 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -977,7 +1261,7 @@
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -3839,10 +3838,6 @@
+@@ -3980,10 +3838,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -988,7 +1272,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -3851,11 +3846,11 @@
+@@ -3992,11 +3846,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -1002,7 +1286,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -3881,7 +3876,7 @@
+@@ -4022,7 +3876,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1011,7 +1295,42 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -4019,19 +4014,7 @@
+@@ -4096,21 +3950,6 @@
+ ;;
+ esac
+ ])
+-
+-file_magic_glob=
+-want_nocaseglob=no
+-if test "$build" = "$host"; then
+- case $host_os in
+- mingw* | pw32*)
+- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+- want_nocaseglob=yes
+- else
+- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+- fi
+- ;;
+- esac
+-fi
+-
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -4118,11 +3957,7 @@
+ _LT_DECL([], [deplibs_check_method], [1],
+ [Method to check whether dependent libraries are shared objects])
+ _LT_DECL([], [file_magic_cmd], [1],
+- [Command to use when deplibs_check_method = "file_magic"])
+-_LT_DECL([], [file_magic_glob], [1],
+- [How to find potential files when deplibs_check_method = "file_magic"])
+-_LT_DECL([], [want_nocaseglob], [1],
+- [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
++ [Command to use when deplibs_check_method == "file_magic"])
+ ])# _LT_CHECK_MAGIC_METHOD
+
+
+@@ -4179,19 +4014,7 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -1032,7 +1351,7 @@
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -4044,13 +4027,13 @@
+@@ -4204,13 +4027,13 @@
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
@@ -1049,7 +1368,75 @@
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -4073,7 +4056,7 @@
+@@ -4225,67 +4048,6 @@
+ dnl AC_DEFUN([AM_PROG_NM], [])
+ dnl AC_DEFUN([AC_PROG_NM], [])
+
+-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+-# --------------------------------
+-# how to determine the name of the shared library
+-# associated with a specific link library.
+-# -- PORTME fill in with the dynamic library characteristics
+-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+-[m4_require([_LT_DECL_EGREP])
+-m4_require([_LT_DECL_OBJDUMP])
+-m4_require([_LT_DECL_DLLTOOL])
+-AC_CACHE_CHECK([how to associate runtime and link libraries],
+-lt_cv_sharedlib_from_linklib_cmd,
+-[lt_cv_sharedlib_from_linklib_cmd='unknown'
+-
+-case $host_os in
+-cygwin* | mingw* | pw32* | cegcc*)
+- # two different shell functions defined in ltmain.sh
+- # decide which to use based on capabilities of $DLLTOOL
+- case `$DLLTOOL --help 2>&1` in
+- *--identify-strict*)
+- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+- ;;
+- *)
+- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+- ;;
+- esac
+- ;;
+-*)
+- # fallback: assume linklib IS sharedlib
+- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+- ;;
+-esac
+-])
+-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+-
+-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+- [Command to associate shared and link libraries])
+-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+-
+-
+-# _LT_PATH_MANIFEST_TOOL
+-# ----------------------
+-# locate the manifest tool
+-m4_defun([_LT_PATH_MANIFEST_TOOL],
+-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+- [lt_cv_path_mainfest_tool=no
+- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+- cat conftest.err >&AS_MESSAGE_LOG_FD
+- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+- lt_cv_path_mainfest_tool=yes
+- fi
+- rm -f conftest*])
+-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+- MANIFEST_TOOL=:
+-fi
+-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+-])# _LT_PATH_MANIFEST_TOOL
+-
+
+ # LT_LIB_M
+ # --------
+@@ -4294,7 +4056,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -1058,7 +1445,7 @@
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
-@@ -4101,12 +4084,7 @@
+@@ -4322,12 +4084,7 @@
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
@@ -1072,7 +1459,7 @@
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
-@@ -4123,7 +4101,6 @@
+@@ -4344,7 +4101,6 @@
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
@@ -1080,7 +1467,26 @@
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -4249,7 +4226,7 @@
+@@ -4412,8 +4168,8 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+ # Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+@@ -4449,7 +4205,6 @@
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
+- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -4471,7 +4226,7 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -1089,7 +1495,86 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -4411,11 +4388,6 @@
+@@ -4483,18 +4238,6 @@
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
+-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+- relocations are performed -- see ld's documentation on pseudo-relocs. */
+-# define LT@&t at _DLSYM_CONST
+-#elif defined(__osf__)
+-/* This system does not cope well with relocations in const data. */
+-# define LT@&t at _DLSYM_CONST
+-#else
+-# define LT@&t at _DLSYM_CONST const
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -4506,7 +4249,7 @@
+ cat <<_LT_EOF >> conftest.$ac_ext
+
+ /* The mapping between symbol names and symbols. */
+-LT@&t at _DLSYM_CONST struct {
++const struct {
+ const char *name;
+ void *address;
+ }
+@@ -4532,15 +4275,15 @@
+ _LT_EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+- lt_globsym_save_LIBS=$LIBS
+- lt_globsym_save_CFLAGS=$CFLAGS
++ lt_save_LIBS="$LIBS"
++ lt_save_CFLAGS="$CFLAGS"
+ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+- LIBS=$lt_globsym_save_LIBS
+- CFLAGS=$lt_globsym_save_CFLAGS
++ LIBS="$lt_save_LIBS"
++ CFLAGS="$lt_save_CFLAGS"
+ else
+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
+@@ -4573,13 +4316,6 @@
+ AC_MSG_RESULT(ok)
+ fi
+
+-# Response file support.
+-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- nm_file_list_spec='@'
+-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+- nm_file_list_spec='@'
+-fi
+-
+ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+ [Take the output of nm and produce a listing of raw symbols and C names])
+ _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+@@ -4590,8 +4326,6 @@
+ _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+ [Transform the output of nm in a C name address pair when lib prefix is needed])
+-_LT_DECL([], [nm_file_list_spec], [1],
+- [Specify filename containing input files for $NM])
+ ]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+@@ -4603,6 +4337,7 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+
++AC_MSG_CHECKING([for $compiler option to produce PIC])
+ m4_if([$1], [CXX], [
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+@@ -4653,11 +4388,6 @@
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -1101,7 +1586,20 @@
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -4554,8 +4526,8 @@
+@@ -4707,12 +4437,6 @@
+ ;;
+ esac
+ ;;
+- mingw* | cygwin* | os2* | pw32* | cegcc*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- m4_if([$1], [GCJ], [],
+- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+- ;;
+ dgux*)
+ case $cc_basename in
+ ec++*)
+@@ -4802,8 +4526,8 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1112,7 +1610,7 @@
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -4585,7 +4557,7 @@
+@@ -4833,7 +4557,7 @@
;;
esac
;;
@@ -1121,7 +1619,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4617,7 +4589,7 @@
+@@ -4865,7 +4589,7 @@
;;
solaris*)
case $cc_basename in
@@ -1130,7 +1628,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4721,12 +4693,6 @@
+@@ -4969,12 +4693,6 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -1143,7 +1641,7 @@
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -4769,13 +4735,6 @@
+@@ -5017,13 +4735,6 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
@@ -1157,16 +1655,22 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -4839,7 +4798,7 @@
+@@ -5087,13 +4798,7 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
+- nagfor*)
+- # NAG Fortran compiler
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4851,26 +4810,26 @@
+@@ -5105,26 +4810,26 @@
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1201,7 +1705,7 @@
esac
;;
esac
-@@ -4901,7 +4860,7 @@
+@@ -5155,7 +4860,7 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
@@ -1210,7 +1714,44 @@
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -5011,10 +4970,8 @@
+@@ -5212,11 +4917,9 @@
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+ ;;
+ esac
+-
+-AC_CACHE_CHECK([for $compiler option to produce PIC],
+- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+- [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
++ [How to pass a linker flag through the compiler])
+
+ #
+ # Check to make sure the PIC flag actually works.
+@@ -5235,8 +4938,6 @@
+ _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+ [Additional compiler flags for building library objects])
+
+-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+- [How to pass a linker flag through the compiler])
+ #
+ # Check to make sure the static flag actually works.
+ #
+@@ -5257,7 +4958,6 @@
+ m4_defun([_LT_LINKER_SHLIBS],
+ [AC_REQUIRE([LT_PATH_LD])dnl
+ AC_REQUIRE([LT_PATH_NM])dnl
+-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+ m4_require([_LT_DECL_EGREP])dnl
+ m4_require([_LT_DECL_SED])dnl
+@@ -5266,35 +4966,30 @@
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ m4_if([$1], [CXX], [
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -1222,31 +1763,49 @@
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -5025,6 +4982,9 @@
+ ;;
+ pw32*)
+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+- ;;
++ ;;
cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+- case $cc_basename in
+- cl*) ;;
+- *)
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+- ;;
+- esac
+- ;;
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
+ linux* | k*bsd*-gnu)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -5089,36 +5049,13 @@
- openbsd*)
- with_gnu_ld=no
+- ;;
++ ;;
+ esac
++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ], [
+ runpath_var=
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+@@ -5351,39 +5046,16 @@
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
+- openbsd*)
+- with_gnu_ld=no
+- ;;
+- esac
+-
+- _LT_TAGVAR(ld_shlibs, $1)=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+- if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
- # The AIX port of GNU ld has always aspired to compatibility
@@ -1267,12 +1826,21 @@
- ;;
- esac
- fi
--
++ openbsd*)
++ with_gnu_ld=no
++ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
++ esac
+
- if test "$lt_use_gnu_ld_interface" = yes; then
++ _LT_TAGVAR(ld_shlibs, $1)=yes
++ if test "$with_gnu_ld" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -5152,12 +5089,11 @@
+@@ -5417,12 +5089,11 @@
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -1288,7 +1856,7 @@
_LT_EOF
fi
-@@ -5193,7 +5129,6 @@
+@@ -5458,12 +5129,10 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1296,7 +1864,13 @@
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -5215,11 +5150,6 @@
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+- _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -5481,11 +5150,6 @@
fi
;;
@@ -1308,7 +1882,12 @@
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5249,12 +5179,11 @@
+@@ -5511,16 +5175,15 @@
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+- tmp_addflag=' $pic_flag'
++ tmp_addflag=
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -1324,7 +1903,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -5265,17 +5194,13 @@
+@@ -5531,17 +5194,13 @@
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
@@ -1344,7 +1923,7 @@
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -5291,17 +5216,17 @@
+@@ -5557,17 +5216,17 @@
fi
case $cc_basename in
@@ -1365,7 +1944,7 @@
fi
;;
esac
-@@ -5310,7 +5235,7 @@
+@@ -5576,13 +5235,13 @@
fi
;;
@@ -1374,7 +1953,37 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5422,10 +5347,8 @@
+ else
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+@@ -5600,8 +5259,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5647,8 +5306,8 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5688,10 +5347,8 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -1386,7 +1995,7 @@
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -5487,6 +5410,7 @@
+@@ -5753,6 +5410,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -1394,16 +2003,26 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5514,7 +5438,7 @@
+@@ -5778,9 +5436,9 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+- _LT_SYS_MODULE_PATH_AIX([$1])
++ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5529,13 +5453,8 @@
+@@ -5789,19 +5447,14 @@
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- _LT_SYS_MODULE_PATH_AIX([$1])
++ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1419,25 +2038,114 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -5574,7 +5493,7 @@
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
-- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+@@ -5833,63 +5486,20 @@
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+- case $cc_basename in
+- cl*)
+- # Native MSVC
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_TAGVAR(always_export_symbols, $1)=yes
+- _LT_TAGVAR(file_list_spec, $1)='@'
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+- else
+- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+- fi~
+- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+- linknames='
+- # The linker will not automatically build a static lib if we build a DLL.
+- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+- # Don't use ranlib
+- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+- lt_tool_outputfile="@TOOL_OUTPUT@"~
+- case $lt_outputfile in
+- *.exe|*.EXE) ;;
+- *)
+- lt_outputfile="$lt_outputfile.exe"
+- lt_tool_outputfile="$lt_tool_outputfile.exe"
+- ;;
+- esac~
+- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+- $RM "$lt_outputfile.manifest";
+- fi'
+- ;;
+- *)
+- # Assume MSVC wrapper
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+- # The linker will automatically build a .lib file if we build a DLL.
+- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+- # FIXME: Should let the user specify the lib program.
+- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- ;;
+- esac
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
-@@ -5641,7 +5560,7 @@
++ # The linker will automatically build a .lib file if we build a DLL.
++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
++ # FIXME: Should let the user specify the lib program.
++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+@@ -5927,7 +5537,7 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5935,7 +5545,7 @@
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+@@ -5950,8 +5560,8 @@
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -5660,7 +5579,7 @@
+ fi
+@@ -5969,16 +5579,16 @@
;;
hpux11*)
@@ -1446,7 +2154,18 @@
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -5681,14 +5600,7 @@
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+@@ -5990,14 +5600,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -1462,22 +2181,42 @@
;;
esac
fi
-@@ -5716,19 +5628,19 @@
+@@ -6025,34 +5628,19 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
-- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+- # This should be the same for all languages, so no per-tag cache variable.
+- AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+- [lt_cv_irix_exported_symbol],
+- [save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+- AC_LINK_IFELSE(
+- [AC_LANG_SOURCE(
+- [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+- [C++], [[int foo (void) { return 0; }]],
+- [Fortran 77], [[
+- subroutine foo
+- end]],
+- [Fortran], [[
+- subroutine foo
+- end]])])],
+- [lt_cv_irix_exported_symbol=yes],
+- [lt_cv_irix_exported_symbol=no])
+- LDFLAGS="$save_LDFLAGS"])
+- if test "$lt_cv_irix_exported_symbol" = yes; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+- fi
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++ AC_LINK_IFELSE(int foo(void) {},
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- )
- LDFLAGS="$save_LDFLAGS"
++ )
++ LDFLAGS="$save_LDFLAGS"
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
@@ -1486,7 +2225,7 @@
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -5737,7 +5649,7 @@
+@@ -6061,7 +5649,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1495,7 +2234,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5790,17 +5702,17 @@
+@@ -6114,17 +5702,17 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1516,11 +2255,11 @@
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -5810,13 +5722,13 @@
+@@ -6134,13 +5722,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
@@ -1533,7 +2272,19 @@
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -6007,38 +5919,36 @@
+@@ -6153,9 +5741,9 @@
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+@@ -6331,38 +5919,36 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -1602,7 +2353,25 @@
;;
esac
fi
-@@ -6204,14 +6114,14 @@
+@@ -6427,6 +6013,8 @@
+ to runtime path list])
+ _LT_TAGDECL([], [link_all_deplibs], [0],
+ [Whether libtool must link a program against all its dependency libraries])
++_LT_TAGDECL([], [fix_srcfile_path], [1],
++ [Fix the shell variable $srcfile for the compiler])
+ _LT_TAGDECL([], [always_export_symbols], [0],
+ [Set to "yes" if exported symbols are required])
+ _LT_TAGDECL([], [export_symbols_cmds], [2],
+@@ -6437,8 +6025,6 @@
+ [Symbols that must always be exported])
+ _LT_TAGDECL([], [prelink_cmds], [2],
+ [Commands necessary for linking programs (against libraries) with templates])
+-_LT_TAGDECL([], [postlink_cmds], [2],
+- [Commands necessary for finishing linking programs])
+ _LT_TAGDECL([], [file_list_spec], [1],
+ [Specify filename containing input files])
+ dnl FIXME: Not yet implemented
+@@ -6528,15 +6114,14 @@
])# _LT_LANG_C_CONFIG
@@ -1614,6 +2383,7 @@
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
+-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
@@ -1625,7 +2395,7 @@
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
-@@ -6219,6 +6129,22 @@
+@@ -6544,6 +6129,22 @@
else
_lt_caught_CXX_error=yes
fi
@@ -1648,7 +2418,7 @@
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -6240,8 +6166,6 @@
+@@ -6565,8 +6166,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -1657,7 +2427,34 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6344,7 +6268,7 @@
+@@ -6598,7 +6197,6 @@
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+- lt_save_CFLAGS=$CFLAGS
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+@@ -6616,7 +6214,6 @@
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+- CFLAGS=$CXXFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+@@ -6638,8 +6235,8 @@
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -6671,7 +6268,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1666,8 +2463,12 @@
else
GXX=no
-@@ -6456,7 +6380,7 @@
- _LT_SYS_MODULE_PATH_AIX
+@@ -6780,10 +6377,10 @@
+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+- _LT_SYS_MODULE_PATH_AIX([$1])
++ _LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
@@ -1675,7 +2476,14 @@
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -6471,13 +6395,8 @@
+@@ -6792,19 +6389,14 @@
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- _LT_SYS_MODULE_PATH_AIX([$1])
++ _LT_SYS_MODULE_PATH_AIX
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1691,15 +2499,105 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -6510,7 +6429,6 @@
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-@@ -6571,11 +6489,6 @@
+@@ -6834,75 +6426,28 @@
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+- case $GXX,$cc_basename in
+- ,cl* | no,cl*)
+- # Native MSVC
+- # hardcode_libdir_flag_spec is actually meaningless, as there is
+- # no search path for DLLs.
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_TAGVAR(always_export_symbols, $1)=yes
+- _LT_TAGVAR(file_list_spec, $1)='@'
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+- else
+- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+- fi~
+- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+- linknames='
+- # The linker will not automatically build a static lib if we build a DLL.
+- # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- # Don't use ranlib
+- _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+- _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+- lt_tool_outputfile="@TOOL_OUTPUT@"~
+- case $lt_outputfile in
+- *.exe|*.EXE) ;;
+- *)
+- lt_outputfile="$lt_outputfile.exe"
+- lt_tool_outputfile="$lt_tool_outputfile.exe"
+- ;;
+- esac~
+- func_to_tool_file "$lt_outputfile"~
+- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+- $RM "$lt_outputfile.manifest";
+- fi'
+- ;;
+- *)
+- # g++
+- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+- # as there is no search path for DLLs.
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_TAGVAR(always_export_symbols, $1)=no
+- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-
+- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- # If the export-symbols file already is a .def file (1st line
+- # is EXPORTS), use it as is; otherwise, prepend...
+- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- cp $export_symbols $output_objdir/$soname.def;
+- else
+- echo EXPORTS > $output_objdir/$soname.def;
+- cat $export_symbols >> $output_objdir/$soname.def;
+- fi~
+- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+- else
+- _LT_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+- esac
+- ;;
++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++ # as there is no search path for DLLs.
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++ _LT_TAGVAR(always_export_symbols, $1)=no
++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ # If the export-symbols file already is a .def file (1st line
++ # is EXPORTS), use it as is; otherwise, prepend...
++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++ cp $export_symbols $output_objdir/$soname.def;
++ else
++ echo EXPORTS > $output_objdir/$soname.def;
++ cat $export_symbols >> $output_objdir/$soname.def;
++ fi~
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ else
++ _LT_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
+ darwin* | rhapsody*)
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
+@@ -6944,11 +6489,6 @@
gnu*)
;;
@@ -1711,7 +2609,7 @@
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -6600,7 +6513,7 @@
+@@ -6973,11 +6513,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1720,7 +2618,12 @@
;;
*)
if test "$GXX" = yes; then
-@@ -6665,7 +6578,7 @@
+- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -7038,7 +6578,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1729,7 +2632,20 @@
;;
*)
if test "$GXX" = yes; then
-@@ -6708,7 +6621,7 @@
+@@ -7048,10 +6588,10 @@
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -7081,7 +6621,7 @@
case $cc_basename in
CC*)
# SGI C++
@@ -1738,19 +2654,19 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -6719,9 +6632,9 @@
+@@ -7092,9 +6632,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -6750,7 +6663,7 @@
+@@ -7123,7 +6663,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1759,7 +2675,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6787,26 +6700,26 @@
+@@ -7160,26 +6700,26 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -1792,7 +2708,7 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -6814,7 +6727,7 @@
+@@ -7187,7 +6727,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -1801,7 +2717,7 @@
;;
cxx*)
# Compaq C++
-@@ -6833,9 +6746,9 @@
+@@ -7206,9 +6746,9 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1813,7 +2729,7 @@
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -6855,13 +6768,13 @@
+@@ -7228,13 +6768,13 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
@@ -1829,7 +2745,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6930,7 +6843,7 @@
+@@ -7303,7 +6843,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -1838,7 +2754,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6965,15 +6878,15 @@
+@@ -7338,15 +6878,15 @@
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1857,7 +2773,7 @@
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
-@@ -6989,17 +6902,17 @@
+@@ -7362,17 +6902,17 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -1873,12 +2789,12 @@
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
-@@ -7009,7 +6922,7 @@
+@@ -7382,7 +6922,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1887,7 +2803,7 @@
else
# FIXME: insert proper C++ library support
-@@ -7045,7 +6958,7 @@
+@@ -7418,7 +6958,7 @@
solaris*)
case $cc_basename in
@@ -1896,7 +2812,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -7066,7 +6979,7 @@
+@@ -7439,7 +6979,7 @@
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -1905,7 +2821,16 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -7093,7 +7006,7 @@
+@@ -7459,14 +6999,14 @@
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1914,7 +2839,7 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -7104,7 +7017,7 @@
+@@ -7477,7 +7017,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -1923,7 +2848,7 @@
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -7158,10 +7071,6 @@
+@@ -7531,10 +7071,6 @@
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1934,7 +2859,122 @@
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -7408,7 +7317,7 @@
+@@ -7590,7 +7126,6 @@
+ fi # test -n "$compiler"
+
+ CC=$lt_save_CC
+- CFLAGS=$lt_save_CFLAGS
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+@@ -7605,29 +7140,6 @@
+ ])# _LT_LANG_CXX_CONFIG
+
+
+-# _LT_FUNC_STRIPNAME_CNF
+-# ----------------------
+-# func_stripname_cnf prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-#
+-# This function is identical to the (non-XSI) version of func_stripname,
+-# except this one can be used by m4 code that may be executed by configure,
+-# rather than the libtool script.
+-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+-AC_REQUIRE([_LT_DECL_SED])
+-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+-func_stripname_cnf ()
+-{
+- case ${2} in
+- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+- esac
+-} # func_stripname_cnf
+-])# _LT_FUNC_STRIPNAME_CNF
+-
+ # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+ # ---------------------------------
+ # Figure out "hidden" library dependencies from verbose
+@@ -7636,7 +7148,6 @@
+ # objects, libraries and library flags.
+ m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+ [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+ # Dependencies to place before and after the object being linked:
+ _LT_TAGVAR(predep_objects, $1)=
+ _LT_TAGVAR(postdep_objects, $1)=
+@@ -7687,13 +7198,6 @@
+ };
+ _LT_EOF
+ ])
+-
+-_lt_libdeps_save_CFLAGS=$CFLAGS
+-case "$CC $CFLAGS " in #(
+-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+-esac
+-
+ dnl Parse the compiler output and extract the necessary
+ dnl objects, libraries and library flags.
+ if AC_TRY_EVAL(ac_compile); then
+@@ -7705,7 +7209,7 @@
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+- case ${prev}${p} in
++ case $p in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+@@ -7714,22 +7218,13 @@
+ test $p = "-R"; then
+ prev=$p
+ continue
++ else
++ prev=
+ fi
+
+- # Expand the sysroot to ease extracting the directories later.
+- if test -z "$prev"; then
+- case $p in
+- -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+- -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+- -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+- esac
+- fi
+- case $p in
+- =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+- esac
+ if test "$pre_test_object_deps_done" = no; then
+- case ${prev} in
+- -L | -R)
++ case $p in
++ -L* | -R*)
+ # Internal compiler library paths should come after those
+ # provided the user. The postdeps already come after the
+ # user supplied libs so there is no need to process them.
+@@ -7749,10 +7244,8 @@
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ fi
+ fi
+- prev=
+ ;;
+
+- *.lto.$objext) ;; # Ignore GCC LTO objects
+ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+@@ -7788,7 +7281,6 @@
+ fi
+
+ $RM -f confest.$objext
+-CFLAGS=$_lt_libdeps_save_CFLAGS
+
+ # PORTME: override above test on systems where it is broken
+ m4_if([$1], [CXX],
+@@ -7825,7 +7317,7 @@
solaris*)
case $cc_basename in
@@ -1943,7 +2983,7 @@
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -7452,16 +7361,32 @@
+@@ -7869,16 +7361,32 @@
])# _LT_SYS_HIDDEN_LIBDEPS
@@ -1980,7 +3020,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -7480,8 +7405,6 @@
+@@ -7897,8 +7405,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -1989,7 +3029,24 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -7581,17 +7504,32 @@
+@@ -7938,9 +7444,7 @@
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+- lt_save_CFLAGS=$CFLAGS
+ CC=${F77-"f77"}
+- CFLAGS=$FFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+@@ -7994,24 +7498,38 @@
+
+ GCC=$lt_save_GCC
+ CC="$lt_save_CC"
+- CFLAGS="$lt_save_CFLAGS"
+ fi # test "$_lt_disable_F77" != yes
+
+ AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -2027,7 +3084,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -7610,8 +7548,6 @@
+@@ -8030,8 +7548,6 @@
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -2036,7 +3093,41 @@
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -7757,8 +7693,6 @@
+@@ -8071,9 +7587,7 @@
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+- lt_save_CFLAGS=$CFLAGS
+ CC=${FC-"f95"}
+- CFLAGS=$FCFLAGS
+ compiler=$CC
+ GCC=$ac_cv_fc_compiler_gnu
+
+@@ -8129,8 +7643,7 @@
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+- CC=$lt_save_CC
+- CFLAGS=$lt_save_CFLAGS
++ CC="$lt_save_CC"
+ fi # test "$_lt_disable_FC" != yes
+
+ AC_LANG_POP
+@@ -8167,12 +7680,10 @@
+ _LT_LINKER_BOILERPLATE
+
+ # Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_CFLAGS=$CFLAGS
++lt_save_CC="$CC"
+ lt_save_GCC=$GCC
+ GCC=yes
+ CC=${GCJ-"gcj"}
+-CFLAGS=$GCJFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_TAGVAR(LD, $1)="$LD"
+@@ -8182,8 +7693,6 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -2045,63 +3136,417 @@
if test -n "$compiler"; then
_LT_COMPILER_NO_RTTI($1)
-@@ -8120,7 +8054,7 @@
- func_dirname ()
- {
- # Extract subdirectory from the argument.
-- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+@@ -8199,8 +7708,7 @@
+ AC_LANG_RESTORE
+
+ GCC=$lt_save_GCC
+-CC=$lt_save_CC
+-CFLAGS=$lt_save_CFLAGS
++CC="$lt_save_CC"
+ ])# _LT_LANG_GCJ_CONFIG
+
+
+@@ -8235,11 +7743,9 @@
+
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+-lt_save_CFLAGS=$CFLAGS
+ lt_save_GCC=$GCC
+ GCC=
+ CC=${RC-"windres"}
+-CFLAGS=
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME([$compiler])
+@@ -8252,8 +7758,7 @@
+
+ GCC=$lt_save_GCC
+ AC_LANG_RESTORE
+-CC=$lt_save_CC
+-CFLAGS=$lt_save_CFLAGS
++CC="$lt_save_CC"
+ ])# _LT_LANG_RC_CONFIG
+
+
+@@ -8312,15 +7817,6 @@
+ AC_SUBST([OBJDUMP])
+ ])
+
+-# _LT_DECL_DLLTOOL
+-# ----------------
+-# Ensure DLLTOOL variable is set.
+-m4_defun([_LT_DECL_DLLTOOL],
+-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+-AC_SUBST([DLLTOOL])
+-])
+
+ # _LT_DECL_SED
+ # ------------
+@@ -8412,8 +7908,8 @@
+ # Try some XSI features
+ xsi_shell=no
+ ( _lt_dummy="a/b/c"
+- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+- = c,a/b,b/c, \
++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
++ = c,a/b,, \
+ && eval 'test $(( 1 + 1 )) -eq 2 \
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+ && xsi_shell=yes
+@@ -8452,177 +7948,222 @@
+ ])# _LT_CHECK_SHELL_FEATURES
+
+
+-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+-# ------------------------------------------------------
+-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+-m4_defun([_LT_PROG_FUNCTION_REPLACE],
+-[dnl {
+-sed -e '/^$1 ()$/,/^} # $1 /c\
+-$1 ()\
+-{\
+-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
+-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-])
++# _LT_PROG_XSI_SHELLFNS
++# ---------------------
++# Bourne and XSI compatible variants of some useful shell functions.
++m4_defun([_LT_PROG_XSI_SHELLFNS],
++[case $xsi_shell in
++ yes)
++ cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac
++}
+
++# func_basename file
++func_basename ()
++{
++ func_basename_result="${1##*/}"
++}
+
+-# _LT_PROG_REPLACE_SHELLFNS
+-# -------------------------
+-# Replace existing portable implementations of several shell functions with
+-# equivalent extended shell implementations where those features are available..
+-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+-[if test x"$xsi_shell" = xyes; then
+- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac])
++# func_dirname_and_basename file append nondir_replacement
++# perform func_basename and func_dirname in a single function
++# call:
++# dirname: Compute the dirname of FILE. If nonempty,
++# add APPEND to the result, otherwise set result
++# to NONDIR_REPLACEMENT.
++# value returned in "$func_dirname_result"
++# basename: Compute filename of FILE.
++# value retuned in "$func_basename_result"
++# Implementation must be kept synchronized with func_dirname
++# and func_basename. For efficiency, we do not delegate to
++# those functions but instead duplicate the functionality here.
++func_dirname_and_basename ()
++{
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac
++ func_basename_result="${1##*/}"
++}
+
+- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+- func_basename_result="${1##*/}"])
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++func_stripname ()
++{
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++ # positional parameters, so assign one to ordinary parameter first.
++ func_stripname_result=${3}
++ func_stripname_result=${func_stripname_result#"${1}"}
++ func_stripname_result=${func_stripname_result%"${2}"}
++}
+
+- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+- case ${1} in
+- */*) func_dirname_result="${1%/*}${2}" ;;
+- * ) func_dirname_result="${3}" ;;
+- esac
+- func_basename_result="${1##*/}"])
++# func_opt_split
++func_opt_split ()
++{
++ func_opt_split_opt=${1%%=*}
++ func_opt_split_arg=${1#*=}
++}
+
+- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+- # positional parameters, so assign one to ordinary parameter first.
+- func_stripname_result=${3}
+- func_stripname_result=${func_stripname_result#"${1}"}
+- func_stripname_result=${func_stripname_result%"${2}"}])
+-
+- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+- func_split_long_opt_name=${1%%=*}
+- func_split_long_opt_arg=${1#*=}])
+-
+- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+- func_split_short_opt_arg=${1#??}
+- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+-
+- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+- case ${1} in
+- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+- *) func_lo2o_result=${1} ;;
+- esac])
++# func_lo2o object
++func_lo2o ()
++{
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac
++}
+
+- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
++# func_xform libobj-or-source
++func_xform ()
++{
++ func_xform_result=${1%.*}.lo
++}
+
+- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=$(( $[*] ))
++}
+
+- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
+-fi
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=${#1}
++}
+
+-if test x"$lt_shell_append" = xyes; then
+- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
++_LT_EOF
++ ;;
++ *) # Bourne compatible functions.
++ cat << \_LT_EOF >> "$cfgfile"
+
+- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+- func_quote_for_eval "${2}"
+-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
-@@ -8131,7 +8065,7 @@
- # func_basename file
- func_basename ()
- {
-- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++}
+
+- # Save a `func_append' function call where possible by direct use of '+='
+- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+- test 0 -eq $? || _lt_function_replace_fail=:
+-else
+- # Save a `func_append' function call even when '+=' is not available
+- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+- test 0 -eq $? || _lt_function_replace_fail=:
+-fi
++# func_basename file
++func_basename ()
++{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
- }
-
- dnl func_dirname_and_basename
-@@ -8147,8 +8081,10 @@
- func_stripname ()
- {
- case ${2} in
-- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++}
+
+-if test x"$_lt_function_replace_fail" = x":"; then
+- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+-fi
+-])
++dnl func_dirname_and_basename
++dnl A portable version of this function is already defined in general.m4sh
++dnl so there is no need for it here.
+
+-# _LT_PATH_CONVERSION_FUNCTIONS
+-# -----------------------------
+-# Determine which file name conversion functions should be used by
+-# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
+-# for certain cross-compile configurations and native mingw.
+-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_MSG_CHECKING([how to convert $build file names to $host format])
+-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+-[case $host in
+- *-*-mingw* )
+- case $build in
+- *-*-mingw* ) # actually msys
+- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+- ;;
+- *-*-cygwin* )
+- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+- ;;
+- * ) # otherwise, assume *nix
+- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+- ;;
+- esac
+- ;;
+- *-*-cygwin* )
+- case $build in
+- *-*-mingw* ) # actually msys
+- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+- ;;
+- *-*-cygwin* )
+- lt_cv_to_host_file_cmd=func_convert_file_noop
+- ;;
+- * ) # otherwise, assume *nix
+- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+- ;;
+- esac
+- ;;
+- * ) # unhandled hosts (and "normal" native builds)
+- lt_cv_to_host_file_cmd=func_convert_file_noop
+- ;;
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
- }
-
-@@ -8159,20 +8095,20 @@
- # func_opt_split
- func_opt_split ()
- {
-- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
++ esac
++}
++
++# sed scripts:
++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[[^=]]*=//'
++
++# func_opt_split
++func_opt_split ()
++{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
- }
-
- # func_lo2o object
- func_lo2o ()
- {
-- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++}
++
++# func_lo2o object
++func_lo2o ()
++{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
- }
-
- # func_xform libobj-or-source
- func_xform ()
- {
-- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
- }
-
- # func_arith arithmetic-term...
-@@ -8220,15 +8156,14 @@
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=`expr "$[@]"`
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
++}
++
++_LT_EOF
+ esac
+-])
+-to_host_file_cmd=$lt_cv_to_host_file_cmd
+-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+- [0], [convert $build file names to $host format])dnl
+-
+-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+-[#assume ordinary cross tools, or native build.
+-lt_cv_to_tool_file_cmd=func_convert_file_noop
+-case $host in
+- *-*-mingw* )
+- case $build in
+- *-*-mingw* ) # actually msys
+- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+- ;;
+- esac
++
++case $lt_shell_append in
++ yes)
++ cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "$[1]+=\$[2]"
++}
++_LT_EOF
+ ;;
+-esac
++ *)
++ cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "$[1]=\$$[1]\$[2]"
++}
++
++_LT_EOF
++ ;;
++ esac
+ ])
+-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+- [0], [convert $build files to toolchain format])dnl
+-])# _LT_PATH_CONVERSION_FUNCTIONS
# Helper functions for option handling. -*- Autoconf -*-
#
@@ -2119,7 +3564,7 @@
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-@@ -8343,7 +8278,7 @@
+@@ -8737,7 +8278,7 @@
[enable_win32_dll=yes
case $host in
@@ -2128,7 +3573,7 @@
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -8351,13 +8286,13 @@
+@@ -8745,13 +8286,13 @@
esac
test -z "$AS" && AS=as
@@ -2145,22 +3590,25 @@
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-@@ -8717,29 +8652,29 @@
-
- # Generated from ltversion.in.
-
--# serial 3175 ltversion.m4
+@@ -9109,31 +8650,31 @@
+ # unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+
+-# @configure_input@
++# Generated from ltversion.in.
+
+-# serial 3293 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
--m4_define([LT_PACKAGE_VERSION], [2.2.10])
--m4_define([LT_PACKAGE_REVISION], [1.3175])
+-m4_define([LT_PACKAGE_VERSION], [2.4])
+-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.10'
--macro_revision='1.3175'
+-[macro_version='2.4'
+-macro_revision='1.3293'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
@@ -2182,7 +3630,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-@@ -8809,6 +8744,7 @@
+@@ -9203,6 +8744,7 @@
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
@@ -2190,7 +3638,7 @@
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-@@ -8821,13 +8757,6 @@
+@@ -9215,13 +8757,6 @@
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
@@ -2204,7 +3652,7 @@
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-@@ -8999,7 +8928,7 @@
+@@ -9393,7 +8928,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -2213,7 +3661,7 @@
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
-@@ -9010,7 +8939,7 @@
+@@ -9404,7 +8939,7 @@
_PKG_TEXT
@@ -2222,7 +3670,7 @@
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -9600,6 +9529,46 @@
+@@ -9994,6 +9529,46 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -2280,15 +3728,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -244,6 +244,7 @@
+@@ -184,7 +184,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -245,8 +244,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -324,6 +325,7 @@
+ MSGFMT = @MSGFMT@
+@@ -292,7 +291,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -327,6 +325,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -2296,7 +3762,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -345,7 +347,7 @@
+@@ -348,7 +347,7 @@
-I$(top_srcdir)/metadata \
-I$(top_srcdir)/common \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@@ -2305,16 +3771,16 @@
-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE
-@@ -397,7 +399,7 @@
+@@ -400,7 +399,7 @@
@USE_FUSE_TRUE@ -I$(top_srcdir) \
@USE_FUSE_TRUE@ -I$(top_srcdir)/common \
@USE_FUSE_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
-- at USE_FUSE_TRUE@ -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
-+ at USE_FUSE_TRUE@ -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
+- at USE_FUSE_TRUE@ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
++ at USE_FUSE_TRUE@ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
@USE_FUSE_TRUE@ -DDBUS_API_SUBJECT_TO_CHANGE
@USE_FUSE_TRUE at gvfs_fuse_daemon_LDADD = \
-@@ -408,7 +410,7 @@
+@@ -411,7 +410,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -2323,7 +3789,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -433,9 +435,9 @@
+@@ -436,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2371,15 +3837,33 @@
libgvfscommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libgvfscommon_la_OBJECTS = gsysutils.lo gvfsdbusutils.lo \
-@@ -225,6 +226,7 @@
+@@ -165,7 +166,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -226,8 +226,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -305,6 +307,7 @@
+ MSGFMT = @MSGFMT@
+@@ -273,7 +273,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -308,6 +307,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -2387,7 +3871,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -321,11 +324,12 @@
+@@ -324,11 +324,12 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
NULL =
@@ -2402,7 +3886,7 @@
-DDBUS_API_SUBJECT_TO_CHANGE
libgvfscommon_la_SOURCES = \
-@@ -343,7 +347,7 @@
+@@ -346,7 +347,7 @@
# needed by cygwin (see bug #564003)
@@ -2411,7 +3895,7 @@
libgvfscommon_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
-@@ -357,6 +361,7 @@
+@@ -360,6 +361,7 @@
@HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_CFLAGS = \
@HAVE_AVAHI_TRUE@ $(AVAHI_CFLAGS)
@@ -2419,7 +3903,7 @@
@HAVE_AVAHI_TRUE at libgvfscommon_dnssd_la_LIBADD = \
@HAVE_AVAHI_TRUE@ libgvfscommon.la \
@HAVE_AVAHI_TRUE@ $(AVAHI_LIBS) \
-@@ -366,7 +371,7 @@
+@@ -369,7 +371,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -2428,7 +3912,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -391,37 +396,37 @@
+@@ -394,37 +396,37 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2480,7 +3964,7 @@
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
-@@ -430,7 +435,7 @@
+@@ -433,7 +435,7 @@
libgvfscommon-dnssd.la: $(libgvfscommon_dnssd_la_OBJECTS) $(libgvfscommon_dnssd_la_DEPENDENCIES)
$(AM_V_CCLD)$(libgvfscommon_dnssd_la_LINK) $(am_libgvfscommon_dnssd_la_rpath) $(libgvfscommon_dnssd_la_OBJECTS) $(libgvfscommon_dnssd_la_LIBADD) $(LIBS)
libgvfscommon.la: $(libgvfscommon_la_OBJECTS) $(libgvfscommon_la_DEPENDENCIES)
@@ -2489,7 +3973,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -583,7 +588,7 @@
+@@ -586,7 +588,7 @@
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -2498,7 +3982,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
-@@ -613,7 +618,7 @@
+@@ -616,7 +618,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
@@ -2507,7 +3991,7 @@
mostlyclean-am
distclean: distclean-am
-@@ -634,13 +639,13 @@
+@@ -637,13 +639,13 @@
info-am:
@@ -2523,7 +4007,7 @@
install-html: install-html-am
-@@ -680,23 +685,23 @@
+@@ -683,23 +685,23 @@
ps-am:
@@ -2557,12 +4041,20 @@
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.66.
+-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.67.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@@ -171,14 +171,6 @@
+@@ -89,7 +89,6 @@
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+-as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -172,14 +171,6 @@
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
@@ -2577,7 +4069,27 @@
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
-@@ -533,8 +525,155 @@
+@@ -223,18 +214,11 @@
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+- # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+- case $- in # ((((
+- *v*x* | *x*v* ) as_opts=-vx ;;
+- *v* ) as_opts=-v ;;
+- *x* ) as_opts=-x ;;
+- * ) as_opts= ;;
+- esac
+- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+
+ if test x$as_have_required = xno; then :
+@@ -541,8 +525,155 @@
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -2733,15 +4245,20 @@
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
-@@ -749,6 +888,7 @@
+@@ -757,11 +888,9 @@
LIPO
NMEDIT
DSYMUTIL
+-MANIFEST_TOOL
+lt_ECHO
RANLIB
+-ac_ct_AR
AR
+-DLLTOOL
OBJDUMP
-@@ -787,6 +927,9 @@
+ NM
+ ac_ct_DUMPBIN
+@@ -798,6 +927,9 @@
LDFLAGS
CFLAGS
CC
@@ -2751,7 +4268,7 @@
am__untar
am__tar
AMTAR
-@@ -851,6 +994,7 @@
+@@ -862,13 +994,13 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -2759,7 +4276,14 @@
enable_dependency_tracking
enable_static
enable_shared
-@@ -896,12 +1040,7 @@
+ with_pic
+ enable_fast_install
+ with_gnu_ld
+-with_sysroot
+ enable_libtool_lock
+ enable_silent_rules
+ enable_schemas_compile
+@@ -908,12 +1040,7 @@
LDFLAGS
LIBS
CPPFLAGS
@@ -2772,19 +4296,16 @@
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-@@ -997,8 +1136,9 @@
- fi
-
- case $ac_option in
-- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-- *) ac_optarg=yes ;;
-+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+ *=) ac_optarg= ;;
-+ *) ac_optarg=yes ;;
+@@ -1351,7 +1478,7 @@
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ ;;
+
esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1552,6 +1692,8 @@
+@@ -1565,6 +1692,8 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -2793,43 +4314,173 @@
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-static[=PKGS] build static libraries [default=no]
-@@ -1727,7 +1869,7 @@
+@@ -1604,8 +1733,6 @@
+ --with-pic try to use only PIC/non-PIC objects [default=use
+ both]
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+- --with-sysroot=DIR Search for dependent libraries within DIR
+- (or the compiler's sysroot if not specified).
+ --with-html-dir=PATH path to installed docs
+ --with-dbus-service-dir=PATH
+ choose directory for dbus service files,
+@@ -1742,7 +1869,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
--generated by GNU Autoconf 2.66
+-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
-@@ -1845,7 +1987,7 @@
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } >/dev/null && {
-+ test $ac_status = 0; } > conftest.i && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then :
-@@ -2159,7 +2301,7 @@
+@@ -1788,7 +1915,7 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_compile
+@@ -1834,7 +1961,7 @@
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_link
+@@ -1871,7 +1998,7 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_cpp
+@@ -1885,7 +2012,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
else
- ac_header_preproc=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1903,7 +2030,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_header_compile
+
+@@ -1944,7 +2071,7 @@
+ ac_retval=$ac_status
fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
-
-@@ -2203,7 +2345,7 @@
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_run
+@@ -1957,7 +2084,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2012,7 +2139,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_func
+
+@@ -2025,7 +2152,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=no"
+@@ -2066,7 +2193,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_type
+
+@@ -2079,7 +2206,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+ $as_echo_n "checking for $2.$3... " >&6; }
+-if eval \${$4+:} false; then :
++if eval "test \"\${$4+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2123,7 +2250,7 @@
+ eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_member
+
+@@ -2135,10 +2262,10 @@
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if eval \${$3+:} false; then :
++ if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2201,7 +2328,7 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -2210,7 +2337,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_header_mongrel
+ cat >config.log <<_ACEOF
+@@ -2218,7 +2345,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
--generated by GNU Autoconf 2.66. Invocation command line was
+-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
-@@ -2461,7 +2603,7 @@
+@@ -2476,7 +2603,7 @@
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
@@ -2838,7 +4489,16 @@
fi
done
-@@ -2686,11 +2828,11 @@
+@@ -2614,7 +2741,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if ${ac_cv_path_install+:} false; then :
++if test "${ac_cv_path_install+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2701,11 +2828,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2852,7 +4512,52 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -3058,6 +3200,29 @@
+@@ -2791,7 +2918,7 @@
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_STRIP+:} false; then :
++if test "${ac_cv_prog_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$STRIP"; then
+@@ -2831,7 +2958,7 @@
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+@@ -2884,7 +3011,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+- if ${ac_cv_path_mkdir+:} false; then :
++ if test "${ac_cv_path_mkdir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2935,7 +3062,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_AWK+:} false; then :
++if test "${ac_cv_prog_AWK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$AWK"; then
+@@ -2975,7 +3102,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -3073,6 +3200,29 @@
@@ -2882,7 +4587,7 @@
ac_config_headers="$ac_config_headers config.h"
-@@ -3072,11 +3237,11 @@
+@@ -3087,11 +3237,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2896,7 +4601,61 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -3477,7 +3642,7 @@
+@@ -3201,7 +3351,7 @@
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3241,7 +3391,7 @@
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3294,7 +3444,7 @@
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3334,7 +3484,7 @@
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3393,7 +3543,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3437,7 +3587,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3492,7 +3642,7 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
@@ -2905,7 +4664,7 @@
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3592,7 +3757,7 @@
+@@ -3607,7 +3757,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
@@ -2914,7 +4673,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3635,7 +3800,7 @@
+@@ -3650,7 +3800,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
@@ -2923,7 +4682,7 @@
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3694,7 +3859,7 @@
+@@ -3709,7 +3859,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
@@ -2932,7 +4691,16 @@
fi
fi
fi
-@@ -3746,7 +3911,7 @@
+@@ -3720,7 +3870,7 @@
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if ${ac_cv_objext+:} false; then :
++if test "${ac_cv_objext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3761,7 +3911,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
@@ -2941,7 +4709,129 @@
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -4531,7 +4696,7 @@
+@@ -3771,7 +3921,7 @@
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if ${ac_cv_c_compiler_gnu+:} false; then :
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3808,7 +3958,7 @@
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if ${ac_cv_prog_cc_g+:} false; then :
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -3886,7 +4036,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if ${ac_cv_prog_cc_c89+:} false; then :
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+@@ -3985,7 +4135,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -4111,7 +4261,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+-if ${ac_cv_c_const+:} false; then :
++if test "${ac_cv_c_const+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4191,7 +4341,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+ $as_echo_n "checking for library containing strerror... " >&6; }
+-if ${ac_cv_search_strerror+:} false; then :
++if test "${ac_cv_search_strerror+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+@@ -4225,11 +4375,11 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+- if ${ac_cv_search_strerror+:} false; then :
++ if test "${ac_cv_search_strerror+set}" = set; then :
+ break
+ fi
+ done
+-if ${ac_cv_search_strerror+:} false; then :
++if test "${ac_cv_search_strerror+set}" = set; then :
+
+ else
+ ac_cv_search_strerror=no
+@@ -4255,7 +4405,7 @@
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4295,7 +4445,7 @@
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4348,7 +4498,7 @@
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4388,7 +4538,7 @@
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4447,7 +4597,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4491,7 +4641,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4546,7 +4696,7 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
@@ -2950,52 +4840,52 @@
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4939,7 +5104,7 @@
- # Broken: fails on valid input.
- continue
+@@ -4575,7 +4725,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if ${ac_cv_c_compiler_gnu+:} false; then :
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4612,7 +4762,7 @@
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if ${ac_cv_prog_cc_g+:} false; then :
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -4690,7 +4840,7 @@
fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
-@@ -4955,11 +5120,11 @@
- ac_preproc_ok=:
- break
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if ${ac_cv_prog_cc_c89+:} false; then :
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+@@ -4789,7 +4939,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -4924,7 +5074,7 @@
+ CPP=
fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
-
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- break
- fi
-@@ -4998,7 +5163,7 @@
- # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
-@@ -5014,18 +5179,18 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
-
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-
+ if test -z "$CPP"; then
+- if ${ac_cv_prog_CPP+:} false; then :
++ if test "${ac_cv_prog_CPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
+ # Double quotes because CPP needs to be expanded
+@@ -5040,7 +5190,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
@@ -3004,18 +4894,36 @@
fi
ac_ext=c
-@@ -5116,8 +5281,8 @@
-
-
-
--macro_version='2.2.10'
--macro_revision='1.3175'
+@@ -5065,7 +5215,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -5131,8 +5281,8 @@
+
+
+
+-macro_version='2.4'
+-macro_revision='1.3293'
+macro_version='2.2.6b'
+macro_revision='1.3017'
-@@ -5155,7 +5320,7 @@
+@@ -5154,7 +5304,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if ${ac_cv_build+:} false; then :
++if test "${ac_cv_build+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_build_alias=$build_alias
+@@ -5170,7 +5320,7 @@
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
@@ -3024,7 +4932,16 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5188,7 +5353,7 @@
+@@ -5188,7 +5338,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if ${ac_cv_host+:} false; then :
++if test "${ac_cv_host+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "x$host_alias" = x; then
+@@ -5203,7 +5353,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -3033,7 +4950,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5204,75 +5369,6 @@
+@@ -5219,78 +5369,9 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -3061,7 +4978,7 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
--if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
@@ -3108,8 +5025,66 @@
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
- if test "${ac_cv_path_SED+set}" = set; then :
-@@ -5738,11 +5834,8 @@
+-if ${ac_cv_path_SED+:} false; then :
++if test "${ac_cv_path_SED+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -5372,7 +5453,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if ${ac_cv_path_GREP+:} false; then :
++if test "${ac_cv_path_GREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$GREP"; then
+@@ -5435,7 +5516,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if ${ac_cv_path_EGREP+:} false; then :
++if test "${ac_cv_path_EGREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -5502,7 +5583,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
+-if ${ac_cv_path_FGREP+:} false; then :
++if test "${ac_cv_path_FGREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+@@ -5633,7 +5714,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if ${lt_cv_path_LD+:} false; then :
++if test "${lt_cv_path_LD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$LD"; then
+@@ -5673,7 +5754,7 @@
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if ${lt_cv_prog_gnu_ld+:} false; then :
++if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -5700,7 +5781,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if ${lt_cv_path_NM+:} false; then :
++if test "${lt_cv_path_NM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$NM"; then
+@@ -5753,17 +5834,14 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -3123,7 +5098,14 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -5786,7 +5879,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_DUMPBIN+:} false; then :
++if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$DUMPBIN"; then
+@@ -5801,13 +5879,13 @@
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -3132,7 +5114,14 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -5841,15 +5934,6 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_DUMPBIN"; then
+@@ -5856,15 +5934,6 @@
fi
fi
@@ -3148,7 +5137,13 @@
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5869,13 +5953,13 @@
+@@ -5879,18 +5948,18 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if ${lt_cv_nm_interface+:} false; then :
++if test "${lt_cv_nm_interface+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
@@ -3165,7 +5160,16 @@
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5921,11 +6005,6 @@
+@@ -5903,7 +5972,7 @@
+ # find the maximum length of command line arguments
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if ${lt_cv_sys_max_cmd_len+:} false; then :
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ i=0
+@@ -5936,11 +6005,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3177,7 +5181,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5990,8 +6069,8 @@
+@@ -6005,8 +6069,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -3188,7 +5192,142 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -6262,18 +6341,16 @@
+@@ -6048,8 +6112,8 @@
+ # Try some XSI features
+ xsi_shell=no
+ ( _lt_dummy="a/b/c"
+- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+- = c,a/b,b/c, \
++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
++ = c,a/b,, \
+ && eval 'test $(( 1 + 1 )) -eq 2 \
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+ && xsi_shell=yes
+@@ -6098,83 +6162,9 @@
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+-if ${lt_cv_to_host_file_cmd+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $host in
+- *-*-mingw* )
+- case $build in
+- *-*-mingw* ) # actually msys
+- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+- ;;
+- *-*-cygwin* )
+- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+- ;;
+- * ) # otherwise, assume *nix
+- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+- ;;
+- esac
+- ;;
+- *-*-cygwin* )
+- case $build in
+- *-*-mingw* ) # actually msys
+- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+- ;;
+- *-*-cygwin* )
+- lt_cv_to_host_file_cmd=func_convert_file_noop
+- ;;
+- * ) # otherwise, assume *nix
+- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+- ;;
+- esac
+- ;;
+- * ) # unhandled hosts (and "normal" native builds)
+- lt_cv_to_host_file_cmd=func_convert_file_noop
+- ;;
+-esac
+-
+-fi
+-
+-to_host_file_cmd=$lt_cv_to_host_file_cmd
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+-
+-
+-
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+-if ${lt_cv_to_tool_file_cmd+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- #assume ordinary cross tools, or native build.
+-lt_cv_to_tool_file_cmd=func_convert_file_noop
+-case $host in
+- *-*-mingw* )
+- case $build in
+- *-*-mingw* ) # actually msys
+- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+- ;;
+- esac
+- ;;
+-esac
+-
+-fi
+-
+-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if ${lt_cv_ld_reload_flag+:} false; then :
++if test "${lt_cv_ld_reload_flag+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ld_reload_flag='-r'
+@@ -6188,11 +6178,6 @@
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ case $host_os in
+- cygwin* | mingw* | pw32* | cegcc*)
+- if test "$GCC" != yes; then
+- reload_cmds=false
+- fi
+- ;;
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+@@ -6215,7 +6200,7 @@
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_OBJDUMP+:} false; then :
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OBJDUMP"; then
+@@ -6255,7 +6240,7 @@
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OBJDUMP"; then
+@@ -6314,7 +6299,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if ${lt_cv_deplibs_check_method+:} false; then :
++if test "${lt_cv_deplibs_check_method+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -6356,18 +6341,16 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -3210,7 +5349,7 @@
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -6303,10 +6380,6 @@
+@@ -6397,10 +6380,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3221,7 +5360,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -6315,11 +6388,11 @@
+@@ -6409,11 +6388,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -3235,7 +5374,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -6345,7 +6418,7 @@
+@@ -6439,7 +6418,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3244,7 +5383,470 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6757,18 +6830,6 @@
+@@ -6516,21 +6495,6 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+ $as_echo "$lt_cv_deplibs_check_method" >&6; }
+-
+-file_magic_glob=
+-want_nocaseglob=no
+-if test "$build" = "$host"; then
+- case $host_os in
+- mingw* | pw32*)
+- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+- want_nocaseglob=yes
+- else
+- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+- fi
+- ;;
+- esac
+-fi
+-
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -6546,26 +6510,16 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_DLLTOOL+:} false; then :
++if test "${ac_cv_prog_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$DLLTOOL"; then
+- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
++ if test -n "$AR"; then
++ ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -6574,7 +6528,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -6584,10 +6538,10 @@
+
+ fi
+ fi
+-DLLTOOL=$ac_cv_prog_DLLTOOL
+-if test -n "$DLLTOOL"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+-$as_echo "$DLLTOOL" >&6; }
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -6595,17 +6549,17 @@
+
+
+ fi
+-if test -z "$ac_cv_prog_DLLTOOL"; then
+- ac_ct_DLLTOOL=$DLLTOOL
+- # Extract the first word of "dlltool", so it can be a program name with args.
+-set dummy dlltool; ac_word=$2
++if test -z "$ac_cv_prog_AR"; then
++ ac_ct_AR=$AR
++ # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$ac_ct_DLLTOOL"; then
+- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
++ if test -n "$ac_ct_AR"; then
++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -6614,7 +6568,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++ ac_cv_prog_ac_ct_AR="ar"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -6624,17 +6578,17 @@
+
+ fi
+ fi
+-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+-if test -n "$ac_ct_DLLTOOL"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+-$as_echo "$ac_ct_DLLTOOL" >&6; }
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+- if test "x$ac_ct_DLLTOOL" = x; then
+- DLLTOOL="false"
++ if test "x$ac_ct_AR" = x; then
++ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+@@ -6642,54 +6596,18 @@
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+- DLLTOOL=$ac_ct_DLLTOOL
++ AR=$ac_ct_AR
+ fi
+ else
+- DLLTOOL="$ac_cv_prog_DLLTOOL"
++ AR="$ac_cv_prog_AR"
+ fi
+
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-
+-
+-
+-
+-
+-
+-
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_sharedlib_from_linklib_cmd='unknown'
+-
+-case $host_os in
+-cygwin* | mingw* | pw32* | cegcc*)
+- # two different shell functions defined in ltmain.sh
+- # decide which to use based on capabilities of $DLLTOOL
+- case `$DLLTOOL --help 2>&1` in
+- *--identify-strict*)
+- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+- ;;
+- *)
+- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+- ;;
+- esac
+- ;;
+-*)
+- # fallback: assume linklib IS sharedlib
+- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+- ;;
+-esac
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+@@ -6698,17 +6616,15 @@
+
+
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in ar
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_AR+:} false; then :
++if test "${ac_cv_prog_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$AR"; then
+- ac_cv_prog_AR="$AR" # Let the user override the test.
++ if test -n "$STRIP"; then
++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -6717,7 +6633,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
++ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -6727,32 +6643,28 @@
+
+ fi
+ fi
+-AR=$ac_cv_prog_AR
+-if test -n "$AR"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+-$as_echo "$AR" >&6; }
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+- test -n "$AR" && break
+- done
+ fi
+-if test -z "$AR"; then
+- ac_ct_AR=$AR
+- for ac_prog in ar
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
++if test -z "$ac_cv_prog_STRIP"; then
++ ac_ct_STRIP=$STRIP
++ # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_AR+:} false; then :
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$ac_ct_AR"; then
+- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++ if test -n "$ac_ct_STRIP"; then
++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -6761,172 +6673,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_AR="$ac_prog"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_AR=$ac_cv_prog_ac_ct_AR
+-if test -n "$ac_ct_AR"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+-$as_echo "$ac_ct_AR" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+- test -n "$ac_ct_AR" && break
+-done
+-
+- if test "x$ac_ct_AR" = x; then
+- AR="false"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- AR=$ac_ct_AR
+- fi
+-fi
+-
+-: ${AR=ar}
+-: ${AR_FLAGS=cru}
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+-$as_echo_n "checking for archiver @FILE support... " >&6; }
+-if ${lt_cv_ar_at_file+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_ar_at_file=no
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- echo conftest.$ac_objext > conftest.lst
+- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+- (eval $lt_ar_try) 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }
+- if test "$ac_status" -eq 0; then
+- # Ensure the archiver fails upon bogus file names.
+- rm -f conftest.$ac_objext libconftest.a
+- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+- (eval $lt_ar_try) 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }
+- if test "$ac_status" -ne 0; then
+- lt_cv_ar_at_file=@
+- fi
+- fi
+- rm -f conftest.* libconftest.a
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+-$as_echo "$lt_cv_ar_at_file" >&6; }
+-
+-if test "x$lt_cv_ar_at_file" = xno; then
+- archiver_list_spec=
+-else
+- archiver_list_spec=$lt_cv_ar_at_file
+-fi
+-
+-
+-
+-
+-
+-
+-
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_STRIP+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$STRIP"; then
+- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+- ac_ct_STRIP=$STRIP
+- # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_STRIP"; then
+- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_STRIP="strip"
++ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -6972,7 +6719,7 @@
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_RANLIB+:} false; then :
++if test "${ac_cv_prog_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$RANLIB"; then
+@@ -7012,7 +6759,7 @@
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_RANLIB"; then
+@@ -7083,18 +6830,6 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -3263,7 +5865,35 @@
-@@ -6938,8 +6999,8 @@
+@@ -7141,7 +6876,7 @@
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -7202,8 +6937,8 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+ # Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+@@ -7239,7 +6974,6 @@
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
+- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -7265,8 +6999,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -3274,7 +5904,120 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7092,7 +7153,7 @@
+@@ -7281,18 +7015,6 @@
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
+-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+- relocations are performed -- see ld's documentation on pseudo-relocs. */
+-# define LT_DLSYM_CONST
+-#elif defined(__osf__)
+-/* This system does not cope well with relocations in const data. */
+-# define LT_DLSYM_CONST
+-#else
+-# define LT_DLSYM_CONST const
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -7304,7 +7026,7 @@
+ cat <<_LT_EOF >> conftest.$ac_ext
+
+ /* The mapping between symbol names and symbols. */
+-LT_DLSYM_CONST struct {
++const struct {
+ const char *name;
+ void *address;
+ }
+@@ -7330,8 +7052,8 @@
+ _LT_EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+- lt_globsym_save_LIBS=$LIBS
+- lt_globsym_save_CFLAGS=$CFLAGS
++ lt_save_LIBS="$LIBS"
++ lt_save_CFLAGS="$CFLAGS"
+ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+@@ -7341,8 +7063,8 @@
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+- LIBS=$lt_globsym_save_LIBS
+- CFLAGS=$lt_globsym_save_CFLAGS
++ LIBS="$lt_save_LIBS"
++ CFLAGS="$lt_save_CFLAGS"
+ else
+ echo "cannot find nm_test_func in $nlist" >&5
+ fi
+@@ -7379,16 +7101,6 @@
+ $as_echo "ok" >&6; }
+ fi
+
+-# Response file support.
+-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+- nm_file_list_spec='@'
+-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+- nm_file_list_spec='@'
+-fi
+-
+-
+-
+-
+
+
+
+@@ -7410,45 +7122,6 @@
+
+
+
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+-$as_echo_n "checking for sysroot... " >&6; }
+-
+-# Check whether --with-sysroot was given.
+-if test "${with_sysroot+set}" = set; then :
+- withval=$with_sysroot;
+-else
+- with_sysroot=no
+-fi
+-
+-
+-lt_sysroot=
+-case ${with_sysroot} in #(
+- yes)
+- if test "$GCC" = yes; then
+- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+- fi
+- ;; #(
+- /*)
+- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+- ;; #(
+- no|'')
+- ;; #(
+- *)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+-$as_echo "${with_sysroot}" >&6; }
+- as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+- ;;
+-esac
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+-$as_echo "${lt_sysroot:-no}" >&6; }
+-
+-
+-
+-
+-
+ # Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then :
+ enableval=$enable_libtool_lock;
+@@ -7480,7 +7153,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -3283,13 +6026,254 @@
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7804,38 +7865,6 @@
+@@ -7574,7 +7247,7 @@
+ CFLAGS="$CFLAGS -belf"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if ${lt_cv_cc_needs_belf+:} false; then :
++if test "${lt_cv_cc_needs_belf+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_ext=c
+@@ -7642,123 +7315,6 @@
+
+ need_locks="$enable_libtool_lock"
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}mt; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$MANIFEST_TOOL"; then
+- ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+-if test -n "$MANIFEST_TOOL"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+-$as_echo "$MANIFEST_TOOL" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+- ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+- # Extract the first word of "mt", so it can be a program name with args.
+-set dummy mt; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_MANIFEST_TOOL"; then
+- ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+-if test -n "$ac_ct_MANIFEST_TOOL"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+- if test "x$ac_ct_MANIFEST_TOOL" = x; then
+- MANIFEST_TOOL=":"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+- fi
+-else
+- MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+-fi
+-
+-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+-if ${lt_cv_path_mainfest_tool+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_path_mainfest_tool=no
+- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+- cat conftest.err >&5
+- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+- lt_cv_path_mainfest_tool=yes
+- fi
+- rm -f conftest*
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+- MANIFEST_TOOL=:
+-fi
+-
+-
+-
+-
+-
+
+ case $host_os in
+ rhapsody* | darwin*)
+@@ -7767,7 +7323,7 @@
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_DSYMUTIL+:} false; then :
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$DSYMUTIL"; then
+@@ -7807,7 +7363,7 @@
+ set dummy dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_DSYMUTIL"; then
+@@ -7859,7 +7415,7 @@
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_NMEDIT+:} false; then :
++if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$NMEDIT"; then
+@@ -7899,7 +7455,7 @@
+ set dummy nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_NMEDIT"; then
+@@ -7951,7 +7507,7 @@
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_LIPO+:} false; then :
++if test "${ac_cv_prog_LIPO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$LIPO"; then
+@@ -7991,7 +7547,7 @@
+ set dummy lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_LIPO"; then
+@@ -8043,7 +7599,7 @@
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_OTOOL+:} false; then :
++if test "${ac_cv_prog_OTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OTOOL"; then
+@@ -8083,7 +7639,7 @@
+ set dummy otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OTOOL"; then
+@@ -8135,7 +7691,7 @@
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_OTOOL64+:} false; then :
++if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OTOOL64"; then
+@@ -8175,7 +7731,7 @@
+ set dummy otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OTOOL64"; then
+@@ -8250,7 +7806,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if ${lt_cv_apple_cc_single_mod+:} false; then :
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_apple_cc_single_mod=no
+@@ -8279,7 +7835,7 @@
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if ${lt_cv_ld_exported_symbols_list+:} false; then :
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ld_exported_symbols_list=no
+@@ -8309,38 +7865,6 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
--if test "${lt_cv_ld_force_load+set}" = set; then :
+-if ${lt_cv_ld_force_load+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ld_force_load=no
@@ -3322,7 +6306,7 @@
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -7863,7 +7892,7 @@
+@@ -8368,7 +7892,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -3331,7 +6315,25 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -8016,8 +8045,6 @@
+@@ -8379,7 +7903,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if ${ac_cv_header_stdc+:} false; then :
++if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8510,7 +8034,7 @@
+ do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+ "
+-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DLFCN_H 1
+ _ACEOF
+@@ -8521,8 +8045,6 @@
@@ -3340,7 +6342,7 @@
# Set options
-@@ -8140,7 +8167,6 @@
+@@ -8645,7 +8167,6 @@
@@ -3348,7 +6350,16 @@
test -z "$LN_S" && LN_S="ln -s"
-@@ -8190,6 +8216,19 @@
+@@ -8667,7 +8188,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if ${lt_cv_objdir+:} false; then :
++if test "${lt_cv_objdir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ rm -f .libs 2>/dev/null
+@@ -8695,6 +8216,19 @@
@@ -3368,7 +6379,7 @@
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8202,6 +8241,23 @@
+@@ -8707,6 +8241,23 @@
;;
esac
@@ -3392,7 +6403,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8230,7 +8286,7 @@
+@@ -8735,7 +8286,7 @@
*) break;;
esac
done
@@ -3401,7 +6412,25 @@
# Only perform the check for file, if the check method requires it
-@@ -8435,12 +8491,7 @@
+@@ -8745,7 +8296,7 @@
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if ${lt_cv_path_MAGIC_CMD+:} false; then :
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MAGIC_CMD in
+@@ -8811,7 +8362,7 @@
+ if test -n "$ac_tool_prefix"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
+-if ${lt_cv_path_MAGIC_CMD+:} false; then :
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MAGIC_CMD in
+@@ -8940,16 +8491,11 @@
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
@@ -3415,7 +6444,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-@@ -8460,15 +8511,15 @@
+-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+@@ -8965,15 +8511,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3434,7 +6468,16 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8546,12 +8597,6 @@
+@@ -9002,6 +8548,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
++$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+
+ if test "$GCC" = yes; then
+ lt_prog_compiler_wl='-Wl,'
+@@ -9049,12 +8597,6 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -3447,7 +6490,7 @@
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8594,13 +8639,6 @@
+@@ -9097,13 +8639,6 @@
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -3461,16 +6504,22 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8663,7 +8701,7 @@
+@@ -9166,13 +8701,7 @@
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
+- nagfor*)
+- # NAG Fortran compiler
+- lt_prog_compiler_wl='-Wl,-Wl,,'
+- lt_prog_compiler_pic='-PIC'
+- lt_prog_compiler_static='-Bstatic'
+- ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8675,26 +8713,26 @@
+@@ -9184,26 +8713,26 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -3505,7 +6554,7 @@
esac
;;
esac
-@@ -8725,7 +8763,7 @@
+@@ -9234,7 +8763,7 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -3514,7 +6563,40 @@
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8812,15 +8850,15 @@
+@@ -9291,17 +8820,13 @@
+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+ ;;
+ esac
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
++$as_echo "$lt_prog_compiler_pic" >&6; }
++
++
++
++
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+-if ${lt_cv_prog_compiler_pic+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+ #
+ # Check to make sure the PIC flag actually works.
+@@ -9309,7 +8834,7 @@
+ if test -n "$lt_prog_compiler_pic"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if ${lt_cv_prog_compiler_pic_works+:} false; then :
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_pic_works=no
+@@ -9325,15 +8850,15 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3533,7 +6615,27 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
-@@ -8868,7 +8906,7 @@
+@@ -9362,18 +8887,13 @@
+
+
+
+-
+-
+-
+-
+-
+ #
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if ${lt_cv_prog_compiler_static_works+:} false; then :
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works=no
+@@ -9386,7 +8906,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -3542,7 +6644,16 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -8917,16 +8955,16 @@
+@@ -9416,7 +8936,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if ${lt_cv_prog_compiler_c_o+:} false; then :
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+@@ -9435,16 +8955,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3562,7 +6673,16 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -8972,16 +9010,16 @@
+@@ -9471,7 +8991,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if ${lt_cv_prog_compiler_c_o+:} false; then :
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+@@ -9490,16 +9010,16 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3582,7 +6702,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -9091,36 +9129,13 @@
+@@ -9609,36 +9129,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -3622,7 +6742,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9154,12 +9169,11 @@
+@@ -9672,12 +9169,11 @@
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -3638,7 +6758,7 @@
_LT_EOF
fi
-@@ -9195,7 +9209,6 @@
+@@ -9713,12 +9209,10 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -3646,7 +6766,13 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
-@@ -9217,11 +9230,6 @@
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+- exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -9736,11 +9230,6 @@
fi
;;
@@ -3658,7 +6784,12 @@
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9251,12 +9259,11 @@
+@@ -9766,16 +9255,15 @@
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+- tmp_addflag=' $pic_flag'
++ tmp_addflag=
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -3674,7 +6805,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9267,17 +9274,13 @@
+@@ -9786,17 +9274,13 @@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -3694,7 +6825,7 @@
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9293,17 +9296,17 @@
+@@ -9812,17 +9296,17 @@
fi
case $cc_basename in
@@ -3715,7 +6846,7 @@
fi
;;
esac
-@@ -9312,7 +9315,7 @@
+@@ -9831,13 +9315,13 @@
fi
;;
@@ -3724,7 +6855,37 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9424,10 +9427,8 @@
+ else
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+@@ -9855,8 +9339,8 @@
+
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -9902,8 +9386,8 @@
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+@@ -9943,10 +9427,8 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -3736,7 +6897,7 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -9489,6 +9490,7 @@
+@@ -10008,6 +9490,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -3744,8 +6905,61 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9545,7 +9547,7 @@
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10033,13 +9516,7 @@
+ allow_undefined_flag='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test "${lt_cv_aix_libpath+set}" = set; then
+- aix_libpath=$lt_cv_aix_libpath
+-else
+- if ${lt_cv_aix_libpath_+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -10052,32 +9529,25 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+
+- lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\([^ ]*\) *$/\1/
+- p
+- }
+- }'
+- lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+- # Check for a 64-bit object if we didn't find anything.
+- if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+- fi
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_="/usr/lib:/lib"
+- fi
+-
+-fi
+-
+- aix_libpath=$lt_cv_aix_libpath_
+-fi
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
@@ -3753,7 +6967,64 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9589,13 +9591,8 @@
+@@ -10086,13 +9556,7 @@
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+- if test "${lt_cv_aix_libpath+set}" = set; then
+- aix_libpath=$lt_cv_aix_libpath
+-else
+- if ${lt_cv_aix_libpath_+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -10105,42 +9569,30 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+
+- lt_aix_libpath_sed='
+- /Import File Strings/,/^$/ {
+- /^0/ {
+- s/^0 *\([^ ]*\) *$/\1/
+- p
+- }
+- }'
+- lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+- # Check for a 64-bit object if we didn't find anything.
+- if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+- fi
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- if test -z "$lt_cv_aix_libpath_"; then
+- lt_cv_aix_libpath_="/usr/lib:/lib"
+- fi
+-
+-fi
+-
+- aix_libpath=$lt_cv_aix_libpath_
+-fi
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -3769,16 +7040,85 @@
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9634,7 +9631,7 @@
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
-- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+@@ -10172,63 +9624,20 @@
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+- case $cc_basename in
+- cl*)
+- # Native MSVC
+- hardcode_libdir_flag_spec=' '
+- allow_undefined_flag=unsupported
+- always_export_symbols=yes
+- file_list_spec='@'
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+- else
+- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+- fi~
+- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+- linknames='
+- # The linker will not automatically build a static lib if we build a DLL.
+- # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+- enable_shared_with_static_runtimes=yes
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+- # Don't use ranlib
+- old_postinstall_cmds='chmod 644 $oldlib'
+- postlink_cmds='lt_outputfile="@OUTPUT@"~
+- lt_tool_outputfile="@TOOL_OUTPUT@"~
+- case $lt_outputfile in
+- *.exe|*.EXE) ;;
+- *)
+- lt_outputfile="$lt_outputfile.exe"
+- lt_tool_outputfile="$lt_tool_outputfile.exe"
+- ;;
+- esac~
+- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+- $RM "$lt_outputfile.manifest";
+- fi'
+- ;;
+- *)
+- # Assume MSVC wrapper
+- hardcode_libdir_flag_spec=' '
+- allow_undefined_flag=unsupported
+- # Tell ltmain to make .lib files, not .a files.
+- libext=lib
+- # Tell ltmain to make .dll files, not .so files.
+- shrext_cmds=".dll"
+- # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+- # The linker will automatically build a .lib file if we build a DLL.
+- old_archive_from_new_cmds='true'
+- # FIXME: Should let the user specify the lib program.
+- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+- enable_shared_with_static_runtimes=yes
+- ;;
+- esac
++ hardcode_libdir_flag_spec=' '
++ allow_undefined_flag=unsupported
++ # Tell ltmain to make .lib files, not .a files.
++ libext=lib
++ # Tell ltmain to make .dll files, not .so files.
++ shrext_cmds=".dll"
++ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
-@@ -9650,11 +9647,7 @@
++ # The linker will automatically build a .lib file if we build a DLL.
++ old_archive_from_new_cmds='true'
++ # FIXME: Should let the user specify the lib program.
++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ fix_srcfile_path='`cygpath -w "$srcfile"`'
++ enable_shared_with_static_runtimes=yes
+ ;;
+
+ darwin* | rhapsody*)
+@@ -10238,11 +9647,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -3791,7 +7131,7 @@
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9662,7 +9655,7 @@
+@@ -10250,7 +9655,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -3800,16 +7140,36 @@
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9728,7 +9721,7 @@
+@@ -10293,7 +9698,7 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+@@ -10301,7 +9706,7 @@
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+@@ -10316,8 +9721,8 @@
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -9747,7 +9740,7 @@
+ fi
+@@ -10335,16 +9740,16 @@
;;
hpux11*)
@@ -3818,7 +7178,18 @@
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -9768,46 +9761,7 @@
+ ;;
+ ia64*)
+- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+@@ -10356,46 +9761,7 @@
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -3827,7 +7198,7 @@
- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
--if test "${lt_cv_prog_compiler__b+set}" = set; then :
+-if ${lt_cv_prog_compiler__b+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler__b=no
@@ -3866,26 +7237,48 @@
;;
esac
fi
-@@ -9835,7 +9789,7 @@
+@@ -10423,39 +9789,26 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
-- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
-@@ -9846,15 +9800,15 @@
- int foo(void) {}
+- # This should be the same for all languages, so no per-tag cache variable.
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+-if ${lt_cv_irix_exported_symbol+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-int foo (void) { return 0; }
++int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+- lt_cv_irix_exported_symbol=yes
+-else
+- lt_cv_irix_exported_symbol=no
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
++
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+- if test "$lt_cv_irix_exported_symbol" = yes; then
+- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+- fi
++ LDFLAGS="$save_LDFLAGS"
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
@@ -3894,7 +7287,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9863,7 +9817,7 @@
+@@ -10464,7 +9817,7 @@
link_all_deplibs=yes
;;
@@ -3903,7 +7296,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9916,17 +9870,17 @@
+@@ -10517,17 +9870,17 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -3924,11 +7317,11 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9936,13 +9890,13 @@
+@@ -10537,13 +9890,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
@@ -3941,11 +7334,23 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10145,50 +10099,44 @@
+@@ -10556,9 +9909,9 @@
+ no_undefined_flag=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+@@ -10746,50 +10099,44 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
--if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+-if ${lt_cv_archive_cmds_need_lc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- $RM conftest*
@@ -4021,7 +7426,7 @@
;;
esac
fi
-@@ -10359,23 +10307,16 @@
+@@ -10960,23 +10307,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -4051,7 +7456,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -10388,7 +10329,7 @@
+@@ -10989,7 +10329,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -4060,7 +7465,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10408,13 +10349,7 @@
+@@ -11009,13 +10349,7 @@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -4075,7 +7480,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10502,7 +10437,7 @@
+@@ -11103,7 +10437,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4084,7 +7489,19 @@
;;
esac
;;
-@@ -10555,12 +10490,23 @@
+@@ -11134,9 +10468,8 @@
+ need_version=no
+ need_lib_prefix=no
+
+- case $GCC,$cc_basename in
+- yes,*)
+- # gcc
++ case $GCC,$host_os in
++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+@@ -11157,83 +10490,36 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -4095,22 +7512,94 @@
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+- ;;
+- pw32*)
+- # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+- ;;
+- esac
+- dynamic_linker='Win32 ld.exe'
+- ;;
+-
+- *,cl*)
+- # Native MSVC
+- libname_spec='$name'
+- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+- library_names_spec='${libname}.dll.lib'
+-
+- case $build_os in
+- mingw*)
+- sys_lib_search_path_spec=
+- lt_save_ifs=$IFS
+- IFS=';'
+- for lt_path in $LIB
+- do
+- IFS=$lt_save_ifs
+- # Let DOS variable expansion print the short 8.3 style file name.
+- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+- done
+- IFS=$lt_save_ifs
+- # Convert to MSYS style.
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+- ;;
+- cygwin*)
+- # Convert to unix form, then to dos form, then back to unix form
+- # but this time dos style (no spaces!) so that the unix form looks
+- # like /cygdrive/c/PROGRA~1:/cygdr...
+- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- ;;
+- *)
+- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+- # It is most probably a Windows format PATH.
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
+ fi
+- # FIXME: find the short name or the path components, as spaces are
+- # common. (e.g. "Program Files" -> "PROGRA~1")
++ ;;
++ pw32*)
++ # pw32 DLLs use 'pw' prefix rather than 'lib'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -10660,19 +10606,6 @@
+ esac
+-
+- # DLL is installed to $(libdir)/../bin by postinstall_cmds
+- postinstall_cmds='base_file=`basename \${file}`~
+- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+- dldir=$destdir/`dirname \$dlpath`~
+- test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $RM \$dlpath'
+- shlibpath_overrides_runpath=yes
+- dynamic_linker='Win32 link.exe'
+ ;;
+
+ *)
+- # Assume MSVC wrapper
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+- dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
++ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+@@ -11320,19 +10606,6 @@
hardcode_into_libs=yes
;;
@@ -4130,7 +7619,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -10715,10 +10648,8 @@
+@@ -11375,10 +10648,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -4142,13 +7631,13 @@
;;
interix[3-9]*)
-@@ -10785,17 +10716,12 @@
+@@ -11445,17 +10716,12 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
-
# Some binutils ld are patched to set DT_RUNPATH
-- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+- if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- lt_cv_shlibpath_overrides_runpath=no
@@ -4165,7 +7654,7 @@
/* end confdefs.h. */
int
-@@ -10808,31 +10734,23 @@
+@@ -11468,31 +10734,23 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -4202,7 +7691,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10844,6 +10762,18 @@
+@@ -11504,6 +10762,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4221,7 +7710,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11134,11 +11064,6 @@
+@@ -11794,11 +11064,6 @@
@@ -4233,7 +7722,108 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
-@@ -11469,7 +11394,7 @@
+@@ -11871,7 +11136,7 @@
+ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if ${ac_cv_lib_dl_dlopen+:} false; then :
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11905,7 +11170,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -11919,12 +11184,12 @@
+
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+-if test "x$ac_cv_func_shl_load" = xyes; then :
++if test "x$ac_cv_func_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if ${ac_cv_lib_dld_shl_load+:} false; then :
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11958,16 +11223,16 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+-if test "x$ac_cv_func_dlopen" = xyes; then :
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if ${ac_cv_lib_dl_dlopen+:} false; then :
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12001,12 +11266,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if ${ac_cv_lib_svld_dlopen+:} false; then :
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12040,12 +11305,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if ${ac_cv_lib_dld_dld_link+:} false; then :
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12079,7 +11344,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+@@ -12120,7 +11385,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if ${lt_cv_dlopen_self+:} false; then :
++if test "${lt_cv_dlopen_self+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -12129,7 +11394,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -4242,22 +7832,22 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11510,13 +11435,7 @@
+@@ -12170,13 +11435,7 @@
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
+-int fnord () __attribute__((visibility("default")));
-#endif
-
--void fnord () { int i=42; }
+-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11525,11 +11444,7 @@
+@@ -12185,11 +11444,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -4270,7 +7860,16 @@
/* dlclose (self); */
}
else
-@@ -11575,7 +11490,7 @@
+@@ -12226,7 +11481,7 @@
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if ${lt_cv_dlopen_self_static+:} false; then :
++if test "${lt_cv_dlopen_self_static+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -12235,7 +11490,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -4279,22 +7878,22 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11616,13 +11531,7 @@
+@@ -12276,13 +11531,7 @@
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
--void fnord () __attribute__((visibility("default")));
+-int fnord () __attribute__((visibility("default")));
-#endif
-
--void fnord () { int i=42; }
+-int fnord () { return 42; }
+void fnord() { int i=42;}
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11631,11 +11540,7 @@
+@@ -12291,11 +11540,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -4307,7 +7906,79 @@
/* dlclose (self); */
}
else
-@@ -12196,7 +12101,7 @@
+@@ -12476,7 +11721,7 @@
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PKG_CONFIG+:} false; then :
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -12517,7 +11762,7 @@
+ set dummy gio-querymodules; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GIO_QUERYMODULES+:} false; then :
++if test "${ac_cv_path_GIO_QUERYMODULES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GIO_QUERYMODULES in
+@@ -12563,7 +11808,7 @@
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12682,7 +11927,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if ${ac_cv_path_SED+:} false; then :
++if test "${ac_cv_path_SED+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -12764,7 +12009,7 @@
+
+
+ ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+-if test "x$ac_cv_type_pid_t" = xyes; then :
++if test "x$ac_cv_type_pid_t" = x""yes; then :
+
+ else
+
+@@ -12776,7 +12021,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+ $as_echo_n "checking return type of signal handlers... " >&6; }
+-if ${ac_cv_type_signal+:} false; then :
++if test "${ac_cv_type_signal+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12808,7 +12053,7 @@
+
+
+ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+-if test "x$ac_cv_type_size_t" = xyes; then :
++if test "x$ac_cv_type_size_t" = x""yes; then :
+
+ else
+
+@@ -12820,7 +12065,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+ $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+-if ${ac_cv_type_uid_t+:} false; then :
++if test "${ac_cv_type_uid_t+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12856,7 +12101,7 @@
enableval=$enable_schemas_compile; case ${enableval} in
yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
@@ -4316,7 +7987,124 @@
esac
fi
-@@ -12781,7 +12686,6 @@
+@@ -12873,7 +12118,7 @@
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PKG_CONFIG+:} false; then :
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -12916,7 +12161,7 @@
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+@@ -12989,7 +12234,7 @@
+ set dummy glib-compile-schemas; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
++if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GLIB_COMPILE_SCHEMAS in
+@@ -13071,7 +12316,7 @@
+
+ ifdef gsettings_ENUM_NAMESPACE
+ $(gsettings__enum_file): $(gsettings_ENUM_FILES)
+- $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE). at EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > $@.tmp && mv $@.tmp $@
++ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE). at EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
+ endif
+ '
+
+@@ -13085,7 +12330,7 @@
+
+ saved_CFLAGS=$CFLAGS
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_mtimensec" = xyes; then :
++if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
+@@ -13094,7 +12339,7 @@
+
+ fi
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = xyes; then :
++if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
+@@ -13103,7 +12348,7 @@
+
+ fi
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes; then :
++if test "x$ac_cv_member_struct_stat_st_atimensec" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_ATIMENSEC 1
+@@ -13112,7 +12357,7 @@
+
+ fi
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes; then :
++if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
+@@ -13121,7 +12366,7 @@
+
+ fi
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_ctimensec" "ac_cv_member_struct_stat_st_ctimensec" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_ctimensec" = xyes; then :
++if test "x$ac_cv_member_struct_stat_st_ctimensec" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_CTIMENSEC 1
+@@ -13130,7 +12375,7 @@
+
+ fi
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_ctim.tv_nsec" "ac_cv_member_struct_stat_st_ctim_tv_nsec" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_ctim_tv_nsec" = xyes; then :
++if test "x$ac_cv_member_struct_stat_st_ctim_tv_nsec" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1
+@@ -13150,7 +12395,7 @@
+ set dummy gtkdoc-check; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_CHECK in
+@@ -13192,7 +12437,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_REBASE+:} false; then :
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_REBASE in
+@@ -13236,7 +12481,7 @@
+ set dummy gtkdoc-mkpdf; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_MKPDF+:} false; then :
++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_MKPDF in
+@@ -13441,7 +12686,6 @@
Alternatively, you may set the environment variables GLIB_CFLAGS
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4324,7 +8112,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -12796,8 +12700,7 @@
+@@ -13456,8 +12700,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4334,7 +8122,7 @@
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
-@@ -12873,7 +12776,6 @@
+@@ -13533,7 +12776,6 @@
Alternatively, you may set the environment variables DBUS_CFLAGS
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4342,7 +8130,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -12888,8 +12790,7 @@
+@@ -13548,8 +12790,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4352,7 +8140,327 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
-@@ -14463,7 +14364,6 @@
+@@ -13615,7 +12856,7 @@
+ set dummy intltool-update; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_UPDATE in
+@@ -13655,7 +12896,7 @@
+ set dummy intltool-merge; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_MERGE in
+@@ -13695,7 +12936,7 @@
+ set dummy intltool-extract; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_EXTRACT in
+@@ -13856,7 +13097,7 @@
+ set dummy xgettext; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_XGETTEXT+:} false; then :
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XGETTEXT in
+@@ -13896,7 +13137,7 @@
+ set dummy msgmerge; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_MSGMERGE+:} false; then :
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGMERGE in
+@@ -13936,7 +13177,7 @@
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_MSGFMT+:} false; then :
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGFMT in
+@@ -13976,7 +13217,7 @@
+ set dummy gmsgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GMSGFMT+:} false; then :
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -14027,7 +13268,7 @@
+ set dummy perl; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_PERL in
+@@ -14111,7 +13352,7 @@
+ case $host in
+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ DATADIRNAME=share
+ else
+ DATADIRNAME=lib
+@@ -14143,7 +13384,7 @@
+ for ac_header in locale.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+-if test "x$ac_cv_header_locale_h" = xyes; then :
++if test "x$ac_cv_header_locale_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LOCALE_H 1
+ _ACEOF
+@@ -14155,7 +13396,7 @@
+ if test $ac_cv_header_locale_h = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+ $as_echo_n "checking for LC_MESSAGES... " >&6; }
+-if ${am_cv_val_LC_MESSAGES+:} false; then :
++if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -14195,7 +13436,7 @@
+ INTLLIBS=
+
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libintl_h" = xyes; then :
++if test "x$ac_cv_header_libintl_h" = x""yes; then :
+ gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
+
+@@ -14204,7 +13445,7 @@
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
+ $as_echo_n "checking for ngettext in libc... " >&6; }
+-if ${gt_cv_func_ngettext_libc+:} false; then :
++if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -14235,7 +13476,7 @@
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+ $as_echo_n "checking for dgettext in libc... " >&6; }
+-if ${gt_cv_func_dgettext_libc+:} false; then :
++if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -14268,7 +13509,7 @@
+ for ac_func in bind_textdomain_codeset
+ do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+@@ -14287,7 +13528,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+ $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14321,10 +13562,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if ${ac_cv_lib_intl_ngettext+:} false; then :
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14358,10 +13599,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
+-if ${ac_cv_lib_intl_dgettext+:} false; then :
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14395,7 +13636,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ fi
+
+@@ -14411,7 +13652,7 @@
+ $as_echo "" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if ${ac_cv_lib_intl_ngettext+:} false; then :
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14445,10 +13686,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
+-if ${ac_cv_lib_intl_dcgettext+:} false; then :
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14482,7 +13723,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -14507,7 +13748,7 @@
+ for ac_func in bind_textdomain_codeset
+ do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+@@ -14545,7 +13786,7 @@
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_MSGFMT+:} false; then :
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$MSGFMT" in
+@@ -14582,7 +13823,7 @@
+ for ac_func in dcgettext
+ do :
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+-if test "x$ac_cv_func_dcgettext" = xyes; then :
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DCGETTEXT 1
+ _ACEOF
+@@ -14623,7 +13864,7 @@
+ set dummy gmsgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GMSGFMT+:} false; then :
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -14664,7 +13905,7 @@
+ set dummy xgettext; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_XGETTEXT+:} false; then :
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$XGETTEXT" in
+@@ -14715,7 +13956,7 @@
+ case $host in
+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+@@ -14856,7 +14097,7 @@
+ set dummy ssh; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_SSH_PROGRAM+:} false; then :
++if test "${ac_cv_path_SSH_PROGRAM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $SSH_PROGRAM in
+@@ -14926,12 +14167,12 @@
+ # Pull in the right libraries for various functions which might not be
+ # bundled into an exploded libc.
+ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
+-if test "x$ac_cv_func_socketpair" = xyes; then :
++if test "x$ac_cv_func_socketpair" = x""yes; then :
+ have_socketpair=1
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
+ $as_echo_n "checking for socketpair in -lsocket... " >&6; }
+-if ${ac_cv_lib_socket_socketpair+:} false; then :
++if test "${ac_cv_lib_socket_socketpair+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14965,7 +14206,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5
+ $as_echo "$ac_cv_lib_socket_socketpair" >&6; }
+-if test "x$ac_cv_lib_socket_socketpair" = xyes; then :
++if test "x$ac_cv_lib_socket_socketpair" = x""yes; then :
+ have_socketpair=1; LIBS="$LIBS -lsocket"
+ fi
+
+@@ -14979,7 +14220,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
+ $as_echo_n "checking for library containing login_tty... " >&6; }
+-if ${ac_cv_search_login_tty+:} false; then :
++if test "${ac_cv_search_login_tty+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+@@ -15013,11 +14254,11 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+- if ${ac_cv_search_login_tty+:} false; then :
++ if test "${ac_cv_search_login_tty+set}" = set; then :
+ break
+ fi
+ done
+-if ${ac_cv_search_login_tty+:} false; then :
++if test "${ac_cv_search_login_tty+set}" = set; then :
+
+ else
+ ac_cv_search_login_tty=no
+@@ -15123,7 +14364,6 @@
Alternatively, you may set the environment variables HTTP_CFLAGS
and HTTP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4360,7 +8468,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -14478,8 +14378,7 @@
+@@ -15138,8 +14378,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4370,7 +8478,7 @@
else
HTTP_CFLAGS=$pkg_cv_HTTP_CFLAGS
HTTP_LIBS=$pkg_cv_HTTP_LIBS
-@@ -14800,7 +14699,6 @@
+@@ -15460,7 +14699,6 @@
Alternatively, you may set the environment variables UDEV_CFLAGS
and UDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4378,7 +8486,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -14815,8 +14713,7 @@
+@@ -15475,8 +14713,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4388,7 +8496,7 @@
else
UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
UDEV_LIBS=$pkg_cv_UDEV_LIBS
-@@ -14917,7 +14814,6 @@
+@@ -15577,7 +14814,6 @@
Alternatively, you may set the environment variables FUSE_CFLAGS
and FUSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4396,7 +8504,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -14932,8 +14828,7 @@
+@@ -15592,8 +14828,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4406,7 +8514,30 @@
else
FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS
FUSE_LIBS=$pkg_cv_FUSE_LIBS
-@@ -15111,7 +15006,6 @@
+@@ -15619,7 +14854,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate_MM in -lexpat" >&5
+ $as_echo_n "checking for XML_ParserCreate_MM in -lexpat... " >&6; }
+-if ${ac_cv_lib_expat_XML_ParserCreate_MM+:} false; then :
++if test "${ac_cv_lib_expat_XML_ParserCreate_MM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15653,11 +14888,11 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate_MM" >&5
+ $as_echo "$ac_cv_lib_expat_XML_ParserCreate_MM" >&6; }
+-if test "x$ac_cv_lib_expat_XML_ParserCreate_MM" = xyes; then :
++if test "x$ac_cv_lib_expat_XML_ParserCreate_MM" = x""yes; then :
+ for ac_header in expat.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
+-if test "x$ac_cv_header_expat_h" = xyes; then :
++if test "x$ac_cv_header_expat_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_EXPAT_H 1
+ _ACEOF
+@@ -15771,7 +15006,6 @@
Alternatively, you may set the environment variables GDU_CFLAGS
and GDU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4414,7 +8545,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15126,8 +15020,7 @@
+@@ -15786,8 +15020,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4424,7 +8555,7 @@
else
GDU_CFLAGS=$pkg_cv_GDU_CFLAGS
GDU_LIBS=$pkg_cv_GDU_LIBS
-@@ -15239,7 +15132,6 @@
+@@ -15899,7 +15132,6 @@
Alternatively, you may set the environment variables HAL_CFLAGS
and HAL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4432,7 +8563,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15254,8 +15146,7 @@
+@@ -15914,8 +15146,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4442,7 +8573,25 @@
else
HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
HAL_LIBS=$pkg_cv_HAL_LIBS
-@@ -15412,7 +15303,6 @@
+@@ -15930,7 +15161,7 @@
+ LIBS="$HAL_LIBS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal_get_all_devices_with_properties in -lhal" >&5
+ $as_echo_n "checking for libhal_get_all_devices_with_properties in -lhal... " >&6; }
+-if ${ac_cv_lib_hal_libhal_get_all_devices_with_properties+:} false; then :
++if test "${ac_cv_lib_hal_libhal_get_all_devices_with_properties+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15964,7 +15195,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hal_libhal_get_all_devices_with_properties" >&5
+ $as_echo "$ac_cv_lib_hal_libhal_get_all_devices_with_properties" >&6; }
+-if test "x$ac_cv_lib_hal_libhal_get_all_devices_with_properties" = xyes; then :
++if test "x$ac_cv_lib_hal_libhal_get_all_devices_with_properties" = x""yes; then :
+ have_hal_fast_init=yes
+ fi
+
+@@ -16072,7 +15303,6 @@
Alternatively, you may set the environment variables GUDEV_CFLAGS
and GUDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4450,7 +8599,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15427,8 +15317,7 @@
+@@ -16087,8 +15317,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4460,7 +8609,7 @@
else
GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS
GUDEV_LIBS=$pkg_cv_GUDEV_LIBS
-@@ -15547,7 +15436,6 @@
+@@ -16207,7 +15436,6 @@
Alternatively, you may set the environment variables CDDA_CFLAGS
and CDDA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4468,7 +8617,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15562,8 +15450,7 @@
+@@ -16222,8 +15450,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4478,7 +8627,7 @@
else
CDDA_CFLAGS=$pkg_cv_CDDA_CFLAGS
CDDA_LIBS=$pkg_cv_CDDA_LIBS
-@@ -15673,7 +15560,6 @@
+@@ -16333,7 +15560,6 @@
Alternatively, you may set the environment variables AFC_CFLAGS
and AFC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4486,7 +8635,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15688,8 +15574,7 @@
+@@ -16348,8 +15574,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4496,7 +8645,7 @@
else
AFC_CFLAGS=$pkg_cv_AFC_CFLAGS
AFC_LIBS=$pkg_cv_AFC_LIBS
-@@ -15802,7 +15687,6 @@
+@@ -16462,7 +15687,6 @@
Alternatively, you may set the environment variables OBEXFTP_CFLAGS
and OBEXFTP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4504,7 +8653,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15817,8 +15701,7 @@
+@@ -16477,8 +15701,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4514,7 +8663,7 @@
else
OBEXFTP_CFLAGS=$pkg_cv_OBEXFTP_CFLAGS
OBEXFTP_LIBS=$pkg_cv_OBEXFTP_LIBS
-@@ -15945,7 +15828,6 @@
+@@ -16605,7 +15828,6 @@
Alternatively, you may set the environment variables GPHOTO2_CFLAGS
and GPHOTO2_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4522,7 +8671,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -15960,8 +15842,7 @@
+@@ -16620,8 +15842,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4532,7 +8681,7 @@
else
GPHOTO2_CFLAGS=$pkg_cv_GPHOTO2_CFLAGS
GPHOTO2_LIBS=$pkg_cv_GPHOTO2_LIBS
-@@ -16076,7 +15957,6 @@
+@@ -16736,7 +15957,6 @@
Alternatively, you may set the environment variables KEYRING_CFLAGS
and KEYRING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -4540,7 +8689,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -16091,8 +15971,7 @@
+@@ -16751,8 +15971,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -4550,7 +8699,193 @@
else
KEYRING_CFLAGS=$pkg_cv_KEYRING_CFLAGS
KEYRING_LIBS=$pkg_cv_KEYRING_LIBS
-@@ -16932,6 +16811,10 @@
+@@ -16797,7 +16016,7 @@
+
+ CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
+ ac_fn_c_check_header_mongrel "$LINENO" "libsmbclient.h" "ac_cv_header_libsmbclient_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libsmbclient_h" = xyes; then :
++if test "x$ac_cv_header_libsmbclient_h" = x""yes; then :
+ samba_includes="yes"
+ fi
+
+@@ -16815,7 +16034,7 @@
+ CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
+ ac_fn_c_check_member "$LINENO" "SMBCCTX" "flags" "ac_cv_member_SMBCCTX_flags" "#include <libsmbclient.h>
+ "
+-if test "x$ac_cv_member_SMBCCTX_flags" = xyes; then :
++if test "x$ac_cv_member_SMBCCTX_flags" = x""yes; then :
+
+ $as_echo "#define HAVE_SAMBA_FLAGS /**/" >>confdefs.h
+
+@@ -16823,7 +16042,7 @@
+
+ ac_fn_c_check_member "$LINENO" "SMBCCTX" "close" "ac_cv_member_SMBCCTX_close" "#include <libsmbclient.h>
+ "
+-if test "x$ac_cv_member_SMBCCTX_close" = xyes; then :
++if test "x$ac_cv_member_SMBCCTX_close" = x""yes; then :
+
+ $as_echo "#define HAVE_SAMBA_OLD_CLOSE /**/" >>confdefs.h
+
+@@ -16848,7 +16067,7 @@
+ LDFLAGS="$LDFLAGS -L$with_samba_libs"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smbc_option_get in -lsmbclient" >&5
+ $as_echo_n "checking for smbc_option_get in -lsmbclient... " >&6; }
+-if ${ac_cv_lib_smbclient_smbc_option_get+:} false; then :
++if test "${ac_cv_lib_smbclient_smbc_option_get+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16882,7 +16101,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smbclient_smbc_option_get" >&5
+ $as_echo "$ac_cv_lib_smbclient_smbc_option_get" >&6; }
+-if test "x$ac_cv_lib_smbclient_smbc_option_get" = xyes; then :
++if test "x$ac_cv_lib_smbclient_smbc_option_get" = x""yes; then :
+ samba_libs="yes"
+ else
+ samba_libs="no"
+@@ -16901,7 +16120,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smbc_getFunctionStatVFS in -lsmbclient" >&5
+ $as_echo_n "checking for smbc_getFunctionStatVFS in -lsmbclient... " >&6; }
+-if ${ac_cv_lib_smbclient_smbc_getFunctionStatVFS+:} false; then :
++if test "${ac_cv_lib_smbclient_smbc_getFunctionStatVFS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16935,7 +16154,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smbclient_smbc_getFunctionStatVFS" >&5
+ $as_echo "$ac_cv_lib_smbclient_smbc_getFunctionStatVFS" >&6; }
+-if test "x$ac_cv_lib_smbclient_smbc_getFunctionStatVFS" = xyes; then :
++if test "x$ac_cv_lib_smbclient_smbc_getFunctionStatVFS" = x""yes; then :
+
+ $as_echo "#define HAVE_SAMBA_STAT_VFS /**/" >>confdefs.h
+
+@@ -16944,7 +16163,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smbc_new_context in -lsmbclient" >&5
+ $as_echo_n "checking for smbc_new_context in -lsmbclient... " >&6; }
+-if ${ac_cv_lib_smbclient_smbc_new_context+:} false; then :
++if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -16978,7 +16197,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smbclient_smbc_new_context" >&5
+ $as_echo "$ac_cv_lib_smbclient_smbc_new_context" >&6; }
+-if test "x$ac_cv_lib_smbclient_smbc_new_context" = xyes; then :
++if test "x$ac_cv_lib_smbclient_smbc_new_context" = x""yes; then :
+ samba_old_libs="yes"
+ else
+ samba_old_libs="no"
+@@ -17030,7 +16249,7 @@
+
+ CPPFLAGS="$CPPFLAGS -I$with_archive_includes"
+ ac_fn_c_check_header_mongrel "$LINENO" "archive.h" "ac_cv_header_archive_h" "$ac_includes_default"
+-if test "x$ac_cv_header_archive_h" = xyes; then :
++if test "x$ac_cv_header_archive_h" = x""yes; then :
+ archive_includes="yes"
+ fi
+
+@@ -17062,7 +16281,7 @@
+ LDFLAGS="$LDFLAGS -L$with_archive_libs"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5
+ $as_echo_n "checking for archive_entry_filetype in -larchive... " >&6; }
+-if ${ac_cv_lib_archive_archive_entry_filetype+:} false; then :
++if test "${ac_cv_lib_archive_archive_entry_filetype+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -17096,7 +16315,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_archive_archive_entry_filetype" >&5
+ $as_echo "$ac_cv_lib_archive_archive_entry_filetype" >&6; }
+-if test "x$ac_cv_lib_archive_archive_entry_filetype" = xyes; then :
++if test "x$ac_cv_lib_archive_archive_entry_filetype" = x""yes; then :
+ archive_libs="yes"
+ else
+ archive_libs="no"
+@@ -17116,7 +16335,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5
+ $as_echo_n "checking for archive_entry_filetype in -larchive... " >&6; }
+-if ${ac_cv_lib_archive_archive_entry_filetype+:} false; then :
++if test "${ac_cv_lib_archive_archive_entry_filetype+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -17150,7 +16369,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_archive_archive_entry_filetype" >&5
+ $as_echo "$ac_cv_lib_archive_archive_entry_filetype" >&6; }
+-if test "x$ac_cv_lib_archive_archive_entry_filetype" = xyes; then :
++if test "x$ac_cv_lib_archive_archive_entry_filetype" = x""yes; then :
+ archive_old_libs="yes"
+ else
+ archive_old_libs="no"
+@@ -17224,7 +16443,7 @@
+ set dummy glib-genmarshal; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then :
++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GLIB_GENMARSHAL in
+@@ -17300,7 +16519,7 @@
+ #include <sys/mount.h>
+ #endif
+ "
+-if test "x$ac_cv_member_struct_statfs_f_fstypename" = xyes; then :
++if test "x$ac_cv_member_struct_statfs_f_fstypename" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STATFS_F_FSTYPENAME 1
+@@ -17321,7 +16540,7 @@
+ #include <sys/mount.h>
+ #endif
+ "
+-if test "x$ac_cv_member_struct_statfs_f_bavail" = xyes; then :
++if test "x$ac_cv_member_struct_statfs_f_bavail" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STATFS_F_BAVAIL 1
+@@ -17333,7 +16552,7 @@
+ # struct statvfs.f_basetype is available on Solaris but not for Linux.
+ ac_fn_c_check_member "$LINENO" "struct statvfs" "f_basetype" "ac_cv_member_struct_statvfs_f_basetype" "#include <sys/statvfs.h>
+ "
+-if test "x$ac_cv_member_struct_statvfs_f_basetype" = xyes; then :
++if test "x$ac_cv_member_struct_statvfs_f_basetype" = x""yes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STATVFS_F_BASETYPE 1
+@@ -17550,21 +16769,10 @@
+ :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+- if test "x$cache_file" != "x/dev/null"; then
++ test "x$cache_file" != "x/dev/null" &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+- if test ! -f "$cache_file" || test -h "$cache_file"; then
+- cat confcache >"$cache_file"
+- else
+- case $cache_file in #(
+- */* | ?:*)
+- mv -f confcache "$cache_file"$$ &&
+- mv -f "$cache_file"$$ "$cache_file" ;; #(
+- *)
+- mv -f confcache "$cache_file" ;;
+- esac
+- fi
+- fi
++ cat confcache >$cache_file
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -17603,6 +16811,10 @@
am__EXEEXT_FALSE=
fi
@@ -4561,51 +8896,42 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -17457,7 +17340,7 @@
+@@ -17720,7 +16932,7 @@
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+-: "${CONFIG_STATUS=./config.status}"
++: ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -17821,7 +17033,6 @@
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+-as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -18129,7 +17340,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
--generated by GNU Autoconf 2.66. Invocation command line was
+-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17523,7 +17406,7 @@
+@@ -18195,7 +17406,7 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
--configured by $0, generated by GNU Autoconf 2.66,
+-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -17544,11 +17427,16 @@
- while test $# != 0
- do
- case $1 in
-- --*=*)
-+ --*=?*)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-+ --*=)
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=
-+ ac_shift=:
-+ ;;
- *)
- ac_option=$1
- ac_optarg=$2
-@@ -17570,6 +17458,7 @@
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ '') as_fn_error $? "missing file argument" ;;
- esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
- ac_need_defaults=false;;
-@@ -17645,143 +17534,131 @@
+@@ -18323,153 +17534,131 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -4637,13 +8963,20 @@
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
@@ -4658,14 +8991,17 @@
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
--lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
@@ -4698,12 +9034,12 @@
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
--fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
@@ -4868,16 +9204,47 @@
GREP \
EGREP \
FGREP \
-@@ -17805,6 +17682,8 @@
+@@ -18482,13 +17671,8 @@
+ OBJDUMP \
+ deplibs_check_method \
+ file_magic_cmd \
+-file_magic_glob \
+-want_nocaseglob \
+-DLLTOOL \
+-sharedlib_from_linklib_cmd \
+ AR \
+ AR_FLAGS \
+-archiver_list_spec \
+ STRIP \
+ RANLIB \
+ CC \
+@@ -18498,14 +17682,14 @@
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+-nm_file_list_spec \
+SHELL \
+ECHO \
lt_prog_compiler_no_builtin_flag \
+-lt_prog_compiler_pic \
lt_prog_compiler_wl \
- lt_prog_compiler_pic \
-@@ -17834,13 +17713,12 @@
++lt_prog_compiler_pic \
+ lt_prog_compiler_static \
+ lt_cv_prog_compiler_c_o \
+ need_locks \
+-MANIFEST_TOOL \
+ DSYMUTIL \
+ NMEDIT \
+ LIPO \
+@@ -18521,6 +17705,7 @@
+ hardcode_libdir_flag_spec \
+ hardcode_libdir_flag_spec_ld \
+ hardcode_libdir_separator \
++fix_srcfile_path \
+ exclude_expsyms \
+ include_expsyms \
+ file_list_spec \
+@@ -18528,13 +17713,12 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -4893,7 +9260,13 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17867,9 +17745,9 @@
+@@ -18556,15 +17740,14 @@
+ module_expsym_cmds \
+ export_symbols_cmds \
+ prelink_cmds \
+-postlink_cmds \
+ postinstall_cmds \
+ postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
@@ -4905,7 +9278,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -17877,6 +17755,12 @@
+@@ -18572,6 +17755,12 @@
esac
done
@@ -4918,7 +9291,7 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -17927,7 +17811,7 @@
+@@ -18622,7 +17811,7 @@
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -4927,7 +9300,91 @@
esac
done
-@@ -18243,7 +18127,7 @@
+@@ -18645,10 +17834,9 @@
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+- tmp= ac_tmp=
++ tmp=
+ trap 'exit_status=$?
+- : "${ac_tmp:=$tmp}"
+- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ ' 0
+ trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -18656,13 +17844,12 @@
+
+ {
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+- test -d "$tmp"
++ test -n "$tmp" && test -d "$tmp"
+ } ||
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+ } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+-ac_tmp=$tmp
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -18684,7 +17871,7 @@
+ ac_cs_awk_cr=$ac_cr
+ fi
+
+-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
++echo 'BEGIN {' >"$tmp/subs1.awk" &&
+ _ACEOF
+
+
+@@ -18712,7 +17899,7 @@
+ rm -f conf$$subs.sh
+
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -18760,7 +17947,7 @@
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+
+@@ -18792,7 +17979,7 @@
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+ cat
+-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+@@ -18826,7 +18013,7 @@
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
++cat >"$tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+
+@@ -18838,8 +18025,8 @@
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+- if test -z "$ac_tt"; then
++ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
++ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+@@ -18940,7 +18127,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -4936,7 +9393,16 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -18271,7 +18155,7 @@
+@@ -18959,7 +18146,7 @@
+ for ac_f
+ do
+ case $ac_f in
+- -) ac_f="$ac_tmp/stdin";;
++ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+@@ -18968,7 +18155,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -4945,16 +9411,74 @@
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -18298,7 +18182,7 @@
+@@ -18994,8 +18181,8 @@
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
+- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
-@@ -18634,8 +18518,7 @@
+@@ -19131,22 +18318,21 @@
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+- "$ac_tmp/out"`; test -z "$ac_out"; } &&
++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined. Please make sure it is defined" >&2;}
+
+- rm -f "$ac_tmp/stdin"
++ rm -f "$tmp/stdin"
+ case $ac_file in
+- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
++ -) cat "$tmp/out" && rm -f "$tmp/out";;
++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+@@ -19157,20 +18343,20 @@
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+- } >"$ac_tmp/config.h" \
++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
++ } >"$tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+- mv "$ac_tmp/config.h" "$ac_file" \
++ mv "$tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+@@ -19332,8 +18518,7 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -4964,7 +9488,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -18683,12 +18566,6 @@
+@@ -19381,12 +18566,6 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -4977,18 +9501,54 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -18738,6 +18615,10 @@
+@@ -19436,11 +18615,9 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
+-# convert \$build file names to \$host format.
+-to_host_file_cmd=$lt_cv_to_host_file_cmd
+-
+-# convert \$build files to toolchain format.
+-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
-+
+
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
-
-@@ -18759,9 +18640,6 @@
+@@ -19448,30 +18625,13 @@
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+
+-# Command to use when deplibs_check_method = "file_magic".
++# Command to use when deplibs_check_method == "file_magic".
+ file_magic_cmd=$lt_file_magic_cmd
+
+-# How to find potential files when deplibs_check_method = "file_magic".
+-file_magic_glob=$lt_file_magic_glob
+-
+-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+-want_nocaseglob=$lt_want_nocaseglob
+-
+-# DLL creation program.
+-DLLTOOL=$lt_DLLTOOL
+-
+-# Command to associate shared and link libraries.
+-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+-
+ # The archiver.
+ AR=$lt_AR
+-
+-# Flags to create an archive.
+ AR_FLAGS=$lt_AR_FLAGS
+
+-# How to feed a file listing to the archiver.
+-archiver_list_spec=$lt_archiver_list_spec
+-
+ # A symbol stripping program.
+ STRIP=$lt_STRIP
+
+@@ -19480,9 +18640,6 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -4998,7 +9558,16 @@
# A C compiler.
LTCC=$lt_CC
-@@ -18783,6 +18661,12 @@
+@@ -19501,24 +18658,21 @@
+ # Transform the output of nm in a C name address pair when lib prefix is needed.
+ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+-# Specify filename containing input files for \$NM.
+-nm_file_list_spec=$lt_nm_file_list_spec
+-
+-# The root where to search for dependent libraries,and in which our libraries should be installed.
+-lt_sysroot=$lt_sysroot
+-
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -5011,7 +9580,16 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -18845,9 +18729,6 @@
+ # Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+-# Manifest tool.
+-MANIFEST_TOOL=$lt_MANIFEST_TOOL
+-
+ # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+ DSYMUTIL=$lt_DSYMUTIL
+
+@@ -19575,9 +18729,6 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -5021,7 +9599,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -18887,10 +18768,6 @@
+@@ -19617,10 +18768,6 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -5032,62 +9610,415 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -19150,7 +19027,7 @@
- func_dirname ()
- {
- # Extract subdirectory from the argument.
-- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+@@ -19633,12 +18780,12 @@
+ # Compiler flag to turn off builtin functions.
+ no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic
+-
+ # How to pass a linker flag through the compiler.
+ wl=$lt_lt_prog_compiler_wl
+
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
++
+ # Compiler flag to prevent dynamic linking.
+ link_static_flag=$lt_lt_prog_compiler_static
+
+@@ -19725,6 +18872,9 @@
+ # Whether libtool must link a program against all its dependency libraries.
+ link_all_deplibs=$link_all_deplibs
+
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path=$lt_fix_srcfile_path
++
+ # Set to "yes" if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+
+@@ -19740,9 +18890,6 @@
+ # Commands necessary for linking programs (against libraries) with templates.
+ prelink_cmds=$lt_prelink_cmds
+
+-# Commands necessary for finishing linking programs.
+-postlink_cmds=$lt_postlink_cmds
+-
+ # Specify filename containing input files.
+ file_list_spec=$lt_file_list_spec
+
+@@ -19775,169 +18922,212 @@
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+- sed '$q' "$ltmain" >> "$cfgfile" \
+- || (rm -f "$cfgfile"; exit 1)
++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
++ || (rm -f "$cfgfile"; exit 1)
++
++ case $xsi_shell in
++ yes)
++ cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac
++}
++
++# func_basename file
++func_basename ()
++{
++ func_basename_result="${1##*/}"
++}
++
++# func_dirname_and_basename file append nondir_replacement
++# perform func_basename and func_dirname in a single function
++# call:
++# dirname: Compute the dirname of FILE. If nonempty,
++# add APPEND to the result, otherwise set result
++# to NONDIR_REPLACEMENT.
++# value returned in "$func_dirname_result"
++# basename: Compute filename of FILE.
++# value retuned in "$func_basename_result"
++# Implementation must be kept synchronized with func_dirname
++# and func_basename. For efficiency, we do not delegate to
++# those functions but instead duplicate the functionality here.
++func_dirname_and_basename ()
++{
++ case ${1} in
++ */*) func_dirname_result="${1%/*}${2}" ;;
++ * ) func_dirname_result="${3}" ;;
++ esac
++ func_basename_result="${1##*/}"
++}
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++func_stripname ()
++{
++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
++ # positional parameters, so assign one to ordinary parameter first.
++ func_stripname_result=${3}
++ func_stripname_result=${func_stripname_result#"${1}"}
++ func_stripname_result=${func_stripname_result%"${2}"}
++}
++
++# func_opt_split
++func_opt_split ()
++{
++ func_opt_split_opt=${1%%=*}
++ func_opt_split_arg=${1#*=}
++}
++
++# func_lo2o object
++func_lo2o ()
++{
++ case ${1} in
++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
++ *) func_lo2o_result=${1} ;;
++ esac
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
++ func_xform_result=${1%.*}.lo
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=$(( $* ))
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=${#1}
++}
++
++_LT_EOF
++ ;;
++ *) # Bourne compatible functions.
++ cat << \_LT_EOF >> "$cfgfile"
++
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE. If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
-@@ -19161,7 +19038,7 @@
- # func_basename file
- func_basename ()
- {
-- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++}
++
++# func_basename file
++func_basename ()
++{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
- }
-
-
-@@ -19174,8 +19051,10 @@
- func_stripname ()
- {
- case ${2} in
-- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++}
++
++
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
- }
-
-@@ -19186,20 +19065,20 @@
- # func_opt_split
- func_opt_split ()
- {
-- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
++ esac
++}
++
++# sed scripts:
++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
++my_sed_long_arg='1s/^-[^=]*=//'
++
++# func_opt_split
++func_opt_split ()
++{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
- }
-
- # func_lo2o object
- func_lo2o ()
- {
-- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++}
++
++# func_lo2o object
++func_lo2o ()
++{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
- }
-
- # func_xform libobj-or-source
- func_xform ()
- {
-- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++}
++
++# func_xform libobj-or-source
++func_xform ()
++{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
- }
-
- # func_arith arithmetic-term...
++}
++
++# func_arith arithmetic-term...
++func_arith ()
++{
++ func_arith_result=`expr "$@"`
++}
++
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
++}
++
++_LT_EOF
++esac
++
++case $lt_shell_append in
++ yes)
++ cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "$1+=\$2"
++}
++_LT_EOF
++ ;;
++ *)
++ cat << \_LT_EOF >> "$cfgfile"
++
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++ eval "$1=\$$1\$2"
++}
++
++_LT_EOF
++ ;;
++ esac
+
+- if test x"$xsi_shell" = xyes; then
+- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+-func_dirname ()\
+-{\
+-\ case ${1} in\
+-\ */*) func_dirname_result="${1%/*}${2}" ;;\
+-\ * ) func_dirname_result="${3}" ;;\
+-\ esac\
+-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_basename ()$/,/^} # func_basename /c\
+-func_basename ()\
+-{\
+-\ func_basename_result="${1##*/}"\
+-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+-func_dirname_and_basename ()\
+-{\
+-\ case ${1} in\
+-\ */*) func_dirname_result="${1%/*}${2}" ;;\
+-\ * ) func_dirname_result="${3}" ;;\
+-\ esac\
+-\ func_basename_result="${1##*/}"\
+-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+-func_stripname ()\
+-{\
+-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+-\ # positional parameters, so assign one to ordinary parameter first.\
+-\ func_stripname_result=${3}\
+-\ func_stripname_result=${func_stripname_result#"${1}"}\
+-\ func_stripname_result=${func_stripname_result%"${2}"}\
+-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+-func_split_long_opt ()\
+-{\
+-\ func_split_long_opt_name=${1%%=*}\
+-\ func_split_long_opt_arg=${1#*=}\
+-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+-func_split_short_opt ()\
+-{\
+-\ func_split_short_opt_arg=${1#??}\
+-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+-func_lo2o ()\
+-{\
+-\ case ${1} in\
+-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+-\ *) func_lo2o_result=${1} ;;\
+-\ esac\
+-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_xform ()$/,/^} # func_xform /c\
+-func_xform ()\
+-{\
+- func_xform_result=${1%.*}.lo\
+-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_arith ()$/,/^} # func_arith /c\
+-func_arith ()\
+-{\
+- func_arith_result=$(( $* ))\
+-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_len ()$/,/^} # func_len /c\
+-func_len ()\
+-{\
+- func_len_result=${#1}\
+-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-fi
+-
+-if test x"$lt_shell_append" = xyes; then
+- sed -e '/^func_append ()$/,/^} # func_append /c\
+-func_append ()\
+-{\
+- eval "${1}+=\\${2}"\
+-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+-func_append_quoted ()\
+-{\
+-\ func_quote_for_eval "${2}"\
+-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+-test 0 -eq $? || _lt_function_replace_fail=:
+-
+-
+- # Save a `func_append' function call where possible by direct use of '+='
+- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+- test 0 -eq $? || _lt_function_replace_fail=:
+-else
+- # Save a `func_append' function call even when '+=' is not available
+- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+- && mv -f "$cfgfile.tmp" "$cfgfile" \
+- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+- test 0 -eq $? || _lt_function_replace_fail=:
+-fi
+-
+-if test x"$_lt_function_replace_fail" = x":"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+-fi
+
++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
++ || (rm -f "$cfgfile"; exit 1)
+
+- mv -f "$cfgfile" "$ofile" ||
++ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
@@ -80,34 +80,66 @@
@@ -5241,15 +10172,33 @@
DATA = $(gvfs_gschemas_convert_DATA) $(mount_DATA) $(service_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-@@ -450,6 +457,7 @@
+@@ -390,7 +397,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -451,8 +457,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -530,6 +538,7 @@
+ MSGFMT = @MSGFMT@
+@@ -498,7 +504,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -533,6 +538,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -5257,7 +10206,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -561,13 +570,14 @@
+@@ -564,13 +570,14 @@
-DLIBEXEC_DIR=\"$(libexecdir)/\" \
-DMOUNTABLE_DIR=\"$(mountdir)/\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -5276,7 +10225,7 @@
gvfs_gschemas = $(am__append_6) $(am__append_16)
gvfs_gschemas_convert = $(am__append_7) $(am__append_17)
-@@ -600,7 +610,7 @@
+@@ -603,7 +610,7 @@
$(gsettings__enum_file) \
*.gschema.valid
@@ -5285,7 +10234,7 @@
gvfsdaemon.c gvfsdaemon.h \
gvfsbackend.c gvfsbackend.h \
gvfschannel.c gvfschannel.h \
-@@ -648,6 +658,11 @@
+@@ -651,6 +658,11 @@
gvfskeyring.h gvfskeyring.c \
$(NULL)
@@ -5297,7 +10246,7 @@
gvfsd_SOURCES = \
mount.c mount.h \
main.c
-@@ -898,7 +913,7 @@
+@@ -901,7 +913,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -5306,7 +10255,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -923,22 +938,44 @@
+@@ -926,22 +938,44 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -5358,7 +10307,7 @@
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-@@ -2548,7 +2585,7 @@
+@@ -2551,7 +2585,7 @@
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
@@ -5367,7 +10316,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
-@@ -2583,7 +2620,7 @@
+@@ -2586,7 +2620,7 @@
clean: clean-recursive
clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \
@@ -5376,7 +10325,7 @@
distclean: distclean-recursive
-rm -rf ./$(DEPDIR)
-@@ -2604,7 +2641,7 @@
+@@ -2607,7 +2641,7 @@
info-am:
install-data-am: install-gvfs_gschemas_convertDATA install-mountDATA \
@@ -5385,7 +10334,7 @@
install-dvi: install-dvi-recursive
-@@ -2652,7 +2689,7 @@
+@@ -2655,7 +2689,7 @@
uninstall-am: uninstall-gvfs_gschemas_convertDATA \
uninstall-libexecPROGRAMS uninstall-mountDATA \
@@ -5394,7 +10343,7 @@
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
ctags-recursive install install-am install-strip \
-@@ -2660,8 +2697,8 @@
+@@ -2663,8 +2697,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic \
@@ -5405,7 +10354,7 @@
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
-@@ -2669,13 +2706,15 @@
+@@ -2672,13 +2706,15 @@
install-gvfs_gschemas_convertDATA install-html install-html-am \
install-info install-info-am install-libexecPROGRAMS \
install-man install-mountDATA install-pdf install-pdf-am \
@@ -5438,15 +10387,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -183,6 +183,7 @@
+@@ -123,7 +123,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -184,8 +183,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -263,6 +264,7 @@
+ MSGFMT = @MSGFMT@
+@@ -231,7 +230,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -266,6 +264,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -5454,7 +10421,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -296,7 +298,7 @@
+@@ -299,7 +298,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -5463,7 +10430,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -321,9 +323,9 @@
+@@ -324,9 +323,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -5710,10 +10677,10 @@
+.PHONY : dist-hook-local docs
--- a/ltmain.sh
+++ b/ltmain.sh
-@@ -1,10 +1,9 @@
- # Generated from ltmain.m4sh.
-
--# libtool (GNU libtool) 2.2.10
+@@ -1,9 +1,9 @@
++# Generated from ltmain.m4sh.
+
+-# libtool (GNU libtool) 2.4
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
@@ -5723,7 +10690,7 @@
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-@@ -33,54 +32,50 @@
+@@ -32,56 +32,50 @@
#
# Provide generalized library-building support services.
#
@@ -5783,7 +10750,7 @@
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.10
+-# $progname: (GNU libtool) 2.4
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
@@ -5796,19 +10763,21 @@
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
+-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-PROGRAM=libtool
+PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION=2.2.10
+-VERSION=2.4
+VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
--package_revision=1.3175
+-package_revision=1.3293
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -96,15 +91,10 @@
+@@ -97,15 +91,10 @@
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
@@ -5827,7 +10796,7 @@
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -117,24 +107,15 @@
+@@ -118,24 +107,15 @@
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
@@ -5853,23 +10822,64 @@
: ${EGREP="/bin/grep -E"}
: ${FGREP="/bin/grep -F"}
: ${GREP="/bin/grep"}
-@@ -178,168 +159,32 @@
+@@ -164,27 +144,6 @@
+ dirname="s,/[^/]*$,,"
+ basename="s,^.*/,,"
+
+-# func_dirname file append nondir_replacement
+-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+-# otherwise set result to NONDIR_REPLACEMENT.
+-func_dirname ()
+-{
+- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+- if test "X$func_dirname_result" = "X${1}"; then
+- func_dirname_result="${3}"
+- else
+- func_dirname_result="$func_dirname_result${2}"
+- fi
+-} # func_dirname may be replaced by extended shell implementation
+-
+-
+-# func_basename file
+-func_basename ()
+-{
+- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+-} # func_basename may be replaced by extended shell implementation
+-
+-
+ # func_dirname_and_basename file append nondir_replacement
+ # perform func_basename and func_dirname in a single function
+ # call:
+@@ -199,183 +158,33 @@
+ # those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
-- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
- }
-
- # Generated shell functions inserted here.
-
+- # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+- if test "X$func_dirname_result" = "X${1}"; then
+- func_dirname_result="${3}"
+- else
+- func_dirname_result="$func_dirname_result${2}"
+- fi
+- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+-} # func_dirname_and_basename may be replaced by extended shell implementation
+-
+-
+-# func_stripname prefix suffix name
+-# strip PREFIX and SUFFIX off of NAME.
+-# PREFIX and SUFFIX must not contain globbing or regex special
+-# characters, hashes, percent signs, but SUFFIX may contain a leading
+-# dot (in which case that matches only a dot).
+-# func_strip_suffix prefix name
+-func_stripname ()
+-{
+- case ${2} in
+- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+- esac
+-} # func_stripname may be replaced by extended shell implementation
+-
+-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
@@ -5954,8 +10964,16 @@
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
--}
--
++ # Extract subdirectory from the argument.
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
++ if test "X$func_dirname_result" = "X${1}"; then
++ func_dirname_result="${3}"
++ else
++ func_dirname_result="$func_dirname_result${2}"
++ fi
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ }
+
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
@@ -6008,7 +11026,8 @@
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
--
++# Generated shell functions inserted here.
+
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
@@ -6035,7 +11054,32 @@
# Make sure we have an absolute path for reexecution:
case $progpath in
-@@ -413,13 +258,6 @@
+@@ -406,15 +215,6 @@
+ # Same as above, but do not quote variable references.
+ double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+-# Sed substitution that turns a string into a regex matching for the
+-# string literally.
+-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+-
+-# Sed substitution that converts a w32 file name or path
+-# which contains forward slashes, into one that contains
+-# (escaped) backslashes. A very naive implementation.
+-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+-
+ # Re-`\' parameter expansions in output of double_quote_subst that were
+ # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
+ # in input to double_quote_subst, that '$' was protected from expansion.
+@@ -443,7 +243,7 @@
+ # name if it has been set yet.
+ func_echo ()
+ {
+- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++ $ECHO "$progname${mode+: }$mode: $*"
+ }
+
+ # func_verbose arg...
+@@ -458,25 +258,18 @@
:
}
@@ -6049,7 +11093,21 @@
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
-@@ -488,9 +326,9 @@
+ {
+- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+ }
+
+ # func_warning arg...
+ # Echo program name prefixed warning message to standard error.
+ func_warning ()
+ {
+- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
++ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+ # bash bug again:
+ :
+@@ -533,9 +326,9 @@
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
@@ -6061,7 +11119,7 @@
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
-@@ -540,7 +378,7 @@
+@@ -585,7 +378,7 @@
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
@@ -6070,7 +11128,7 @@
}
-@@ -554,7 +392,7 @@
+@@ -599,7 +392,7 @@
{
case $1 in
*[\\\`\"\$]*)
@@ -6079,7 +11137,7 @@
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
-@@ -581,7 +419,7 @@
+@@ -626,7 +419,7 @@
{
case $1 in
*[\\\`\"]*)
@@ -6088,17 +11146,36 @@
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
-@@ -651,19 +489,14 @@
+@@ -695,39 +488,15 @@
+ fi
}
-
-+
-+
-+
+-# func_tr_sh
+-# Turn $1 into a string suitable for a shell variable name.
+-# Result is stored in $func_tr_sh_result. All characters
+-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+-# if $1 begins with a digit, a '_' is prepended as well.
+-func_tr_sh ()
+-{
+- case $1 in
+- [0-9]* | *[!a-zA-Z0-9_]*)
+- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+- ;;
+- * )
+- func_tr_sh_result=$1
+- ;;
+- esac
+-}
++
++
+
+
# func_version
# Echo version message to standard output and exit.
func_version ()
{
+- $opt_debug
+-
- $SED -n '/(C)/!b go
- :more
- /\./!{
@@ -6112,10 +11189,12 @@
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -676,20 +509,19 @@
+@@ -740,28 +509,22 @@
# Echo short help message to standard output and exit.
func_usage ()
{
+- $opt_debug
+-
- $SED -n '/^# Usage:/,/^# *.*--help/ {
+ $SED -n '/^# Usage:/,/# -h/ {
s/^# //
@@ -6136,29 +11215,70 @@
+# Echo long help message to standard output and exit.
func_help ()
{
+- $opt_debug
+-
$SED -n '/^# Usage:/,/# Report bugs to/ {
-@@ -706,10 +538,7 @@
+- :print
+ s/^# //
+ s/^# *$//
+ s*\$progname*'$progname'*
+@@ -774,15 +537,8 @@
+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
- }' < "$progpath"
+- d
+- }
+- /^# .* home page:/b print
+- /^# General help using/b print
+- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
++ }' < "$progpath"
+ exit $?
}
# func_missing_arg argname
-@@ -717,7 +546,7 @@
+@@ -790,106 +546,63 @@
# exit_cmd.
func_missing_arg ()
{
+- $opt_debug
+-
- func_error "missing argument for $1."
+ func_error "missing argument for $1"
exit_cmd=exit
}
-@@ -727,6 +556,29 @@
++exit_cmd=:
+
+-# func_split_short_opt shortopt
+-# Set func_split_short_opt_name and func_split_short_opt_arg shell
+-# variables after splitting SHORTOPT after the 2nd character.
+-func_split_short_opt ()
+-{
+- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+-
+- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+-} # func_split_short_opt may be replaced by extended shell implementation
+-
+-
+-# func_split_long_opt longopt
+-# Set func_split_long_opt_name and func_split_long_opt_arg shell
+-# variables after splitting LONGOPT at the `=' sign.
+-func_split_long_opt ()
+-{
+- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+- my_sed_long_arg='1s/^--[^=]*=//'
+-
+- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+-} # func_split_long_opt may be replaced by extended shell implementation
+
+-exit_cmd=:
@@ -6176,7 +11296,7 @@
+ # Restart under the correct shell, and then maybe $ECHO will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
-+
+
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
@@ -6188,7 +11308,77 @@
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
-@@ -784,16 +636,16 @@
+
+ # Global variables.
++# $mode is unset
+ nonopt=
++execute_dlfiles=
+ preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ extracted_archives=
+ extracted_serial=0
+
++opt_dry_run=false
++opt_duplicate_deps=false
++opt_silent=false
++opt_debug=:
++
+ # 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=
+
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+- eval "${1}=\$${1}\${2}"
+-} # func_append may be replaced by extended shell implementation
+-
+-# func_append_quoted var value
+-# Quote VALUE and append to the end of shell variable VAR, separated
+-# by a space.
+-func_append_quoted ()
+-{
+- func_quote_for_eval "${2}"
+- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+-} # func_append_quoted may be replaced by extended shell implementation
+-
+-
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+- func_arith_result=`expr "${@}"`
+-} # func_arith may be replaced by extended shell implementation
+-
+-
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+-} # func_len may be replaced by extended shell implementation
+-
+-
+-# func_lo2o object
+-func_lo2o ()
+-{
+- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+-} # func_lo2o may be replaced by extended shell implementation
+-
+-
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+-} # func_xform may be replaced by extended shell implementation
+-
+-
+ # func_fatal_configuration arg...
+ # Echo program name prefixed message to standard error, followed by
+ # a configuration failure hint, and exit.
+@@ -923,16 +636,16 @@
# Display the features supported by this script.
func_features ()
{
@@ -6210,39 +11400,463 @@
fi
exit $?
-@@ -920,21 +772,10 @@
-
- --quiet|--silent) preserve_args="$preserve_args $opt"
+@@ -979,204 +692,117 @@
+ esac
+ }
+
+-# func_check_version_match
+-# Ensure that we are using m4 macros, and libtool script from the same
+-# release of libtool.
+-func_check_version_match ()
++# Parse options once, thoroughly. This comes as soon as possible in
++# the script to make things like `libtool --version' happen quickly.
+ {
+- if test "$package_revision" != "$macro_revision"; then
+- if test "$VERSION" != "$macro_version"; then
+- if test -z "$macro_version"; then
+- cat >&2 <<_LT_EOF
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from an older release.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+- else
+- cat >&2 <<_LT_EOF
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+- fi
+- else
+- cat >&2 <<_LT_EOF
+-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+-$progname: of $PACKAGE $VERSION and run autoconf again.
+-_LT_EOF
+- fi
+-
+- exit $EXIT_MISMATCH
+- fi
+-}
+-
+-
+-# Shorthand for --mode=foo, only valid as the first argument
+-case $1 in
+-clean|clea|cle|cl)
+- shift; set dummy --mode clean ${1+"$@"}; shift
+- ;;
+-compile|compil|compi|comp|com|co|c)
+- shift; set dummy --mode compile ${1+"$@"}; shift
+- ;;
+-execute|execut|execu|exec|exe|ex|e)
+- shift; set dummy --mode execute ${1+"$@"}; shift
+- ;;
+-finish|finis|fini|fin|fi|f)
+- shift; set dummy --mode finish ${1+"$@"}; shift
+- ;;
+-install|instal|insta|inst|ins|in|i)
+- shift; set dummy --mode install ${1+"$@"}; shift
+- ;;
+-link|lin|li|l)
+- shift; set dummy --mode link ${1+"$@"}; shift
+- ;;
+-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+- shift; set dummy --mode uninstall ${1+"$@"}; shift
+- ;;
+-esac
+-
+-
+-
+-# Option defaults:
+-opt_debug=:
+-opt_dry_run=false
+-opt_config=false
+-opt_preserve_dup_deps=false
+-opt_features=false
+-opt_finish=false
+-opt_help=false
+-opt_help_all=false
+-opt_silent=:
+-opt_verbose=:
+-opt_silent=false
+-opt_verbose=false
+
++ # Shorthand for --mode=foo, only valid as the first argument
++ case $1 in
++ clean|clea|cle|cl)
++ shift; set dummy --mode clean ${1+"$@"}; shift
++ ;;
++ compile|compil|compi|comp|com|co|c)
++ shift; set dummy --mode compile ${1+"$@"}; shift
++ ;;
++ execute|execut|execu|exec|exe|ex|e)
++ shift; set dummy --mode execute ${1+"$@"}; shift
++ ;;
++ finish|finis|fini|fin|fi|f)
++ shift; set dummy --mode finish ${1+"$@"}; shift
++ ;;
++ install|instal|insta|inst|ins|in|i)
++ shift; set dummy --mode install ${1+"$@"}; shift
++ ;;
++ link|lin|li|l)
++ shift; set dummy --mode link ${1+"$@"}; shift
++ ;;
++ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
++ shift; set dummy --mode uninstall ${1+"$@"}; shift
++ ;;
++ esac
+
+-# Parse options once, thoroughly. This comes as soon as possible in the
+-# script to make things like `--version' happen as quickly as we can.
+-{
+- # this just eases exit handling
+- while test $# -gt 0; do
++ # Parse non-mode specific arguments:
++ while test "$#" -gt 0; do
+ opt="$1"
+ shift
++
+ case $opt in
+- --debug|-x) opt_debug='set -x'
++ --config) func_config ;;
++
++ --debug) preserve_args="$preserve_args $opt"
+ func_echo "enabling shell trace mode"
++ opt_debug='set -x'
+ $opt_debug
+ ;;
+- --dry-run|--dryrun|-n)
+- opt_dry_run=:
+- ;;
+- --config)
+- opt_config=:
+-func_config
+- ;;
+- --dlopen|-dlopen)
+- optarg="$1"
+- opt_dlopen="${opt_dlopen+$opt_dlopen
+-}$optarg"
++
++ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
++ execute_dlfiles="$execute_dlfiles $1"
+ shift
+ ;;
+- --preserve-dup-deps)
+- opt_preserve_dup_deps=:
+- ;;
+- --features)
+- opt_features=:
+-func_features
+- ;;
+- --finish)
+- opt_finish=:
+-set dummy --mode finish ${1+"$@"}; shift
+- ;;
+- --help)
+- opt_help=:
+- ;;
+- --help-all)
+- opt_help_all=:
+-opt_help=': help-all'
+- ;;
+- --mode)
+- test $# = 0 && func_missing_arg $opt && break
+- optarg="$1"
+- opt_mode="$optarg"
+-case $optarg in
+- # Valid mode arguments:
+- clean|compile|execute|finish|install|link|relink|uninstall) ;;
+-
+- # Catch anything else as an error
+- *) func_error "invalid argument for $opt"
+- exit_cmd=exit
+- break
+- ;;
+-esac
++
++ --dry-run | -n) opt_dry_run=: ;;
++ --features) func_features ;;
++ --finish) mode="finish" ;;
++
++ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
++ case $1 in
++ # Valid mode arguments:
++ clean) ;;
++ compile) ;;
++ execute) ;;
++ finish) ;;
++ install) ;;
++ link) ;;
++ relink) ;;
++ uninstall) ;;
++
++ # Catch anything else as an error
++ *) func_error "invalid argument for $opt"
++ exit_cmd=exit
++ break
++ ;;
++ esac
++
++ mode="$1"
+ shift
+ ;;
+- --no-silent|--no-quiet)
+- opt_silent=false
+-func_append preserve_args " $opt"
+- ;;
+- --no-verbose)
+- opt_verbose=false
+-func_append preserve_args " $opt"
+- ;;
+- --silent|--quiet)
++
++ --preserve-dup-deps)
++ opt_duplicate_deps=: ;;
++
++ --quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
-- opt_verbose=false
+-func_append preserve_args " $opt"
+- opt_verbose=false
+ ;;
+- --verbose|-v)
+- opt_verbose=:
+-func_append preserve_args " $opt"
+-opt_silent=false
++
++ --verbose| -v) preserve_args="$preserve_args $opt"
++ opt_silent=false
+ ;;
+- --tag)
+- test $# = 0 && func_missing_arg $opt && break
+- optarg="$1"
+- opt_tag="$optarg"
+-func_append preserve_args " $opt $optarg"
+-func_enable_tag "$optarg"
++
++ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
++ preserve_args="$preserve_args $opt $1"
++ func_enable_tag "$1" # tagname is set here
+ shift
+ ;;
+
+- -\?|-h) func_usage ;;
+- --help) func_help ;;
+- --version) func_version ;;
+-
+ # Separate optargs to long options:
+- --*=*)
+- func_split_long_opt "$opt"
+- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
++ -dlopen=*|--mode=*|--tag=*)
++ func_opt_split "$opt"
++ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ shift
+ ;;
+
+- # Separate non-argument short options:
+- -\?*|-h*|-n*|-v*)
+- func_split_short_opt "$opt"
+- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+- shift
- ;;
--
-- --no-quiet|--no-silent)
-- preserve_args="$preserve_args $opt"
-- opt_silent=false
- ;;
-
- --verbose| -v) preserve_args="$preserve_args $opt"
- opt_silent=false
-- opt_verbose=:
-- ;;
--
-- --no-verbose) preserve_args="$preserve_args $opt"
-- opt_verbose=false
- ;;
-
- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
-@@ -952,7 +793,6 @@
-
- -\?|-h) func_usage ;;
- --help) opt_help=: ;;
-- --help-all) opt_help=': help-all' ;;
- --version) func_version ;;
-
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
-@@ -1176,13 +1016,10 @@
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
++ -\?|-h) func_usage ;;
++ --help) opt_help=: ;;
++ --version) func_version ;;
++
++ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+- --) break ;;
+- -*) func_fatal_help "unrecognized option \`$opt'" ;;
+- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
++ *) nonopt="$opt"
++ break
++ ;;
+ esac
+ done
+
+- # Validate options:
+-
+- # save first non-option argument
+- if test "$#" -gt 0; then
+- nonopt="$opt"
+- shift
+- fi
+-
+- # preserve --debug
+- test "$opt_debug" = : || func_append preserve_args " --debug"
+
+ case $host in
+ *cygwin* | *mingw* | *pw32* | *cegcc*)
+@@ -1184,44 +810,82 @@
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
++ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+ ;;
+ esac
+
+- $opt_help || {
+- # Sanity checks first:
+- func_check_version_match
++ # Having warned about all mis-specified options, bail out if
++ # anything was wrong.
++ $exit_cmd $EXIT_FAILURE
++}
+
+- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+- func_fatal_configuration "not configured to build any kind of library"
++# func_check_version_match
++# Ensure that we are using m4 macros, and libtool script from the same
++# release of libtool.
++func_check_version_match ()
++{
++ if test "$package_revision" != "$macro_revision"; then
++ if test "$VERSION" != "$macro_version"; then
++ if test -z "$macro_version"; then
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from an older release.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++ else
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
++$progname: and run autoconf again.
++_LT_EOF
++ fi
++ else
++ cat >&2 <<_LT_EOF
++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
++$progname: but the definition of this LT_INIT comes from revision $macro_revision.
++$progname: You should recreate aclocal.m4 with macros from revision $package_revision
++$progname: of $PACKAGE $VERSION and run autoconf again.
++_LT_EOF
+ fi
+
+- # Darwin sucks
+- eval std_shrext=\"$shrext_cmds\"
++ exit $EXIT_MISMATCH
++ fi
++}
+
+- # Only execute mode is allowed to have -dlopen flags.
+- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+- func_error "unrecognized option \`-dlopen'"
+- $ECHO "$help" 1>&2
+- exit $EXIT_FAILURE
+- fi
+
+- # Change the help message to a mode-specific one.
+- generic_help="$help"
+- help="Try \`$progname --help --mode=$opt_mode' for more information."
+- }
++## ----------- ##
++## Main. ##
++## ----------- ##
+
++$opt_help || {
++ # Sanity checks first:
++ func_check_version_match
+
+- # Bail if the options were screwed
+- $exit_cmd $EXIT_FAILURE
+-}
++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++ func_fatal_configuration "not configured to build any kind of library"
++ fi
+
++ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
++ # Darwin sucks
++ eval std_shrext=\"$shrext_cmds\"
++
++
++ # Only execute mode is allowed to have -dlopen flags.
++ if test -n "$execute_dlfiles" && test "$mode" != execute; then
++ func_error "unrecognized option \`-dlopen'"
++ $ECHO "$help" 1>&2
++ exit $EXIT_FAILURE
++ fi
++
++ # Change the help message to a mode-specific one.
++ generic_help="$help"
++ help="Try \`$progname --help --mode=$mode' for more information."
++}
+
+-## ----------- ##
+-## Main. ##
+-## ----------- ##
+
+ # func_lalib_p file
+ # True iff FILE is a libtool `.la' library or `.lo' object file.
+@@ -1286,9 +950,12 @@
+ # temporary ltwrapper_script.
+ func_ltwrapper_scriptname ()
+ {
+- func_dirname_and_basename "$1" "" "."
+- func_stripname '' '.exe' "$func_basename_result"
+- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
++ func_ltwrapper_scriptname_result=""
++ if func_ltwrapper_executable_p "$1"; then
++ func_dirname_and_basename "$1" "" "."
++ func_stripname '' '.exe' "$func_basename_result"
++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
++ fi
+ }
+
+ # func_ltwrapper_p file
+@@ -1334,37 +1001,6 @@
+ }
+
+
+-# func_resolve_sysroot PATH
+-# Replace a leading = in PATH with a sysroot. Store the result into
+-# func_resolve_sysroot_result
+-func_resolve_sysroot ()
+-{
+- func_resolve_sysroot_result=$1
+- case $func_resolve_sysroot_result in
+- =*)
+- func_stripname '=' '' "$func_resolve_sysroot_result"
+- func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+- ;;
+- esac
+-}
+-
+-# func_replace_sysroot PATH
+-# If PATH begins with the sysroot, replace it with = and
+-# store the result into func_replace_sysroot_result.
+-func_replace_sysroot ()
+-{
+- case "$lt_sysroot:$1" in
+- ?*:"$lt_sysroot"*)
+- func_stripname "$lt_sysroot" '' "$1"
+- func_replace_sysroot_result="=$func_stripname_result"
+- ;;
+- *)
+- # Including no sysroot.
+- func_replace_sysroot_result=$1
+- ;;
+- esac
+-}
+-
+ # func_infer_tag arg
+ # Infer tagged configuration to use if any are available and
+ # if one wasn't chosen via the "--tag" command line option.
+@@ -1377,15 +1013,13 @@
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+- func_append_quoted CC_quoted "$arg"
++ func_quote_for_eval "$arg"
++ CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -6255,9 +11869,13 @@
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
-@@ -1196,11 +1033,8 @@
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
+@@ -1396,13 +1030,11 @@
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+- func_append_quoted CC_quoted "$arg"
++ func_quote_for_eval "$arg"
++ CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -6268,7 +11886,537 @@
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
-@@ -1379,7 +1213,7 @@
+@@ -1465,486 +1097,6 @@
+ }
+ }
+
+-
+-##################################################
+-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+-##################################################
+-
+-# func_convert_core_file_wine_to_w32 ARG
+-# Helper function used by file name conversion functions when $build is *nix,
+-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+-# correctly configured wine environment available, with the winepath program
+-# in $build's $PATH.
+-#
+-# ARG is the $build file name to be converted to w32 format.
+-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+-# be empty on error (or when ARG is empty)
+-func_convert_core_file_wine_to_w32 ()
+-{
+- $opt_debug
+- func_convert_core_file_wine_to_w32_result="$1"
+- if test -n "$1"; then
+- # Unfortunately, winepath does not exit with a non-zero error code, so we
+- # are forced to check the contents of stdout. On the other hand, if the
+- # command is not found, the shell will set an exit code of 127 and print
+- # *an error message* to stdout. So we must check for both error code of
+- # zero AND non-empty stdout, which explains the odd construction:
+- func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+- func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+- $SED -e "$lt_sed_naive_backslashify"`
+- else
+- func_convert_core_file_wine_to_w32_result=
+- fi
+- fi
+-}
+-# end: func_convert_core_file_wine_to_w32
+-
+-
+-# func_convert_core_path_wine_to_w32 ARG
+-# Helper function used by path conversion functions when $build is *nix, and
+-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+-# configured wine environment available, with the winepath program in $build's
+-# $PATH. Assumes ARG has no leading or trailing path separator characters.
+-#
+-# ARG is path to be converted from $build format to win32.
+-# Result is available in $func_convert_core_path_wine_to_w32_result.
+-# Unconvertible file (directory) names in ARG are skipped; if no directory names
+-# are convertible, then the result may be empty.
+-func_convert_core_path_wine_to_w32 ()
+-{
+- $opt_debug
+- # unfortunately, winepath doesn't convert paths, only file names
+- func_convert_core_path_wine_to_w32_result=""
+- if test -n "$1"; then
+- oldIFS=$IFS
+- IFS=:
+- for func_convert_core_path_wine_to_w32_f in $1; do
+- IFS=$oldIFS
+- func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+- if test -z "$func_convert_core_path_wine_to_w32_result"; then
+- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+- else
+- func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+- fi
+- fi
+- done
+- IFS=$oldIFS
+- fi
+-}
+-# end: func_convert_core_path_wine_to_w32
+-
+-
+-# func_cygpath ARGS...
+-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+-# (2), returns the Cygwin file name or path in func_cygpath_result (input
+-# file name or path is assumed to be in w32 format, as previously converted
+-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+-# or path in func_cygpath_result (input file name or path is assumed to be in
+-# Cygwin format). Returns an empty string on error.
+-#
+-# ARGS are passed to cygpath, with the last one being the file name or path to
+-# be converted.
+-#
+-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+-# environment variable; do not put it in $PATH.
+-func_cygpath ()
+-{
+- $opt_debug
+- if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+- func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+- if test "$?" -ne 0; then
+- # on failure, ensure result is empty
+- func_cygpath_result=
+- fi
+- else
+- func_cygpath_result=
+- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+- fi
+-}
+-#end: func_cygpath
+-
+-
+-# func_convert_core_msys_to_w32 ARG
+-# Convert file name or path ARG from MSYS format to w32 format. Return
+-# result in func_convert_core_msys_to_w32_result.
+-func_convert_core_msys_to_w32 ()
+-{
+- $opt_debug
+- # awkward: cmd appends spaces to result
+- func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+-}
+-#end: func_convert_core_msys_to_w32
+-
+-
+-# func_convert_file_check ARG1 ARG2
+-# Verify that ARG1 (a file name in $build format) was converted to $host
+-# format in ARG2. Otherwise, emit an error message, but continue (resetting
+-# func_to_host_file_result to ARG1).
+-func_convert_file_check ()
+-{
+- $opt_debug
+- if test -z "$2" && test -n "$1" ; then
+- func_error "Could not determine host file name corresponding to"
+- func_error " \`$1'"
+- func_error "Continuing, but uninstalled executables may not work."
+- # Fallback:
+- func_to_host_file_result="$1"
+- fi
+-}
+-# end func_convert_file_check
+-
+-
+-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+-# Verify that FROM_PATH (a path in $build format) was converted to $host
+-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+-# func_to_host_file_result to a simplistic fallback value (see below).
+-func_convert_path_check ()
+-{
+- $opt_debug
+- if test -z "$4" && test -n "$3"; then
+- func_error "Could not determine the host path corresponding to"
+- func_error " \`$3'"
+- func_error "Continuing, but uninstalled executables may not work."
+- # Fallback. This is a deliberately simplistic "conversion" and
+- # should not be "improved". See libtool.info.
+- if test "x$1" != "x$2"; then
+- lt_replace_pathsep_chars="s|$1|$2|g"
+- func_to_host_path_result=`echo "$3" |
+- $SED -e "$lt_replace_pathsep_chars"`
+- else
+- func_to_host_path_result="$3"
+- fi
+- fi
+-}
+-# end func_convert_path_check
+-
+-
+-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+-# and appending REPL if ORIG matches BACKPAT.
+-func_convert_path_front_back_pathsep ()
+-{
+- $opt_debug
+- case $4 in
+- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+- ;;
+- esac
+- case $4 in
+- $2 ) func_append func_to_host_path_result "$3"
+- ;;
+- esac
+-}
+-# end func_convert_path_front_back_pathsep
+-
+-
+-##################################################
+-# $build to $host FILE NAME CONVERSION FUNCTIONS #
+-##################################################
+-# invoked via `$to_host_file_cmd ARG'
+-#
+-# In each case, ARG is the path to be converted from $build to $host format.
+-# Result will be available in $func_to_host_file_result.
+-
+-
+-# func_to_host_file ARG
+-# Converts the file name ARG from $build format to $host format. Return result
+-# in func_to_host_file_result.
+-func_to_host_file ()
+-{
+- $opt_debug
+- $to_host_file_cmd "$1"
+-}
+-# end func_to_host_file
+-
+-
+-# func_to_tool_file ARG LAZY
+-# converts the file name ARG from $build format to toolchain format. Return
+-# result in func_to_tool_file_result. If the conversion in use is listed
+-# in (the comma separated) LAZY, no conversion takes place.
+-func_to_tool_file ()
+-{
+- $opt_debug
+- case ,$2, in
+- *,"$to_tool_file_cmd",*)
+- func_to_tool_file_result=$1
+- ;;
+- *)
+- $to_tool_file_cmd "$1"
+- func_to_tool_file_result=$func_to_host_file_result
+- ;;
+- esac
+-}
+-# end func_to_tool_file
+-
+-
+-# func_convert_file_noop ARG
+-# Copy ARG to func_to_host_file_result.
+-func_convert_file_noop ()
+-{
+- func_to_host_file_result="$1"
+-}
+-# end func_convert_file_noop
+-
+-
+-# func_convert_file_msys_to_w32 ARG
+-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+-# conversion to w32 is not available inside the cwrapper. Returns result in
+-# func_to_host_file_result.
+-func_convert_file_msys_to_w32 ()
+-{
+- $opt_debug
+- func_to_host_file_result="$1"
+- if test -n "$1"; then
+- func_convert_core_msys_to_w32 "$1"
+- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+- fi
+- func_convert_file_check "$1" "$func_to_host_file_result"
+-}
+-# end func_convert_file_msys_to_w32
+-
+-
+-# func_convert_file_cygwin_to_w32 ARG
+-# Convert file name ARG from Cygwin to w32 format. Returns result in
+-# func_to_host_file_result.
+-func_convert_file_cygwin_to_w32 ()
+-{
+- $opt_debug
+- func_to_host_file_result="$1"
+- if test -n "$1"; then
+- # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+- # LT_CYGPATH in this case.
+- func_to_host_file_result=`cygpath -m "$1"`
+- fi
+- func_convert_file_check "$1" "$func_to_host_file_result"
+-}
+-# end func_convert_file_cygwin_to_w32
+-
+-
+-# func_convert_file_nix_to_w32 ARG
+-# Convert file name ARG from *nix to w32 format. Requires a wine environment
+-# and a working winepath. Returns result in func_to_host_file_result.
+-func_convert_file_nix_to_w32 ()
+-{
+- $opt_debug
+- func_to_host_file_result="$1"
+- if test -n "$1"; then
+- func_convert_core_file_wine_to_w32 "$1"
+- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+- fi
+- func_convert_file_check "$1" "$func_to_host_file_result"
+-}
+-# end func_convert_file_nix_to_w32
+-
+-
+-# func_convert_file_msys_to_cygwin ARG
+-# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+-# Returns result in func_to_host_file_result.
+-func_convert_file_msys_to_cygwin ()
+-{
+- $opt_debug
+- func_to_host_file_result="$1"
+- if test -n "$1"; then
+- func_convert_core_msys_to_w32 "$1"
+- func_cygpath -u "$func_convert_core_msys_to_w32_result"
+- func_to_host_file_result="$func_cygpath_result"
+- fi
+- func_convert_file_check "$1" "$func_to_host_file_result"
+-}
+-# end func_convert_file_msys_to_cygwin
+-
+-
+-# func_convert_file_nix_to_cygwin ARG
+-# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
+-# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
+-# in func_to_host_file_result.
+-func_convert_file_nix_to_cygwin ()
+-{
+- $opt_debug
+- func_to_host_file_result="$1"
+- if test -n "$1"; then
+- # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+- func_convert_core_file_wine_to_w32 "$1"
+- func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+- func_to_host_file_result="$func_cygpath_result"
+- fi
+- func_convert_file_check "$1" "$func_to_host_file_result"
+-}
+-# end func_convert_file_nix_to_cygwin
+-
+-
+-#############################################
+-# $build to $host PATH CONVERSION FUNCTIONS #
+-#############################################
+-# invoked via `$to_host_path_cmd ARG'
+-#
+-# In each case, ARG is the path to be converted from $build to $host format.
+-# The result will be available in $func_to_host_path_result.
+-#
+-# Path separators are also converted from $build format to $host format. If
+-# ARG begins or ends with a path separator character, it is preserved (but
+-# converted to $host format) on output.
+-#
+-# All path conversion functions are named using the following convention:
+-# file name conversion function : func_convert_file_X_to_Y ()
+-# path conversion function : func_convert_path_X_to_Y ()
+-# where, for any given $build/$host combination the 'X_to_Y' value is the
+-# same. If conversion functions are added for new $build/$host combinations,
+-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+-# will break.
+-
+-
+-# func_init_to_host_path_cmd
+-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+-# appropriate value, based on the value of $to_host_file_cmd.
+-to_host_path_cmd=
+-func_init_to_host_path_cmd ()
+-{
+- $opt_debug
+- if test -z "$to_host_path_cmd"; then
+- func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+- fi
+-}
+-
+-
+-# func_to_host_path ARG
+-# Converts the path ARG from $build format to $host format. Return result
+-# in func_to_host_path_result.
+-func_to_host_path ()
+-{
+- $opt_debug
+- func_init_to_host_path_cmd
+- $to_host_path_cmd "$1"
+-}
+-# end func_to_host_path
+-
+-
+-# func_convert_path_noop ARG
+-# Copy ARG to func_to_host_path_result.
+-func_convert_path_noop ()
+-{
+- func_to_host_path_result="$1"
+-}
+-# end func_convert_path_noop
+-
+-
+-# func_convert_path_msys_to_w32 ARG
+-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+-# conversion to w32 is not available inside the cwrapper. Returns result in
+-# func_to_host_path_result.
+-func_convert_path_msys_to_w32 ()
+-{
+- $opt_debug
+- func_to_host_path_result="$1"
+- if test -n "$1"; then
+- # Remove leading and trailing path separator characters from ARG. MSYS
+- # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+- # and winepath ignores them completely.
+- func_stripname : : "$1"
+- func_to_host_path_tmp1=$func_stripname_result
+- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+- func_convert_path_check : ";" \
+- "$func_to_host_path_tmp1" "$func_to_host_path_result"
+- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+- fi
+-}
+-# end func_convert_path_msys_to_w32
+-
+-
+-# func_convert_path_cygwin_to_w32 ARG
+-# Convert path ARG from Cygwin to w32 format. Returns result in
+-# func_to_host_file_result.
+-func_convert_path_cygwin_to_w32 ()
+-{
+- $opt_debug
+- func_to_host_path_result="$1"
+- if test -n "$1"; then
+- # See func_convert_path_msys_to_w32:
+- func_stripname : : "$1"
+- func_to_host_path_tmp1=$func_stripname_result
+- func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+- func_convert_path_check : ";" \
+- "$func_to_host_path_tmp1" "$func_to_host_path_result"
+- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+- fi
+-}
+-# end func_convert_path_cygwin_to_w32
+-
+-
+-# func_convert_path_nix_to_w32 ARG
+-# Convert path ARG from *nix to w32 format. Requires a wine environment and
+-# a working winepath. Returns result in func_to_host_file_result.
+-func_convert_path_nix_to_w32 ()
+-{
+- $opt_debug
+- func_to_host_path_result="$1"
+- if test -n "$1"; then
+- # See func_convert_path_msys_to_w32:
+- func_stripname : : "$1"
+- func_to_host_path_tmp1=$func_stripname_result
+- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+- func_convert_path_check : ";" \
+- "$func_to_host_path_tmp1" "$func_to_host_path_result"
+- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+- fi
+-}
+-# end func_convert_path_nix_to_w32
+-
+-
+-# func_convert_path_msys_to_cygwin ARG
+-# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+-# Returns result in func_to_host_file_result.
+-func_convert_path_msys_to_cygwin ()
+-{
+- $opt_debug
+- func_to_host_path_result="$1"
+- if test -n "$1"; then
+- # See func_convert_path_msys_to_w32:
+- func_stripname : : "$1"
+- func_to_host_path_tmp1=$func_stripname_result
+- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+- func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+- func_to_host_path_result="$func_cygpath_result"
+- func_convert_path_check : : \
+- "$func_to_host_path_tmp1" "$func_to_host_path_result"
+- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+- fi
+-}
+-# end func_convert_path_msys_to_cygwin
+-
+-
+-# func_convert_path_nix_to_cygwin ARG
+-# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
+-# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
+-# func_to_host_file_result.
+-func_convert_path_nix_to_cygwin ()
+-{
+- $opt_debug
+- func_to_host_path_result="$1"
+- if test -n "$1"; then
+- # Remove leading and trailing path separator characters from
+- # ARG. msys behavior is inconsistent here, cygpath turns them
+- # into '.;' and ';.', and winepath ignores them completely.
+- func_stripname : : "$1"
+- func_to_host_path_tmp1=$func_stripname_result
+- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+- func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+- func_to_host_path_result="$func_cygpath_result"
+- func_convert_path_check : : \
+- "$func_to_host_path_tmp1" "$func_to_host_path_result"
+- func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+- fi
+-}
+-# end func_convert_path_nix_to_cygwin
+-
+-
+ # func_mode_compile arg...
+ func_mode_compile ()
+ {
+@@ -1985,12 +1137,12 @@
+ ;;
+
+ -pie | -fpie | -fPIE)
+- func_append pie_flag " $arg"
++ pie_flag="$pie_flag $arg"
+ continue
+ ;;
+
+ -shared | -static | -prefer-pic | -prefer-non-pic)
+- func_append later " $arg"
++ later="$later $arg"
+ continue
+ ;;
+
+@@ -2011,14 +1163,15 @@
+ save_ifs="$IFS"; IFS=','
+ for arg in $args; do
+ IFS="$save_ifs"
+- func_append_quoted lastarg "$arg"
++ func_quote_for_eval "$arg"
++ lastarg="$lastarg $func_quote_for_eval_result"
+ done
+ IFS="$save_ifs"
+ func_stripname ' ' '' "$lastarg"
+ lastarg=$func_stripname_result
+
+ # Add the arguments to base_compile.
+- func_append base_compile " $lastarg"
++ base_compile="$base_compile $lastarg"
+ continue
+ ;;
+
+@@ -2034,7 +1187,8 @@
+ esac # case $arg_mode
+
+ # Aesthetically quote the previous argument.
+- func_append_quoted base_compile "$lastarg"
++ func_quote_for_eval "$lastarg"
++ base_compile="$base_compile $func_quote_for_eval_result"
+ done # for arg
+
+ case $arg_mode in
+@@ -2059,7 +1213,7 @@
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
@@ -6277,7 +12425,7 @@
func_xform "$libobj"
libobj=$func_xform_result
;;
-@@ -1454,7 +1288,7 @@
+@@ -2134,7 +1288,7 @@
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
@@ -6286,16 +12434,68 @@
lockfile="$output_obj.lock"
else
output_obj=
-@@ -1611,7 +1445,7 @@
+@@ -2165,16 +1319,17 @@
+ $opt_dry_run || $RM $removelist
+ exit $EXIT_FAILURE
+ fi
+- func_append removelist " $output_obj"
++ removelist="$removelist $output_obj"
+ $ECHO "$srcfile" > "$lockfile"
+ fi
+
+ $opt_dry_run || $RM $removelist
+- func_append removelist " $lockfile"
++ removelist="$removelist $lockfile"
+ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+- func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+- srcfile=$func_to_tool_file_result
++ if test -n "$fix_srcfile_path"; then
++ eval srcfile=\"$fix_srcfile_path\"
++ fi
+ func_quote_for_eval "$srcfile"
+ qsrcfile=$func_quote_for_eval_result
+
+@@ -2194,7 +1349,7 @@
+
+ if test -z "$output_obj"; then
+ # Place PIC objects in $objdir
+- func_append command " -o $lobj"
++ command="$command -o $lobj"
+ fi
+
+ func_show_eval_locale "$command" \
+@@ -2241,11 +1396,11 @@
+ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+- func_append command " -o $obj"
++ command="$command -o $obj"
+ fi
+
+ # Suppress compiler output if we already did a PIC compilation.
+- func_append command "$suppress_output"
++ command="$command$suppress_output"
+ func_show_eval_locale "$command" \
+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+@@ -2290,13 +1445,13 @@
}
$opt_help || {
-- test "$mode" = compile && func_mode_compile ${1+"$@"}
+- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
-@@ -1648,11 +1482,10 @@
+ {
+ # We need to display help for each of the modes.
+- case $opt_mode in
++ case $mode in
+ "")
+ # Generic help is extracted from the usage comments
+ # at the start of this file.
+@@ -2327,11 +1482,10 @@
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
@@ -6309,7 +12509,7 @@
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
-@@ -1705,7 +1538,7 @@
+@@ -2384,7 +1538,7 @@
The following components of INSTALL-COMMAND are treated specially:
@@ -6318,7 +12518,7 @@
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
-@@ -1725,8 +1558,6 @@
+@@ -2404,8 +1558,6 @@
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
@@ -6327,7 +12527,7 @@
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-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)
-@@ -1755,11 +1586,6 @@
+@@ -2434,11 +1586,6 @@
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
@@ -6339,7 +12539,12 @@
All other options (arguments beginning with \`-') are ignored.
-@@ -1797,40 +1623,14 @@
+@@ -2472,44 +1619,18 @@
+ ;;
+
+ *)
+- func_fatal_help "invalid operation mode \`$opt_mode'"
++ func_fatal_help "invalid operation mode \`$mode'"
;;
esac
@@ -6357,13 +12562,13 @@
- else
- {
- func_help noexit
-- for mode in compile link execute install finish uninstall clean; do
+- for opt_mode in compile link execute install finish uninstall clean; do
- func_mode_help
- done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
- {
- func_help noexit
-- for mode in compile link execute install finish uninstall clean; do
+- for opt_mode in compile link execute install finish uninstall clean; do
- echo
- func_mode_help
- done
@@ -6385,7 +12590,34 @@
# func_mode_execute arg...
-@@ -1912,7 +1712,7 @@
+@@ -2522,16 +1643,13 @@
+ func_fatal_help "you must specify a COMMAND"
+
+ # Handle -dlopen flags immediately.
+- for file in $opt_dlopen; do
++ for file in $execute_dlfiles; do
+ test -f "$file" \
+ || func_fatal_help "\`$file' is not a file"
+
+ dir=
+ case $file in
+ *.la)
+- func_resolve_sysroot "$file"
+- file=$func_resolve_sysroot_result
+-
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$lib' is not a valid libtool archive"
+@@ -2553,7 +1671,7 @@
+ dir="$func_dirname_result"
+
+ if test -f "$dir/$objdir/$dlname"; then
+- func_append dir "/$objdir"
++ dir="$dir/$objdir"
+ else
+ if test ! -f "$dir/$dlname"; then
+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+@@ -2594,7 +1712,7 @@
for file
do
case $file in
@@ -6394,7 +12626,17 @@
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
-@@ -1954,7 +1754,7 @@
+@@ -2610,7 +1728,8 @@
+ ;;
+ esac
+ # Quote arguments (to preserve shell metacharacters).
+- func_append_quoted args "$file"
++ func_quote_for_eval "$file"
++ args="$args $func_quote_for_eval_result"
+ done
+
+ if test "X$opt_dry_run" = Xfalse; then
+@@ -2635,66 +1754,29 @@
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
@@ -6403,71 +12645,184 @@
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
-@@ -1995,23 +1795,23 @@
- # Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
-
-- echo "----------------------------------------------------------------------"
-- echo "Libraries have been installed in:"
+ fi
+ }
+
+-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
++test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+ # func_mode_finish arg...
+ func_mode_finish ()
+ {
+ $opt_debug
+- libs=
+- libdirs=
++ libdirs="$nonopt"
+ admincmds=
+
+- for opt in "$nonopt" ${1+"$@"}
+- do
+- if test -d "$opt"; then
+- func_append libdirs " $opt"
+-
+- elif test -f "$opt"; then
+- if func_lalib_unsafe_p "$opt"; then
+- func_append libs " $opt"
+- else
+- func_warning "\`$opt' is not a valid libtool archive"
+- fi
+-
+- else
+- func_fatal_error "invalid argument \`$opt'"
+- fi
+- done
+-
+- if test -n "$libs"; then
+- if test -n "$lt_sysroot"; then
+- sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+- sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+- else
+- sysroot_cmd=
+- fi
+-
+- # Remove sysroot references
+- if $opt_dry_run; then
+- for lib in $libs; do
+- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+- done
+- else
+- tmpdir=`func_mktempdir`
+- for lib in $libs; do
+- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+- > $tmpdir/tmp-la
+- mv -f $tmpdir/tmp-la $lib
+- done
+- ${RM}r "$tmpdir"
+- fi
+- fi
+-
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
++ for dir
++ do
++ libdirs="$libdirs $dir"
++ done
++
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+@@ -2704,64 +1786,62 @@
+ if test -n "$finish_eval"; then
+ # Do the single finish_eval.
+ eval cmds=\"$finish_eval\"
+- $opt_dry_run || eval "$cmds" || func_append admincmds "
++ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+ $cmds"
+ fi
+ done
+ fi
+
+- # Exit here if they wanted silent mode.
+- $opt_silent && exit $EXIT_SUCCESS
+-
+- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+- echo "----------------------------------------------------------------------"
+- echo "Libraries have been installed in:"
+- for libdir in $libdirs; do
+- $ECHO " $libdir"
+- done
+- echo
+- echo "If you ever happen to want to link against installed libraries"
+- echo "in a given directory, LIBDIR, you must either use libtool, and"
+- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+- echo "flag during linking and do at least one of the following:"
+- if test -n "$shlibpath_var"; then
+- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+- echo " during execution"
+- fi
+- if test -n "$runpath_var"; then
+- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+- echo " during linking"
+- fi
+- if test -n "$hardcode_libdir_flag_spec"; then
+- libdir=LIBDIR
+- eval flag=\"$hardcode_libdir_flag_spec\"
+-
+- $ECHO " - use the \`$flag' linker flag"
+- fi
+- if test -n "$admincmds"; then
+- $ECHO " - have your system administrator run these commands:$admincmds"
+- fi
+- if test -f /etc/ld.so.conf; then
+- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+- fi
+- echo
++ # Exit here if they wanted silent mode.
++ $opt_silent && exit $EXIT_SUCCESS
+
+- echo "See any operating system documentation about shared libraries for"
+- case $host in
+- solaris2.[6789]|solaris2.1[0-9])
+- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+- echo "pages."
+- ;;
+- *)
+- echo "more information, such as the ld(1) and ld.so(8) manual pages."
+- ;;
+- esac
+- echo "----------------------------------------------------------------------"
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ $ECHO "Libraries have been installed in:"
- for libdir in $libdirs; do
- $ECHO " $libdir"
- done
-- echo
-- echo "If you ever happen to want to link against installed libraries"
-- echo "in a given directory, LIBDIR, you must either use libtool, and"
-- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-- echo "flag during linking and do at least one of the following:"
++ for libdir in $libdirs; do
++ $ECHO " $libdir"
++ done
+ $ECHO
+ $ECHO "If you ever happen to want to link against installed libraries"
+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ $ECHO "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
-- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
-- echo " during execution"
++ if test -n "$shlibpath_var"; then
+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ $ECHO " during execution"
- fi
- if test -n "$runpath_var"; then
-- echo " - add LIBDIR to the \`$runpath_var' environment variable"
-- echo " during linking"
++ fi
++ if test -n "$runpath_var"; then
+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
+ $ECHO " during linking"
++ fi
++ if test -n "$hardcode_libdir_flag_spec"; then
++ libdir=LIBDIR
++ eval flag=\"$hardcode_libdir_flag_spec\"
++
++ $ECHO " - use the \`$flag' linker flag"
++ fi
++ if test -n "$admincmds"; then
++ $ECHO " - have your system administrator run these commands:$admincmds"
fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
-@@ -2023,21 +1823,21 @@
- $ECHO " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
-- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++ if test -f /etc/ld.so.conf; then
+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
-- echo
++ fi
+ $ECHO
-
-- echo "See any operating system documentation about shared libraries for"
++
+ $ECHO "See any operating system documentation about shared libraries for"
- case $host in
- solaris2.[6789]|solaris2.1[0-9])
-- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-- echo "pages."
++ case $host in
++ solaris2.[6789]|solaris2.1[0-9])
+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ $ECHO "pages."
- ;;
- *)
-- echo "more information, such as the ld(1) and ld.so(8) manual pages."
++ ;;
++ *)
+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
- ;;
- esac
-- echo "----------------------------------------------------------------------"
++ ;;
++ esac
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
}
-@@ -2052,7 +1852,7 @@
+-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
++test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+ # func_mode_install arg...
+@@ -2772,7 +1852,7 @@
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -6476,19 +12831,21 @@
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
-@@ -2067,11 +1867,6 @@
+@@ -2786,12 +1866,7 @@
+ # The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- install_prog="$install_prog$func_quote_for_eval_result"
+- func_append install_prog "$func_quote_for_eval_result"
- install_shared_prog=$install_prog
- case " $install_prog " in
- *[\\\ /]cp\ *) install_cp=: ;;
- *) install_cp=false ;;
- esac
++ install_prog="$install_prog$func_quote_for_eval_result"
# We need to accept at least all the BSD install flags.
dest=
-@@ -2081,10 +1876,8 @@
+@@ -2801,12 +1876,10 @@
install_type=
isdir=no
stripme=
@@ -6497,9 +12854,12 @@
do
- arg2=
if test -n "$dest"; then
- files="$files $dest"
+- func_append files " $dest"
++ files="$files $dest"
dest=$arg
-@@ -2094,9 +1887,10 @@
+ continue
+ fi
+@@ -2814,9 +1887,10 @@
case $arg in
-d) isdir=yes ;;
-f)
@@ -6513,7 +12873,7 @@
;;
-g | -m | -o)
prev=$arg
-@@ -2110,10 +1904,6 @@
+@@ -2830,10 +1904,6 @@
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
@@ -6524,32 +12884,68 @@
prev=
else
dest=$arg
-@@ -2125,10 +1915,6 @@
+@@ -2844,11 +1914,7 @@
+
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- install_prog="$install_prog $func_quote_for_eval_result"
+- func_append install_prog " $func_quote_for_eval_result"
- if test -n "$arg2"; then
- func_quote_for_eval "$arg2"
- fi
-- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
+- func_append install_shared_prog " $func_quote_for_eval_result"
++ install_prog="$install_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
-@@ -2137,13 +1923,6 @@
+@@ -2857,13 +1923,6 @@
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
- if test -n "$install_override_mode" && $no_mode; then
- if $install_cp; then :; else
- func_quote_for_eval "$install_override_mode"
-- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+- func_append install_shared_prog " -m $func_quote_for_eval_result"
- fi
- fi
-
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
-@@ -2231,7 +2010,7 @@
+@@ -2918,13 +1977,10 @@
+ case $file in
+ *.$libext)
+ # Do the static libraries later.
+- func_append staticlibs " $file"
++ staticlibs="$staticlibs $file"
+ ;;
+
+ *.la)
+- func_resolve_sysroot "$file"
+- file=$func_resolve_sysroot_result
+-
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$file' is not a valid libtool archive"
+@@ -2938,23 +1994,23 @@
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+- *) func_append current_libdirs " $libdir" ;;
++ *) current_libdirs="$current_libdirs $libdir" ;;
+ esac
+ else
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+- *) func_append future_libdirs " $libdir" ;;
++ *) future_libdirs="$future_libdirs $libdir" ;;
+ esac
+ fi
+
+ func_dirname "$file" "/" ""
+ dir="$func_dirname_result"
+- func_append dir "$objdir"
++ dir="$dir$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
@@ -6558,7 +12954,7 @@
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
-@@ -2244,9 +2023,9 @@
+@@ -2967,9 +2023,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -6570,7 +12966,7 @@
fi
func_warning "relinking \`$file'"
-@@ -2264,7 +2043,7 @@
+@@ -2987,7 +2043,7 @@
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
@@ -6579,7 +12975,16 @@
'exit $?'
tstripme="$stripme"
case $host_os in
-@@ -2404,7 +2183,7 @@
+@@ -3027,7 +2083,7 @@
+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+ # Maybe install the static library, too.
+- test -n "$old_library" && func_append staticlibs " $dir/$old_library"
++ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ ;;
+
+ *.lo)
+@@ -3127,7 +2183,7 @@
if test -f "$lib"; then
func_source "$lib"
fi
@@ -6588,7 +12993,7 @@
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
-@@ -2423,7 +2202,7 @@
+@@ -3146,7 +2202,7 @@
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -6597,7 +13002,7 @@
$opt_silent || {
func_quote_for_expand "$relink_command"
-@@ -2442,7 +2221,7 @@
+@@ -3165,7 +2221,7 @@
}
else
# Install the binary that we compiled earlier.
@@ -6606,7 +13011,16 @@
fi
fi
-@@ -2544,10 +2323,6 @@
+@@ -3224,7 +2280,7 @@
+ fi
+ }
+
+-test "$opt_mode" = install && func_mode_install ${1+"$@"}
++test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+ # func_generate_dlsyms outputname originator pic_p
+@@ -3267,22 +2323,6 @@
extern \"C\" {
#endif
@@ -6614,19 +13028,37 @@
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
+-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+- relocations are performed -- see ld's documentation on pseudo-relocs. */
+-# define LT_DLSYM_CONST
+-#elif defined(__osf__)
+-/* This system does not cope well with relocations in const data. */
+-# define LT_DLSYM_CONST
+-#else
+-# define LT_DLSYM_CONST const
+-#endif
+-
/* External symbol declarations for the compiler. */\
"
-@@ -2557,7 +2332,7 @@
+@@ -3292,11 +2332,10 @@
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
for progfile in $progfiles; do
- func_verbose "extracting global C symbols from \`$progfile'"
- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-@@ -2596,7 +2371,7 @@
+- func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+- $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
++ func_verbose "extracting global C symbols from \`$progfile'"
++ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -n "$exclude_expsyms"; then
+@@ -3332,7 +2371,7 @@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -6635,7 +13067,64 @@
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
-@@ -2640,10 +2415,10 @@
+@@ -3345,52 +2384,10 @@
+ func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_basename "$dlprefile"
+ name="$func_basename_result"
+- case $host in
+- *cygwin* | *mingw* | *cegcc* )
+- # if an import library, we need to obtain dlname
+- if func_win32_import_lib_p "$dlprefile"; then
+- func_tr_sh "$dlprefile"
+- eval "curr_lafile=\$libfile_$func_tr_sh_result"
+- dlprefile_dlbasename=""
+- if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+- # Use subshell, to avoid clobbering current variable values
+- dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+- if test -n "$dlprefile_dlname" ; then
+- func_basename "$dlprefile_dlname"
+- dlprefile_dlbasename="$func_basename_result"
+- else
+- # no lafile. user explicitly requested -dlpreopen <import library>.
+- $sharedlib_from_linklib_cmd "$dlprefile"
+- dlprefile_dlbasename=$sharedlib_from_linklib_result
+- fi
+- fi
+- $opt_dry_run || {
+- if test -n "$dlprefile_dlbasename" ; then
+- eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+- else
+- func_warning "Could not compute DLL name from $name"
+- eval '$ECHO ": $name " >> "$nlist"'
+- fi
+- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+- }
+- else # not an import lib
+- $opt_dry_run || {
+- eval '$ECHO ": $name " >> "$nlist"'
+- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+- }
+- fi
+- ;;
+- *)
+- $opt_dry_run || {
+- eval '$ECHO ": $name " >> "$nlist"'
+- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+- }
+- ;;
+- esac
++ $opt_dry_run || {
++ eval '$ECHO ": $name " >> "$nlist"'
++ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
++ }
+ done
+
+ $opt_dry_run || {
+@@ -3418,19 +2415,36 @@
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
@@ -6648,25 +13137,35 @@
/* The mapping between symbol names and symbols. */
typedef struct {
-@@ -2653,7 +2428,7 @@
- "
- case $host in
- *cygwin* | *mingw* | *cegcc* )
-- echo >> "$output_objdir/$my_dlsyms" "\
+ const char *name;
+ void *address;
+ } lt_dlsymlist;
+-extern LT_DLSYM_CONST lt_dlsymlist
++"
++ case $host in
++ *cygwin* | *mingw* | *cegcc* )
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
- /* DATA imports from DLLs on WIN32 con't be const, because
- runtime relocations are performed -- see ld's documentation
- on pseudo-relocs. */"
-@@ -2666,7 +2441,7 @@
- lt_dlsym_const=const ;;
- esac
-
-- echo >> "$output_objdir/$my_dlsyms" "\
++/* DATA imports from DLLs on WIN32 con't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs. */"
++ lt_dlsym_const= ;;
++ *osf5*)
++ echo >> "$output_objdir/$my_dlsyms" "\
++/* This system does not cope well with relocations in const data */"
++ lt_dlsym_const= ;;
++ *)
++ lt_dlsym_const=const ;;
++ esac
++
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
- extern $lt_dlsym_const lt_dlsymlist
++extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
- $lt_dlsym_const lt_dlsymlist
-@@ -2682,7 +2457,7 @@
+-LT_DLSYM_CONST lt_dlsymlist
++$lt_dlsym_const lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[] =
+ {\
+ { \"$my_originator\", (void *) 0 },"
+@@ -3443,7 +2457,7 @@
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
@@ -6675,7 +13174,16 @@
{0, (void *) 0}
};
-@@ -2740,16 +2515,16 @@
+@@ -3486,7 +2500,7 @@
+ for arg in $LTCFLAGS; do
+ case $arg in
+ -pie | -fpie | -fPIE) ;;
+- *) func_append symtab_cflags " $arg" ;;
++ *) symtab_cflags="$symtab_cflags $arg" ;;
+ esac
+ done
+
+@@ -3501,16 +2515,16 @@
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -6698,7 +13206,7 @@
;;
esac
;;
-@@ -2763,8 +2538,8 @@
+@@ -3524,8 +2538,8 @@
# really was required.
# Nullify the symbol file.
@@ -6709,7 +13217,7 @@
fi
}
-@@ -2774,7 +2549,6 @@
+@@ -3535,7 +2549,6 @@
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
@@ -6717,18 +13225,153 @@
func_win32_libid ()
{
$opt_debug
-@@ -2785,9 +2559,8 @@
+@@ -3546,11 +2559,9 @@
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
- # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+- func_to_tool_file "$1" func_convert_file_msys_to_w32
+- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $EGREP '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{
-@@ -2825,18 +2598,7 @@
+ / I /{
+@@ -3579,131 +2590,6 @@
+ $ECHO "$win32_libid_type"
+ }
+
+-# func_cygming_dll_for_implib ARG
+-#
+-# Platform-specific function to extract the
+-# name of the DLL associated with the specified
+-# import library ARG.
+-# Invoked by eval'ing the libtool variable
+-# $sharedlib_from_linklib_cmd
+-# Result is available in the variable
+-# $sharedlib_from_linklib_result
+-func_cygming_dll_for_implib ()
+-{
+- $opt_debug
+- sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+-}
+-
+-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+-#
+-# The is the core of a fallback implementation of a
+-# platform-specific function to extract the name of the
+-# DLL associated with the specified import library LIBNAME.
+-#
+-# SECTION_NAME is either .idata$6 or .idata$7, depending
+-# on the platform and compiler that created the implib.
+-#
+-# Echos the name of the DLL associated with the
+-# specified import library.
+-func_cygming_dll_for_implib_fallback_core ()
+-{
+- $opt_debug
+- match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+- $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+- $SED '/^Contents of section '"$match_literal"':/{
+- # Place marker at beginning of archive member dllname section
+- s/.*/====MARK====/
+- p
+- d
+- }
+- # These lines can sometimes be longer than 43 characters, but
+- # are always uninteresting
+- /:[ ]*file format pe[i]\{,1\}-/d
+- /^In archive [^:]*:/d
+- # Ensure marker is printed
+- /^====MARK====/p
+- # Remove all lines with less than 43 characters
+- /^.\{43\}/!d
+- # From remaining lines, remove first 43 characters
+- s/^.\{43\}//' |
+- $SED -n '
+- # Join marker and all lines until next marker into a single line
+- /^====MARK====/ b para
+- H
+- $ b para
+- b
+- :para
+- x
+- s/\n//g
+- # Remove the marker
+- s/^====MARK====//
+- # Remove trailing dots and whitespace
+- s/[\. \t]*$//
+- # Print
+- /./p' |
+- # we now have a list, one entry per line, of the stringified
+- # contents of the appropriate section of all members of the
+- # archive which possess that section. Heuristic: eliminate
+- # all those which have a first or second character that is
+- # a '.' (that is, objdump's representation of an unprintable
+- # character.) This should work for all archives with less than
+- # 0x302f exports -- but will fail for DLLs whose name actually
+- # begins with a literal '.' or a single character followed by
+- # a '.'.
+- #
+- # Of those that remain, print the first one.
+- $SED -e '/^\./d;/^.\./d;q'
+-}
+-
+-# func_cygming_gnu_implib_p ARG
+-# This predicate returns with zero status (TRUE) if
+-# ARG is a GNU/binutils-style import library. Returns
+-# with nonzero status (FALSE) otherwise.
+-func_cygming_gnu_implib_p ()
+-{
+- $opt_debug
+- func_to_tool_file "$1" func_convert_file_msys_to_w32
+- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+- test -n "$func_cygming_gnu_implib_tmp"
+-}
+-
+-# func_cygming_ms_implib_p ARG
+-# This predicate returns with zero status (TRUE) if
+-# ARG is an MS-style import library. Returns
+-# with nonzero status (FALSE) otherwise.
+-func_cygming_ms_implib_p ()
+-{
+- $opt_debug
+- func_to_tool_file "$1" func_convert_file_msys_to_w32
+- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+- test -n "$func_cygming_ms_implib_tmp"
+-}
+-
+-# func_cygming_dll_for_implib_fallback ARG
+-# Platform-specific function to extract the
+-# name of the DLL associated with the specified
+-# import library ARG.
+-#
+-# This fallback implementation is for use when $DLLTOOL
+-# does not support the --identify-strict option.
+-# Invoked by eval'ing the libtool variable
+-# $sharedlib_from_linklib_cmd
+-# Result is available in the variable
+-# $sharedlib_from_linklib_result
+-func_cygming_dll_for_implib_fallback ()
+-{
+- $opt_debug
+- if func_cygming_gnu_implib_p "$1" ; then
+- # binutils import library
+- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+- elif func_cygming_ms_implib_p "$1" ; then
+- # ms-generated import library
+- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+- else
+- # unknown
+- sharedlib_from_linklib_result=""
+- fi
+-}
+
+
+ # func_extract_an_archive dir oldlib
+@@ -3712,18 +2598,7 @@
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
@@ -6748,7 +13391,7 @@
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
-@@ -2907,7 +2669,7 @@
+@@ -3794,7 +2669,7 @@
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -6757,7 +13400,7 @@
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
-@@ -2922,30 +2684,25 @@
+@@ -3809,30 +2684,25 @@
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
@@ -6800,7 +13443,7 @@
$ECHO "\
#! $SHELL
-@@ -2961,6 +2718,7 @@
+@@ -3848,6 +2718,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -6808,7 +13451,7 @@
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
-@@ -2991,132 +2749,31 @@
+@@ -3878,132 +2749,31 @@
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
@@ -6959,7 +13602,7 @@
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
-@@ -3126,13 +2783,30 @@
+@@ -4013,13 +2783,30 @@
esac
fi
@@ -6993,7 +13636,7 @@
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
-@@ -3140,7 +2814,7 @@
+@@ -4027,7 +2814,7 @@
fi
# remove .libs from thisdir
case \"\$thisdir\" in
@@ -7002,7 +13645,26 @@
$objdir ) thisdir=. ;;
esac
fi
-@@ -3203,7 +2877,7 @@
+@@ -4082,18 +2869,6 @@
+
+ if test -f \"\$progdir/\$program\"; then"
+
+- # fixup the dll searchpath if we need to.
+- #
+- # Fix the DLL searchpath if we need to. Do this before prepending
+- # to shlibpath, because on Windows, both are PATH and uninstalled
+- # libraries must come first.
+- if test -n "$dllsearchpath"; then
+- $ECHO "\
+- # Add the dll search path components to the executable PATH
+- PATH=$dllsearchpath:\$PATH
+-"
+- fi
+-
+ # Export our shlibpath_var if we have one.
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $ECHO "\
+@@ -4102,29 +2877,254 @@
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
@@ -7011,7 +13673,16 @@
export $shlibpath_var
"
-@@ -3220,18 +2894,64 @@
+ fi
+
++ # fixup the dll searchpath if we need to.
++ if test -n "$dllsearchpath"; then
++ $ECHO "\
++ # Add the dll search path components to the executable PATH
++ PATH=$dllsearchpath:\$PATH
++"
++ fi
++
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
@@ -7077,127 +13748,181 @@
+}
- # func_to_host_path arg
-@@ -3258,19 +2978,23 @@
- func_to_host_path ()
- {
- func_to_host_path_result="$1"
-- if test -n "$1"; then
++# func_to_host_path arg
++#
++# Convert paths to host format when used with build tools.
++# Intended for use with "native" mingw (where libtool itself
++# is running under the msys shell), or in the following cross-
++# build environments:
++# $build $host
++# mingw (msys) mingw [e.g. native]
++# cygwin mingw
++# *nix + wine mingw
++# where wine is equipped with the `winepath' executable.
++# In the native mingw case, the (msys) shell automatically
++# converts paths for any non-msys applications it launches,
++# but that facility isn't available from inside the cwrapper.
++# Similar accommodations are necessary for $host mingw and
++# $build cygwin. Calling this function does no harm for other
++# $host/$build combinations not listed above.
++#
++# ARG is the path (on $build) that should be converted to
++# the proper representation for $host. The result is stored
++# in $func_to_host_path_result.
++func_to_host_path ()
++{
++ func_to_host_path_result="$1"
+ if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- case $build in
- *mingw* ) # actually, msys
- # awkward: cmd appends spaces to result
-- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
-- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++ case $host in
++ *mingw* )
++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++ case $build in
++ *mingw* ) # actually, msys
++ # awkward: cmd appends spaces to result
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
-- func_to_host_path_result=`cygpath -w "$1" |
-- $SED -e "$lt_sed_naive_backslashify"`
++ ;;
++ *cygwin* )
+ func_to_host_path_tmp1=`cygpath -w "$1"`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # Unfortunately, winepath does not exit with a non-zero
-@@ -3282,17 +3006,17 @@
- # the odd construction:
- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
++ ;;
++ * )
++ # Unfortunately, winepath does not exit with a non-zero
++ # error code, so we are forced to check the contents of
++ # stdout. On the other hand, if the command is not
++ # found, the shell will set an exit code of 127 and print
++ # *an error message* to stdout. So we must check for both
++ # error code of zero AND non-empty stdout, which explains
++ # the odd construction:
++ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
++ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- else
- # Allow warning below.
-- func_to_host_path_result=
++ $SED -e "$lt_sed_naive_backslashify"`
++ else
++ # Allow warning below.
+ func_to_host_path_result=""
- fi
- ;;
- esac
- if test -z "$func_to_host_path_result" ; then
- func_error "Could not determine host path corresponding to"
-- func_error " \`$1'"
++ fi
++ ;;
++ esac
++ if test -z "$func_to_host_path_result" ; then
++ func_error "Could not determine host path corresponding to"
+ func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_path_result="$1"
-@@ -3325,24 +3049,30 @@
- func_to_host_pathlist ()
- {
- func_to_host_pathlist_result="$1"
-- if test -n "$1"; then
++ func_error "Continuing, but uninstalled executables may not work."
++ # Fallback:
++ func_to_host_path_result="$1"
++ fi
++ ;;
++ esac
++ fi
++}
++# end: func_to_host_path
++
++# func_to_host_pathlist arg
++#
++# Convert pathlists to host format when used with build tools.
++# See func_to_host_path(), above. This function supports the
++# following $build/$host combinations (but does no harm for
++# combinations not listed here):
++# $build $host
++# mingw (msys) mingw [e.g. native]
++# cygwin mingw
++# *nix + wine mingw
++#
++# Path separators are also converted from $build format to
++# $host format. If ARG begins or ends with a path separator
++# character, it is preserved (but converted to $host format)
++# on output.
++#
++# ARG is a pathlist (on $build) that should be converted to
++# the proper representation on $host. The result is stored
++# in $func_to_host_pathlist_result.
++func_to_host_pathlist ()
++{
++ func_to_host_pathlist_result="$1"
+ if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- # Remove leading and trailing path separator characters from
- # ARG. msys behavior is inconsistent here, cygpath turns them
- # into '.;' and ';.', and winepath ignores them completely.
-- func_stripname : : "$1"
-- func_to_host_pathlist_tmp1=$func_stripname_result
++ case $host in
++ *mingw* )
++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++ # Remove leading and trailing path separator characters from
++ # ARG. msys behavior is inconsistent here, cygpath turns them
++ # into '.;' and ';.', and winepath ignores them completely.
+ func_to_host_pathlist_tmp2="$1"
+ # Once set for this call, this variable should not be
+ # reassigned. It is used in tha fallback case.
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e 's|^:*||' -e 's|:*$||'`
- case $build in
- *mingw* ) # Actually, msys.
- # Awkward: cmd appends spaces to result.
-- func_to_host_pathlist_result=`
-- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
-- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++ case $build in
++ *mingw* ) # Actually, msys.
++ # Awkward: cmd appends spaces to result.
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
-- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
++ ;;
++ *cygwin* )
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
-@@ -3358,17 +3088,18 @@
- if test -z "$func_to_host_pathlist_result" ; then
- func_to_host_pathlist_result="$func_to_host_path_result"
- else
-- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
++ $SED -e "$lt_sed_naive_backslashify"`
++ ;;
++ * )
++ # unfortunately, winepath doesn't convert pathlists
++ func_to_host_pathlist_result=""
++ func_to_host_pathlist_oldIFS=$IFS
++ IFS=:
++ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
++ IFS=$func_to_host_pathlist_oldIFS
++ if test -n "$func_to_host_pathlist_f" ; then
++ func_to_host_path "$func_to_host_pathlist_f"
++ if test -n "$func_to_host_path_result" ; then
++ if test -z "$func_to_host_pathlist_result" ; then
++ func_to_host_pathlist_result="$func_to_host_path_result"
++ else
+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
- fi
- fi
- fi
++ fi
++ fi
++ fi
+ IFS=:
- done
- IFS=$func_to_host_pathlist_oldIFS
- ;;
- esac
-- if test -z "$func_to_host_pathlist_result"; then
++ done
++ IFS=$func_to_host_pathlist_oldIFS
++ ;;
++ esac
+ if test -z "$func_to_host_pathlist_result" ; then
- func_error "Could not determine the host path(s) corresponding to"
-- func_error " \`$1'"
++ func_error "Could not determine the host path(s) corresponding to"
+ func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This may break if $1 contains DOS-style drive
- # specifications. The fix is not to complicate the expression
-@@ -3385,7 +3116,7 @@
- ;;
- esac
- case "$1" in
-- *: ) func_append func_to_host_pathlist_result ";"
++ func_error "Continuing, but uninstalled executables may not work."
++ # Fallback. This may break if $1 contains DOS-style drive
++ # specifications. The fix is not to complicate the expression
++ # below, but for the user to provide a working wine installation
++ # with winepath so that path translation in the cross-to-mingw
++ # case works properly.
++ lt_replace_pathsep_nix_to_dos="s|:|;|g"
++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
++ $SED -e "$lt_replace_pathsep_nix_to_dos"`
++ fi
++ # Now, add the leading and trailing path separators back
++ case "$1" in
++ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
++ ;;
++ esac
++ case "$1" in
+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
- ;;
- esac
- ;;
-@@ -3410,23 +3141,31 @@
++ ;;
++ esac
++ ;;
++ esac
++ fi
++}
++# end: func_to_host_pathlist
++
+ # func_emit_cwrapperexe_src
+ # emit the source code for a wrapper executable on stdout
+ # Must ONLY be called from within func_mode_link because
+@@ -4141,71 +3141,41 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
@@ -7223,19 +13948,17 @@
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
-+# define HAVE_SETENV
-+# ifdef __STRICT_ANSI__
-+char *realpath (const char *, char *);
-+int putenv (char *);
-+int setenv (const char *, const char *, int);
-+# endif
- # endif
- #endif
- #include <malloc.h>
-@@ -3438,44 +3177,6 @@
- #include <fcntl.h>
- #include <sys/stat.h>
-
+-# endif
+-#endif
+-#include <malloc.h>
+-#include <stdarg.h>
+-#include <assert.h>
+-#include <string.h>
+-#include <ctype.h>
+-#include <errno.h>
+-#include <fcntl.h>
+-#include <sys/stat.h>
+-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
@@ -7243,7 +13966,9 @@
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
--char *realpath (const char *, char *);
++# define HAVE_SETENV
++# ifdef __STRICT_ANSI__
+ char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
@@ -7261,7 +13986,10 @@
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
--# endif
++int putenv (char *);
++int setenv (const char *, const char *, int);
++# endif
+ # endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat _stat
@@ -7272,12 +14000,19 @@
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
--#endif
--
+ #endif
++#include <malloc.h>
++#include <stdarg.h>
++#include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <sys/stat.h>
+
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
- #elif defined(MAXPATHLEN)
-@@ -3491,7 +3192,14 @@
+@@ -4222,7 +3192,14 @@
# define S_IXGRP 0
#endif
@@ -7293,7 +14028,7 @@
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
-@@ -3522,6 +3230,10 @@
+@@ -4253,6 +3230,10 @@
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
@@ -7304,7 +14039,7 @@
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
-@@ -3534,13 +3246,22 @@
+@@ -4265,13 +3246,22 @@
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
@@ -7331,7 +14066,7 @@
void *xmalloc (size_t num);
char *xstrdup (const char *string);
-@@ -3550,17 +3271,31 @@
+@@ -4281,27 +3271,41 @@
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
@@ -7368,8 +14103,34 @@
+ echo ";"
cat <<EOF
- const char * MAGIC_EXE = "$magic_exe";
-@@ -3605,10 +3340,24 @@
+-volatile const char * MAGIC_EXE = "$magic_exe";
++const char * MAGIC_EXE = "$magic_exe";
+ const char * LIB_PATH_VARNAME = "$shlibpath_var";
+ EOF
+
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+- func_to_host_path "$temp_rpath"
++ func_to_host_pathlist "$temp_rpath"
+ cat <<EOF
+-const char * LIB_PATH_VALUE = "$func_to_host_path_result";
++const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
+ EOF
+ else
+ cat <<"EOF"
+@@ -4310,10 +3314,10 @@
+ fi
+
+ if test -n "$dllsearchpath"; then
+- func_to_host_path "$dllsearchpath:"
++ func_to_host_pathlist "$dllsearchpath:"
+ cat <<EOF
+ const char * EXE_PATH_VARNAME = "PATH";
+-const char * EXE_PATH_VALUE = "$func_to_host_path_result";
++const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
+ EOF
+ else
+ cat <<"EOF"
+@@ -4336,10 +3340,24 @@
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
@@ -7395,7 +14156,7 @@
int
main (int argc, char *argv[])
-@@ -3625,13 +3374,10 @@
+@@ -4356,13 +3374,10 @@
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
@@ -7412,7 +14173,7 @@
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3645,57 +3391,25 @@
+@@ -4376,57 +3391,25 @@
esac
cat <<"EOF"
@@ -7479,7 +14240,7 @@
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
-@@ -3713,9 +3427,8 @@
+@@ -4444,9 +3427,8 @@
target_name = tmp_pathspec;
tmp_pathspec = 0;
@@ -7491,12 +14252,18 @@
EOF
cat <<EOF
-@@ -3768,12 +3481,77 @@
+@@ -4496,19 +3478,80 @@
+
+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */
+- /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
+- be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+- because on Windows, both *_VARNAMEs are PATH but uninstalled
+- libraries must come first. */
+- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-
-- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-- nonnull (lt_argv_zero));
++ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
++
+ newargc=0;
+ for (i = 1; i < argc; i++)
+ {
@@ -7563,7 +14330,9 @@
+ newargz[++newargc] = xstrdup (argv[i]);
+ }
+ newargz[++newargc] = NULL;
-+
+
+- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+- nonnull (lt_argv_zero));
+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
for (i = 0; i < newargc; i++)
{
@@ -7573,7 +14342,7 @@
}
EOF
-@@ -3782,14 +3560,11 @@
+@@ -4517,14 +3560,11 @@
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
@@ -7589,7 +14358,7 @@
return 127;
}
return rval;
-@@ -3811,7 +3586,7 @@
+@@ -4546,7 +3586,7 @@
{
void *p = (void *) malloc (num);
if (!p)
@@ -7598,7 +14367,7 @@
return p;
}
-@@ -3845,8 +3620,8 @@
+@@ -4580,8 +3620,8 @@
{
struct stat st;
@@ -7609,7 +14378,7 @@
if ((!path) || (!*path))
return 0;
-@@ -3863,8 +3638,8 @@
+@@ -4598,8 +3638,8 @@
int rval = 0;
struct stat st;
@@ -7620,7 +14389,7 @@
if ((!path) || (!*path))
return 0;
-@@ -3890,8 +3665,8 @@
+@@ -4625,8 +3665,8 @@
int tmp_len;
char *concat_name;
@@ -7631,7 +14400,7 @@
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
-@@ -3944,8 +3719,7 @@
+@@ -4679,8 +3719,7 @@
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -7641,7 +14410,7 @@
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3970,8 +3744,7 @@
+@@ -4705,8 +3744,7 @@
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -7651,7 +14420,7 @@
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
-@@ -3997,9 +3770,8 @@
+@@ -4732,9 +3770,8 @@
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
@@ -7663,7 +14432,7 @@
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
-@@ -4021,9 +3793,8 @@
+@@ -4756,9 +3793,8 @@
}
else
{
@@ -7675,7 +14444,7 @@
}
}
XFREE (tmp_pathspec);
-@@ -4036,8 +3807,7 @@
+@@ -4771,8 +3807,7 @@
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
@@ -7685,7 +14454,7 @@
}
return xstrdup (tmp_pathspec);
#endif
-@@ -4063,25 +3833,11 @@
+@@ -4798,25 +3833,11 @@
return str;
}
@@ -7713,7 +14482,7 @@
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
-@@ -4090,32 +3846,20 @@
+@@ -4825,32 +3846,20 @@
}
void
@@ -7751,7 +14520,7 @@
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
-@@ -4160,12 +3904,95 @@
+@@ -4895,12 +3904,95 @@
return new_value;
}
@@ -7850,7 +14619,7 @@
if (name && *name && value && *value)
{
-@@ -4184,9 +4011,9 @@
+@@ -4919,9 +4011,9 @@
void
lt_update_lib_path (const char *name, const char *value)
{
@@ -7863,7 +14632,7 @@
if (name && *name && value && *value)
{
-@@ -4196,152 +4023,11 @@
+@@ -4931,152 +4023,11 @@
}
}
@@ -8016,7 +14785,7 @@
# func_mode_link arg...
func_mode_link ()
{
-@@ -4386,7 +4072,6 @@
+@@ -5121,7 +4072,6 @@
new_inherited_linker_flags=
avoid_version=no
@@ -8024,7 +14793,7 @@
dlfiles=
dlprefiles=
dlself=no
-@@ -4479,11 +4164,6 @@
+@@ -5214,11 +4164,6 @@
esac
case $prev in
@@ -8036,7 +14805,105 @@
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
-@@ -4745,11 +4425,6 @@
+@@ -5250,9 +4195,9 @@
+ ;;
+ *)
+ if test "$prev" = dlfiles; then
+- func_append dlfiles " $arg"
++ dlfiles="$dlfiles $arg"
+ else
+- func_append dlprefiles " $arg"
++ dlprefiles="$dlprefiles $arg"
+ fi
+ prev=
+ continue
+@@ -5276,7 +4221,7 @@
+ *-*-darwin*)
+ case "$deplibs " in
+ *" $qarg.ltframework "*) ;;
+- *) func_append deplibs " $qarg.ltframework" # this is fixed later
++ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ ;;
+ esac
+ ;;
+@@ -5295,7 +4240,7 @@
+ moreargs=
+ for fil in `cat "$save_arg"`
+ do
+-# func_append moreargs " $fil"
++# moreargs="$moreargs $fil"
+ arg=$fil
+ # A libtool-controlled object.
+
+@@ -5324,7 +4269,7 @@
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+- func_append dlfiles " $pic_object"
++ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+@@ -5336,7 +4281,7 @@
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+- func_append dlprefiles " $pic_object"
++ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
+
+@@ -5406,12 +4351,12 @@
+ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+- *) func_append rpath " $arg" ;;
++ *) rpath="$rpath $arg" ;;
+ esac
+ else
+ case "$xrpath " in
+ *" $arg "*) ;;
+- *) func_append xrpath " $arg" ;;
++ *) xrpath="$xrpath $arg" ;;
+ esac
+ fi
+ prev=
+@@ -5423,28 +4368,28 @@
+ continue
+ ;;
+ weak)
+- func_append weak_libs " $arg"
++ weak_libs="$weak_libs $arg"
+ prev=
+ continue
+ ;;
+ xcclinker)
+- func_append linker_flags " $qarg"
+- func_append compiler_flags " $qarg"
++ linker_flags="$linker_flags $qarg"
++ compiler_flags="$compiler_flags $qarg"
+ prev=
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
+ continue
+ ;;
+ xcompiler)
+- func_append compiler_flags " $qarg"
++ compiler_flags="$compiler_flags $qarg"
+ prev=
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
+ continue
+ ;;
+ xlinker)
+- func_append linker_flags " $qarg"
+- func_append compiler_flags " $wl$qarg"
++ linker_flags="$linker_flags $qarg"
++ compiler_flags="$compiler_flags $wl$qarg"
+ prev=
+ func_append compile_command " $wl$qarg"
+ func_append finalize_command " $wl$qarg"
+@@ -5480,11 +4425,6 @@
continue
;;
@@ -8048,7 +14915,44 @@
-dlopen)
prev=dlfiles
continue
-@@ -4828,7 +4503,7 @@
+@@ -5535,16 +4475,15 @@
+ ;;
+
+ -L*)
+- func_stripname "-L" '' "$arg"
+- if test -z "$func_stripname_result"; then
++ func_stripname '-L' '' "$arg"
++ dir=$func_stripname_result
++ if test -z "$dir"; then
+ if test "$#" -gt 0; then
+ func_fatal_error "require no space between \`-L' and \`$1'"
+ else
+ func_fatal_error "need path for \`-L' option"
+ fi
+ fi
+- func_resolve_sysroot "$func_stripname_result"
+- dir=$func_resolve_sysroot_result
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+@@ -5556,30 +4495,24 @@
+ ;;
+ esac
+ case "$deplibs " in
+- *" -L$dir "* | *" $arg "*)
+- # Will only happen for absolute or sysroot arguments
+- ;;
++ *" -L$dir "*) ;;
+ *)
+- # Preserve sysroot, but never include relative directories
+- case $dir in
+- [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+- *) func_append deplibs " -L$dir" ;;
+- esac
+- func_append lib_search_path " $dir"
++ deplibs="$deplibs -L$dir"
++ lib_search_path="$lib_search_path $dir"
+ ;;
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
@@ -8057,7 +14961,18 @@
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
-@@ -4847,7 +4522,7 @@
+- *) func_append dllsearchpath ":$dir";;
++ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ ::) dllsearchpath=$testbindir;;
+- *) func_append dllsearchpath ":$testbindir";;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
+ ;;
+ esac
+@@ -5589,7 +4522,7 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -8066,16 +14981,94 @@
# These systems don't actually have a C or math library (as such)
continue
;;
-@@ -5033,7 +4708,7 @@
+@@ -5603,7 +4536,7 @@
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+- func_append deplibs " System.ltframework"
++ deplibs="$deplibs System.ltframework"
+ continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+@@ -5623,7 +4556,7 @@
+ ;;
+ esac
+ fi
+- func_append deplibs " $arg"
++ deplibs="$deplibs $arg"
+ continue
+ ;;
+
+@@ -5635,8 +4568,8 @@
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
+ # classes, name mangling, and exception handling.
+ # Darwin uses the -arch flag to determine output architecture.
+- -model|-arch|-isysroot|--sysroot)
+- func_append compiler_flags " $arg"
++ -model|-arch|-isysroot)
++ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ prev=xcompiler
+@@ -5644,12 +4577,12 @@
+ ;;
+
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+- func_append compiler_flags " $arg"
++ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case "$new_inherited_linker_flags " in
+ *" $arg "*) ;;
+- * ) func_append new_inherited_linker_flags " $arg" ;;
++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+ esac
+ continue
+ ;;
+@@ -5716,17 +4649,13 @@
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+- =*)
+- func_stripname '=' '' "$dir"
+- dir=$lt_sysroot$func_stripname_result
+- ;;
+ *)
+ func_fatal_error "only absolute run-paths are allowed"
+ ;;
+ esac
+ case "$xrpath " in
+ *" $dir "*) ;;
+- *) func_append xrpath " $dir" ;;
++ *) xrpath="$xrpath $dir" ;;
+ esac
+ continue
+ ;;
+@@ -5779,8 +4708,8 @@
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
-- arg="$arg $func_quote_for_eval_result"
+- func_append arg " $func_quote_for_eval_result"
+- func_append compiler_flags " $func_quote_for_eval_result"
+ arg="$arg $wl$func_quote_for_eval_result"
- compiler_flags="$compiler_flags $func_quote_for_eval_result"
++ compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
-@@ -5079,19 +4754,18 @@
+ func_stripname ' ' '' "$arg"
+@@ -5795,9 +4724,9 @@
+ for flag in $args; do
+ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+- func_append arg " $wl$func_quote_for_eval_result"
+- func_append compiler_flags " $wl$func_quote_for_eval_result"
+- func_append linker_flags " $func_quote_for_eval_result"
++ arg="$arg $wl$func_quote_for_eval_result"
++ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
++ linker_flags="$linker_flags $func_quote_for_eval_result"
+ done
+ IFS="$save_ifs"
+ func_stripname ' ' '' "$arg"
+@@ -5825,27 +4754,23 @@
arg="$func_quote_for_eval_result"
;;
@@ -8090,6 +15083,8 @@
- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
- # @file GCC response files
- # -tp=* Portland pgcc target processor selection
+- # --sysroot=* for sysroot support
+- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
@@ -8101,12 +15096,77 @@
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
-@@ -5251,7 +4925,7 @@
+ func_append finalize_command " $arg"
+- func_append compiler_flags " $arg"
++ compiler_flags="$compiler_flags $arg"
+ continue
+ ;;
+
+@@ -5857,7 +4782,7 @@
+
+ *.$objext)
+ # A standard object.
+- func_append objs " $arg"
++ objs="$objs $arg"
+ ;;
+
+ *.lo)
+@@ -5888,7 +4813,7 @@
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+- func_append dlfiles " $pic_object"
++ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+@@ -5900,7 +4825,7 @@
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+- func_append dlprefiles " $pic_object"
++ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
+
+@@ -5945,25 +4870,24 @@
+
+ *.$libext)
+ # An archive.
+- func_append deplibs " $arg"
+- func_append old_deplibs " $arg"
++ deplibs="$deplibs $arg"
++ old_deplibs="$old_deplibs $arg"
+ continue
+ ;;
+
+ *.la)
+ # A libtool-controlled library.
+
+- func_resolve_sysroot "$arg"
+ if test "$prev" = dlfiles; then
+ # This library was specified with -dlopen.
+- func_append dlfiles " $func_resolve_sysroot_result"
++ dlfiles="$dlfiles $arg"
+ prev=
+ elif test "$prev" = dlprefiles; then
+ # The library was specified with -dlpreopen.
+- func_append dlprefiles " $func_resolve_sysroot_result"
++ dlprefiles="$dlprefiles $arg"
+ prev=
+ else
+- func_append deplibs " $func_resolve_sysroot_result"
++ deplibs="$deplibs $arg"
+ fi
+ continue
+ ;;
+@@ -6001,7 +4925,7 @@
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
@@ -8115,7 +15175,44 @@
else
shlib_search_path=
fi
-@@ -5359,7 +5033,10 @@
+@@ -6010,8 +4934,6 @@
+
+ func_dirname "$output" "/" ""
+ output_objdir="$func_dirname_result$objdir"
+- func_to_tool_file "$output_objdir/"
+- tool_output_objdir=$func_to_tool_file_result
+ # Create the object directory.
+ func_mkdir_p "$output_objdir"
+
+@@ -6032,12 +4954,12 @@
+ # 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 $opt_preserve_dup_deps ; then
++ if $opt_duplicate_deps ; then
+ case "$libs " in
+- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+- func_append libs " $deplib"
++ libs="$libs $deplib"
+ done
+
+ if test "$linkmode" = lib; then
+@@ -6050,9 +4972,9 @@
+ if $opt_duplicate_compiler_generated_deps; then
+ for pre_post_dep in $predeps $postdeps; do
+ case "$pre_post_deps " in
+- *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
++ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ esac
+- func_append pre_post_deps " $pre_post_dep"
++ pre_post_deps="$pre_post_deps $pre_post_dep"
+ done
+ fi
+ pre_post_deps=
+@@ -6111,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -8127,7 +15224,16 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5374,8 +5051,7 @@
+@@ -6119,19 +5044,17 @@
+ for lib in $dlprefiles; do
+ # Ignore non-libtool-libs
+ dependency_libs=
+- func_resolve_sysroot "$lib"
+ case $lib in
+- *.la) func_source "$func_resolve_sysroot_result" ;;
++ *.la) func_source "$lib" ;;
+ esac
+
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
@@ -8136,8 +15242,80 @@
+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) deplibs="$deplibs $deplib" ;;
-@@ -5554,7 +5230,7 @@
+- *) func_append deplibs " $deplib" ;;
++ *) deplibs="$deplibs $deplib" ;;
+ esac
+ done
+ done
+@@ -6152,11 +5075,11 @@
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+- func_append compiler_flags " $deplib"
++ compiler_flags="$compiler_flags $deplib"
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+- * ) func_append new_inherited_linker_flags " $deplib" ;;
++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ esac
+ fi
+ fi
+@@ -6241,7 +5164,7 @@
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+- * ) func_append new_inherited_linker_flags " $deplib" ;;
++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ esac
+ fi
+ fi
+@@ -6254,8 +5177,7 @@
+ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ func_stripname '-L' '' "$deplib"
+- func_resolve_sysroot "$func_stripname_result"
+- func_append newlib_search_path " $func_resolve_sysroot_result"
++ newlib_search_path="$newlib_search_path $func_stripname_result"
+ ;;
+ prog)
+ if test "$pass" = conv; then
+@@ -6269,8 +5191,7 @@
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ func_stripname '-L' '' "$deplib"
+- func_resolve_sysroot "$func_stripname_result"
+- func_append newlib_search_path " $func_resolve_sysroot_result"
++ newlib_search_path="$newlib_search_path $func_stripname_result"
+ ;;
+ *)
+ func_warning "\`-L' is ignored for archives/objects"
+@@ -6281,21 +5202,17 @@
+ -R*)
+ if test "$pass" = link; then
+ func_stripname '-R' '' "$deplib"
+- func_resolve_sysroot "$func_stripname_result"
+- dir=$func_resolve_sysroot_result
++ dir=$func_stripname_result
+ # Make sure the xrpath contains only unique directories.
+ case "$xrpath " in
+ *" $dir "*) ;;
+- *) func_append xrpath " $dir" ;;
++ *) xrpath="$xrpath $dir" ;;
+ esac
+ fi
+ deplibs="$deplib $deplibs"
+ continue
+ ;;
+- *.la)
+- func_resolve_sysroot "$deplib"
+- lib=$func_resolve_sysroot_result
+- ;;
++ *.la) lib="$deplib" ;;
+ *.$libext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+@@ -6313,7 +5230,7 @@
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
@@ -8146,7 +15324,7 @@
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
-@@ -5564,15 +5240,15 @@
+@@ -6323,15 +5240,15 @@
;;
esac
if test "$valid_a_lib" != yes; then
@@ -8169,7 +15347,21 @@
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
-@@ -5645,7 +5321,7 @@
+@@ -6358,11 +5275,11 @@
+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+- func_append newdlprefiles " $deplib"
++ newdlprefiles="$newdlprefiles $deplib"
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+- func_append newdlfiles " $deplib"
++ newdlfiles="$newdlfiles $deplib"
+ fi
+ fi
+ continue
+@@ -6404,20 +5321,20 @@
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
@@ -8178,7 +15370,8 @@
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
-@@ -5653,7 +5329,7 @@
+- *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
++ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
esac
done
fi
@@ -8187,10 +15380,21 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -5671,19 +5347,19 @@
+- test -n "$dlopen" && func_append dlfiles " $dlopen"
+- test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
++ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
++ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ fi
+
+ if test "$pass" = conv; then
+@@ -6428,36 +5345,30 @@
+ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
# It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
+- func_append convenience " $ladir/$objdir/$old_library"
+- func_append old_convenience " $ladir/$objdir/$old_library"
++ convenience="$convenience $ladir/$objdir/$old_library"
++ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
@@ -8207,17 +15411,218 @@
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
-- if $opt_duplicate_deps ; then
+- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
-- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
-- tmp_libs="$tmp_libs $deplib"
+- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
-@@ -5907,7 +5583,7 @@
+
+ # Get the name of the library we link against.
+ linklib=
+- if test -n "$old_library" &&
+- { test "$prefer_static_libs" = yes ||
+- test "$prefer_static_libs,$installed" = "built,no"; }; then
+- linklib=$old_library
+- else
+- for l in $old_library $library_names; do
+- linklib="$l"
+- done
+- fi
++ for l in $old_library $library_names; do
++ linklib="$l"
++ done
+ if test -z "$linklib"; then
+ func_fatal_error "cannot find name of link library for \`$lib'"
+ fi
+@@ -6474,9 +5385,9 @@
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+ # bomb out in the load deplibs phase.
+- func_append dlprefiles " $lib $dependency_libs"
++ dlprefiles="$dlprefiles $lib $dependency_libs"
+ else
+- func_append newdlfiles " $lib"
++ newdlfiles="$newdlfiles $lib"
+ fi
+ continue
+ fi # $pass = dlopen
+@@ -6498,14 +5409,14 @@
+
+ # Find the relevant object directory and library name.
+ if test "X$installed" = Xyes; then
+- if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ func_warning "library \`$lib' was moved."
+ dir="$ladir"
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$lt_sysroot$libdir"
+- absdir="$lt_sysroot$libdir"
++ dir="$libdir"
++ absdir="$libdir"
+ fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+@@ -6513,12 +5424,12 @@
+ dir="$ladir"
+ absdir="$abs_ladir"
+ # Remove this search path later
+- func_append notinst_path " $abs_ladir"
++ notinst_path="$notinst_path $abs_ladir"
+ else
+ dir="$ladir/$objdir"
+ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+- func_append notinst_path " $abs_ladir"
++ notinst_path="$notinst_path $abs_ladir"
+ fi
+ fi # $installed = yes
+ func_stripname 'lib' '.la' "$laname"
+@@ -6529,46 +5440,20 @@
+ if test -z "$libdir" && test "$linkmode" = prog; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ fi
+- case "$host" in
+- # special handling for platforms with PE-DLLs.
+- *cygwin* | *mingw* | *cegcc* )
+- # Linker will automatically link against shared library if both
+- # static and shared are present. Therefore, ensure we extract
+- # symbols from the import library if a shared library is present
+- # (otherwise, the dlopen module name will be incorrect). We do
+- # this by putting the import library name into $newdlprefiles.
+- # We recover the dlopen module name by 'saving' the la file
+- # name in a special purpose variable, and (later) extracting the
+- # dlname from the la file.
+- if test -n "$dlname"; then
+- func_tr_sh "$dir/$linklib"
+- eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+- func_append newdlprefiles " $dir/$linklib"
+- else
+- func_append newdlprefiles " $dir/$old_library"
+- # Keep a list of preopened convenience libraries to check
+- # that they are being used correctly in the link pass.
+- test -z "$libdir" && \
+- func_append dlpreconveniencelibs " $dir/$old_library"
+- fi
+- ;;
+- * )
+- # Prefer using a static library (so that no silly _DYNAMIC symbols
+- # are required to link).
+- if test -n "$old_library"; then
+- func_append newdlprefiles " $dir/$old_library"
+- # Keep a list of preopened convenience libraries to check
+- # that they are being used correctly in the link pass.
+- test -z "$libdir" && \
+- func_append dlpreconveniencelibs " $dir/$old_library"
+- # Otherwise, use the dlname, so that lt_dlopen finds it.
+- elif test -n "$dlname"; then
+- func_append newdlprefiles " $dir/$dlname"
+- else
+- func_append newdlprefiles " $dir/$linklib"
+- fi
+- ;;
+- esac
++ # Prefer using a static library (so that no silly _DYNAMIC symbols
++ # are required to link).
++ if test -n "$old_library"; then
++ newdlprefiles="$newdlprefiles $dir/$old_library"
++ # Keep a list of preopened convenience libraries to check
++ # that they are being used correctly in the link pass.
++ test -z "$libdir" && \
++ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
++ # Otherwise, use the dlname, so that lt_dlopen finds it.
++ elif test -n "$dlname"; then
++ newdlprefiles="$newdlprefiles $dir/$dlname"
++ else
++ newdlprefiles="$newdlprefiles $dir/$linklib"
++ fi
+ fi # $pass = dlpreopen
+
+ if test -z "$libdir"; then
+@@ -6586,7 +5471,7 @@
+
+
+ if test "$linkmode" = prog && test "$pass" != link; then
+- func_append newlib_search_path " $ladir"
++ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+
+ linkalldeplibs=no
+@@ -6599,8 +5484,7 @@
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) func_stripname '-L' '' "$deplib"
+- func_resolve_sysroot "$func_stripname_result"
+- func_append newlib_search_path " $func_resolve_sysroot_result"
++ newlib_search_path="$newlib_search_path $func_stripname_result"
+ ;;
+ esac
+ # Need to link against all dependency_libs?
+@@ -6611,12 +5495,12 @@
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+- if $opt_preserve_dup_deps ; then
++ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+- func_append tmp_libs " $deplib"
++ tmp_libs="$tmp_libs $deplib"
+ done # for deplib
+ continue
+ fi # $linkmode = prog...
+@@ -6631,7 +5515,7 @@
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath:" in
+ *"$absdir:"*) ;;
+- *) func_append temp_rpath "$absdir:" ;;
++ *) temp_rpath="$temp_rpath$absdir:" ;;
+ esac
+ fi
+
+@@ -6643,7 +5527,7 @@
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+- *) func_append compile_rpath " $absdir" ;;
++ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+@@ -6652,7 +5536,7 @@
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) func_append finalize_rpath " $libdir" ;;
++ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+@@ -6677,12 +5561,12 @@
+ case $host in
+ *cygwin* | *mingw* | *cegcc*)
+ # No point in relinking DLLs because paths are not encoded
+- func_append notinst_deplibs " $lib"
++ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=no
+ ;;
+ *)
+ if test "$installed" = no; then
+- func_append notinst_deplibs " $lib"
++ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ ;;
+@@ -6699,7 +5583,7 @@
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
@@ -8226,7 +15631,34 @@
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
-@@ -6010,9 +5686,9 @@
+@@ -6717,7 +5601,7 @@
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+- *) func_append compile_rpath " $absdir" ;;
++ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+@@ -6726,7 +5610,7 @@
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) func_append finalize_rpath " $libdir" ;;
++ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+@@ -6780,7 +5664,7 @@
+ linklib=$newlib
+ fi # test -n "$old_archive_from_expsyms_cmds"
+
+- if test "$linkmode" = prog || test "$opt_mode" != relink; then
++ if test "$linkmode" = prog || test "$mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+@@ -6802,9 +5686,9 @@
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
@@ -8239,7 +15671,59 @@
else
add="$dir/$old_library"
fi
-@@ -6152,21 +5828,21 @@
+@@ -6836,7 +5720,7 @@
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+ [\\/]*)
+- func_append add_dir " -L$inst_prefix_dir$libdir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -6858,7 +5742,7 @@
+ if test -n "$add_shlibpath"; then
+ case :$compile_shlibpath: in
+ *":$add_shlibpath:"*) ;;
+- *) func_append compile_shlibpath "$add_shlibpath:" ;;
++ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ esac
+ fi
+ if test "$linkmode" = prog; then
+@@ -6872,13 +5756,13 @@
+ test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+- *) func_append finalize_shlibpath "$libdir:" ;;
++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ fi
+ fi
+ fi
+
+- if test "$linkmode" = prog || test "$opt_mode" = relink; then
++ if test "$linkmode" = prog || test "$mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+@@ -6892,7 +5776,7 @@
+ elif test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+- *) func_append finalize_shlibpath "$libdir:" ;;
++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+@@ -6909,7 +5793,7 @@
+ if test -n "$inst_prefix_dir"; then
+ case $libdir in
+ [\\/]*)
+- func_append add_dir " -L$inst_prefix_dir$libdir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -6944,21 +5828,21 @@
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
@@ -8273,7 +15757,70 @@
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
-@@ -6286,7 +5962,7 @@
+@@ -6986,33 +5870,27 @@
+ temp_xrpath=$func_stripname_result
+ case " $xrpath " in
+ *" $temp_xrpath "*) ;;
+- *) func_append xrpath " $temp_xrpath";;
++ *) xrpath="$xrpath $temp_xrpath";;
+ esac;;
+- *) func_append temp_deplibs " $libdir";;
++ *) temp_deplibs="$temp_deplibs $libdir";;
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+ fi
+
+- func_append newlib_search_path " $absdir"
++ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ # ... and its dependency_libs
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ newdependency_libs="$deplib $newdependency_libs"
+- case $deplib in
+- -L*) func_stripname '-L' '' "$deplib"
+- func_resolve_sysroot "$func_stripname_result";;
+- *) func_resolve_sysroot "$deplib" ;;
+- esac
+- if $opt_preserve_dup_deps ; then
++ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+- *" $func_resolve_sysroot_result "*)
+- func_append specialdeplibs " $func_resolve_sysroot_result" ;;
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+- func_append tmp_libs " $func_resolve_sysroot_result"
++ tmp_libs="$tmp_libs $deplib"
+ done
+
+ if test "$link_all_deplibs" != no; then
+@@ -7022,10 +5900,8 @@
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+- func_resolve_sysroot "$deplib"
+- deplib=$func_resolve_sysroot_result
+ func_dirname "$deplib" "" "."
+- dir=$func_dirname_result
++ dir="$func_dirname_result"
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+@@ -7052,8 +5928,8 @@
+ if test -z "$darwin_install_name"; then
+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ fi
+- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
++ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+ path=
+ fi
+ fi
+@@ -7086,7 +5962,7 @@
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
@@ -8282,7 +15829,47 @@
fi
fi
dependency_libs="$newdependency_libs"
-@@ -6454,7 +6130,7 @@
+@@ -7103,7 +5979,7 @@
+ for dir in $newlib_search_path; do
+ case "$lib_search_path " in
+ *" $dir "*) ;;
+- *) func_append lib_search_path " $dir" ;;
++ *) lib_search_path="$lib_search_path $dir" ;;
+ esac
+ done
+ newlib_search_path=
+@@ -7161,10 +6037,10 @@
+ -L*)
+ case " $tmp_libs " in
+ *" $deplib "*) ;;
+- *) func_append tmp_libs " $deplib" ;;
++ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ ;;
+- *) func_append tmp_libs " $deplib" ;;
++ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ done
+ eval $var=\"$tmp_libs\"
+@@ -7180,7 +6056,7 @@
+ ;;
+ esac
+ if test -n "$i" ; then
+- func_append tmp_libs " $i"
++ tmp_libs="$tmp_libs $i"
+ fi
+ done
+ dependency_libs=$tmp_libs
+@@ -7221,7 +6097,7 @@
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+ oldlibs="$output"
+- func_append objs "$old_deplibs"
++ objs="$objs$old_deplibs"
+ ;;
+
+ lib)
+@@ -7254,10 +6130,10 @@
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
@@ -8290,8 +15877,12 @@
+ $ECHO
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
- libobjs="$libobjs $objs"
-@@ -6522,7 +6198,7 @@
+- func_append libobjs " $objs"
++ libobjs="$libobjs $objs"
+ fi
+ fi
+
+@@ -7322,7 +6198,7 @@
age="$number_minor"
revision="$number_revision"
;;
@@ -8300,7 +15891,7 @@
current="$number_major"
revision="$number_minor"
age="0"
-@@ -6534,6 +6210,9 @@
+@@ -7334,6 +6210,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -8310,8 +15901,43 @@
esac
;;
no)
-@@ -6756,14 +6435,14 @@
- oldlibs="$oldlibs $output_objdir/$libname.$libext"
+@@ -7455,7 +6334,7 @@
+ done
+
+ # Make executables depend on our current version.
+- func_append verstring ":${current}.0"
++ verstring="$verstring:${current}.0"
+ ;;
+
+ qnx)
+@@ -7523,10 +6402,10 @@
+ fi
+
+ func_generate_dlsyms "$libname" "$libname" "yes"
+- func_append libobjs " $symfileobj"
++ libobjs="$libobjs $symfileobj"
+ test "X$libobjs" = "X " && libobjs=
+
+- if test "$opt_mode" != relink; then
++ if test "$mode" != relink; then
+ # Remove our outputs, but don't remove object files since they
+ # may have been created when compiling PIC objects.
+ removelist=
+@@ -7542,7 +6421,7 @@
+ continue
+ fi
+ fi
+- func_append removelist " $p"
++ removelist="$removelist $p"
+ ;;
+ *) ;;
+ esac
+@@ -7553,28 +6432,27 @@
+
+ # Now set the variables for building old libraries.
+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+- func_append oldlibs " $output_objdir/$libname.$libext"
++ oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
@@ -8329,7 +15955,37 @@
#done
if test -n "$xrpath"; then
-@@ -6804,7 +6483,7 @@
+ # If the user specified any rpath flags, then add them.
+ temp_xrpath=
+ for libdir in $xrpath; do
+- func_replace_sysroot "$libdir"
+- func_append temp_xrpath " -R$func_replace_sysroot_result"
++ temp_xrpath="$temp_xrpath -R$libdir"
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) func_append finalize_rpath " $libdir" ;;
++ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+@@ -7588,7 +6466,7 @@
+ for lib in $old_dlfiles; do
+ case " $dlprefiles $dlfiles " in
+ *" $lib "*) ;;
+- *) func_append dlfiles " $lib" ;;
++ *) dlfiles="$dlfiles $lib" ;;
+ esac
+ done
+
+@@ -7598,19 +6476,19 @@
+ for lib in $old_dlprefiles; do
+ case "$dlprefiles " in
+ *" $lib "*) ;;
+- *) func_append dlprefiles " $lib" ;;
++ *) dlprefiles="$dlprefiles $lib" ;;
+ esac
+ done
+
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
@@ -8338,8 +15994,36 @@
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
-@@ -6889,13 +6568,13 @@
- newdeplibs="$newdeplibs $i"
+ # Rhapsody C library is in the System framework
+- func_append deplibs " System.ltframework"
++ deplibs="$deplibs System.ltframework"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+@@ -7627,7 +6505,7 @@
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test "$build_libtool_need_lc" = "yes"; then
+- func_append deplibs " -lc"
++ deplibs="$deplibs -lc"
+ fi
+ ;;
+ esac
+@@ -7676,7 +6554,7 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+- func_append newdeplibs " $i"
++ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+@@ -7687,21 +6565,21 @@
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+- func_append newdeplibs " $i"
++ newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- echo
@@ -8358,8 +16042,27 @@
fi
fi
;;
-@@ -6932,22 +6611,22 @@
- newdeplibs="$newdeplibs $i"
+ *)
+- func_append newdeplibs " $i"
++ newdeplibs="$newdeplibs $i"
+ ;;
+ esac
+ done
+@@ -7719,7 +6597,7 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+- func_append newdeplibs " $i"
++ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+@@ -7730,29 +6608,29 @@
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+- func_append newdeplibs " $i"
++ newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- echo
@@ -8391,7 +16094,42 @@
fi
;;
*)
-@@ -6993,7 +6672,7 @@
+- func_append newdeplibs " $i"
++ newdeplibs="$newdeplibs $i"
+ ;;
+ esac
+ done
+@@ -7769,27 +6647,15 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+- func_append newdeplibs " $a_deplib"
++ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+- if test -n "$file_magic_glob"; then
+- libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+- else
+- libnameglob=$libname
+- fi
+- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- if test "$want_nocaseglob" = yes; then
+- shopt -s nocaseglob
+- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+- $nocaseglob
+- else
+- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+- fi
++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ # Follow soft links.
+ if ls -lLd "$potent_lib" 2>/dev/null |
+@@ -7806,13 +6672,13 @@
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
@@ -8400,7 +16138,14 @@
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-@@ -7008,12 +6687,12 @@
+ $SED -e 10q |
+ $EGREP "$file_magic_regex" > /dev/null; then
+- func_append newdeplibs " $a_deplib"
++ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+@@ -7821,12 +6687,12 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -8418,16 +16163,37 @@
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
-@@ -7051,7 +6730,7 @@
+@@ -7837,7 +6703,7 @@
+ ;;
+ *)
+ # Add a -L argument.
+- func_append newdeplibs " $a_deplib"
++ newdeplibs="$newdeplibs $a_deplib"
+ ;;
+ esac
+ done # Gone through all deplibs.
+@@ -7853,7 +6719,7 @@
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+- func_append newdeplibs " $a_deplib"
++ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+@@ -7864,9 +6730,9 @@
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
+- func_append newdeplibs " $a_deplib"
++ newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
-@@ -7062,12 +6741,12 @@
+ break 2
+ fi
+@@ -7875,12 +6741,12 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -8445,7 +16211,15 @@
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
-@@ -7085,25 +6764,25 @@
+@@ -7891,32 +6757,32 @@
+ ;;
+ *)
+ # Add a -L argument.
+- func_append newdeplibs " $a_deplib"
++ newdeplibs="$newdeplibs $a_deplib"
+ ;;
+ esac
+ done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
@@ -8481,7 +16255,7 @@
;;
esac
versuffix=$versuffix_save
-@@ -7115,23 +6794,23 @@
+@@ -7928,23 +6794,23 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
@@ -8515,7 +16289,7 @@
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
-@@ -7141,16 +6820,16 @@
+@@ -7954,16 +6820,16 @@
build_libtool_libs=no
fi
else
@@ -8540,7 +16314,7 @@
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
-@@ -7167,9 +6846,9 @@
+@@ -7980,9 +6846,9 @@
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
@@ -8553,7 +16327,88 @@
;;
esac
-@@ -7291,7 +6970,7 @@
+@@ -7995,7 +6861,7 @@
+ *)
+ case " $deplibs " in
+ *" -L$path/$objdir "*)
+- func_append new_libs " -L$path/$objdir" ;;
++ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+@@ -8005,10 +6871,10 @@
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+- *) func_append new_libs " $deplib" ;;
++ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+- *) func_append new_libs " $deplib" ;;
++ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ deplibs="$new_libs"
+@@ -8025,12 +6891,10 @@
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
++ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+- func_replace_sysroot "$libdir"
+- libdir=$func_replace_sysroot_result
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+@@ -8039,18 +6903,18 @@
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append dep_rpath " $flag"
++ dep_rpath="$dep_rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+- *) func_apped perm_rpath " $libdir" ;;
++ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+@@ -8068,7 +6932,7 @@
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+- func_append rpath "$dir:"
++ rpath="$rpath$dir:"
+ done
+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+ fi
+@@ -8076,7 +6940,7 @@
+ fi
+
+ shlibpath="$finalize_shlibpath"
+- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ if test -n "$shlibpath"; then
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ fi
+@@ -8102,18 +6966,18 @@
+ linknames=
+ for link
+ do
+- func_append linknames " $link"
++ linknames="$linknames $link"
done
# Use standard objects if they are pic
@@ -8562,7 +16417,66 @@
test "X$libobjs" = "X " && libobjs=
delfiles=
-@@ -7357,7 +7036,7 @@
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+ export_symbols="$output_objdir/$libname.uexp"
+- func_append delfiles " $export_symbols"
++ delfiles="$delfiles $export_symbols"
+ fi
+
+ orig_export_symbols=
+@@ -8144,45 +7008,13 @@
+ $opt_dry_run || $RM $export_symbols
+ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+- for cmd1 in $cmds; do
++ for cmd in $cmds; do
+ IFS="$save_ifs"
+- # Take the normal branch if the nm_file_list_spec branch
+- # doesn't work or if tool conversion is not needed.
+- case $nm_file_list_spec~$to_tool_file_cmd in
+- *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+- try_normal_branch=yes
+- eval cmd=\"$cmd1\"
+- func_len " $cmd"
+- len=$func_len_result
+- ;;
+- *)
+- try_normal_branch=no
+- ;;
+- esac
+- if test "$try_normal_branch" = yes \
+- && { test "$len" -lt "$max_cmd_len" \
+- || test "$max_cmd_len" -le -1; }
+- then
+- func_show_eval "$cmd" 'exit $?'
+- skipped_export=false
+- elif test -n "$nm_file_list_spec"; then
+- func_basename "$output"
+- output_la=$func_basename_result
+- save_libobjs=$libobjs
+- save_output=$output
+- output=${output_objdir}/${output_la}.nm
+- func_to_tool_file "$output"
+- libobjs=$nm_file_list_spec$func_to_tool_file_result
+- func_append delfiles " $output"
+- func_verbose "creating $NM input file list: $output"
+- for obj in $save_libobjs; do
+- func_to_tool_file "$obj"
+- $ECHO "$func_to_tool_file_result"
+- done > "$output"
+- eval cmd=\"$cmd1\"
++ eval cmd=\"$cmd\"
++ func_len " $cmd"
++ len=$func_len_result
++ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ func_show_eval "$cmd" 'exit $?'
+- output=$save_output
+- libobjs=$save_libobjs
+ skipped_export=false
+ else
+ # The command line is too long to execute in one step.
+@@ -8204,7 +7036,7 @@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -8571,7 +16485,51 @@
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7458,8 +7137,7 @@
+@@ -8216,7 +7048,7 @@
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+@@ -8226,7 +7058,7 @@
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+ *)
+- func_append tmp_deplibs " $test_deplib"
++ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+@@ -8246,21 +7078,21 @@
+ test "X$libobjs" = "X " && libobjs=
+ else
+ gentop="$output_objdir/${outputname}x"
+- func_append generated " $gentop"
++ generated="$generated $gentop"
+
+ func_extract_archives $gentop $convenience
+- func_append libobjs " $func_extract_archives_result"
++ libobjs="$libobjs $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
+ fi
+ fi
+
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+- func_append linker_flags " $flag"
++ linker_flags="$linker_flags $flag"
+ fi
+
+ # Make a backup of the uninstalled library when relinking
+- if test "$opt_mode" = relink; then
++ if test "$mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+ fi
+
+@@ -8305,8 +7137,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -8581,7 +16539,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -7472,12 +7150,12 @@
+@@ -8319,16 +7150,13 @@
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
@@ -8589,14 +16547,36 @@
+ $ECHO 'INPUT (' > $output
for obj in $save_libobjs
do
- $ECHO "$obj" >> $output
+- func_to_tool_file "$obj"
+- $ECHO "$func_to_tool_file_result" >> $output
++ $ECHO "$obj" >> $output
done
- echo ')' >> $output
+- func_append delfiles " $output"
+- func_to_tool_file "$output"
+- output=$func_to_tool_file_result
+ $ECHO ')' >> $output
- delfiles="$delfiles $output"
++ delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
-@@ -7519,19 +7197,17 @@
+ func_verbose "creating linker input file list: $output"
+@@ -8342,12 +7170,10 @@
+ fi
+ for obj
+ do
+- func_to_tool_file "$obj"
+- $ECHO "$func_to_tool_file_result" >> $output
++ $ECHO "$obj" >> $output
+ done
+- func_append delfiles " $output"
+- func_to_tool_file "$output"
+- output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
++ delfiles="$delfiles $output"
++ output=$firstobj\"$file_list_spec$output\"
+ else
+ if test -n "$save_libobjs"; then
+ func_verbose "creating reloadable object files..."
+@@ -8371,19 +7197,17 @@
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
@@ -8619,7 +16599,7 @@
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
-@@ -7541,8 +7217,7 @@
+@@ -8393,12 +7217,11 @@
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -8629,7 +16609,21 @@
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
-@@ -7601,7 +7276,7 @@
+- func_append delfiles " $output"
++ delfiles="$delfiles $output"
+
+ else
+ output=
+@@ -8432,7 +7255,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test "$opt_mode" = relink; then
++ if test "$mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -8453,7 +7276,7 @@
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -8638,7 +16632,47 @@
fi
if test -n "$orig_export_symbols"; then
-@@ -7766,7 +7441,7 @@
+@@ -8465,7 +7288,7 @@
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+- func_append delfiles " $export_symbols $output_objdir/$libname.filter"
++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+@@ -8506,10 +7329,10 @@
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+- func_append generated " $gentop"
++ generated="$generated $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+- func_append libobjs " $func_extract_archives_result"
++ libobjs="$libobjs $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
+ fi
+
+@@ -8525,7 +7348,7 @@
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+- if test "$opt_mode" = relink; then
++ if test "$mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+@@ -8537,7 +7360,7 @@
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+- if test "$opt_mode" = relink; then
++ if test "$mode" = relink; then
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+ if test -n "$convenience"; then
+@@ -8618,21 +7441,18 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
@@ -8646,17 +16680,24 @@
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
-@@ -7777,7 +7452,7 @@
+- func_append generated " $gentop"
++ generated="$generated $gentop"
+
+ func_extract_archives $gentop $convenience
+ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
fi
+- # If we're not building shared, we need to use non_pic_objs
+- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+-
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7837,8 +7512,8 @@
+@@ -8692,8 +7512,8 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -8667,7 +16708,15 @@
;;
esac
-@@ -7855,8 +7530,8 @@
+@@ -8704,14 +7524,14 @@
+ if test "$tagname" = CXX ; then
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+ 10.[0123])
+- func_append compile_command " ${wl}-bind_at_load"
+- func_append finalize_command " ${wl}-bind_at_load"
++ compile_command="$compile_command ${wl}-bind_at_load"
++ finalize_command="$finalize_command ${wl}-bind_at_load"
+ ;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
@@ -8678,7 +16727,106 @@
;;
esac
-@@ -7993,8 +7668,8 @@
+@@ -8725,7 +7545,7 @@
+ *)
+ case " $compile_deplibs " in
+ *" -L$path/$objdir "*)
+- func_append new_libs " -L$path/$objdir" ;;
++ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+@@ -8735,17 +7555,17 @@
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+- *) func_append new_libs " $deplib" ;;
++ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+- *) func_append new_libs " $deplib" ;;
++ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ compile_deplibs="$new_libs"
+
+
+- func_append compile_command " $compile_deplibs"
+- func_append finalize_command " $finalize_deplibs"
++ compile_command="$compile_command $compile_deplibs"
++ finalize_command="$finalize_command $finalize_deplibs"
+
+ if test -n "$rpath$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -8753,7 +7573,7 @@
+ # This is the magic to use -rpath.
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+- *) func_append finalize_rpath " $libdir" ;;
++ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ fi
+@@ -8772,18 +7592,18 @@
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append rpath " $flag"
++ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+- *) func_append perm_rpath " $libdir" ;;
++ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ case $host in
+@@ -8792,12 +7612,12 @@
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ ::) dllsearchpath=$libdir;;
+- *) func_append dllsearchpath ":$libdir";;
++ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ ::) dllsearchpath=$testbindir;;
+- *) func_append dllsearchpath ":$testbindir";;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
+ ;;
+ esac
+@@ -8823,18 +7643,18 @@
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+- func_append rpath " $flag"
++ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
+ *" $libdir "*) ;;
+- *) func_append finalize_perm_rpath " $libdir" ;;
++ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+@@ -8848,8 +7668,8 @@
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
@@ -8689,7 +16837,7 @@
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -8006,15 +7681,15 @@
+@@ -8861,15 +7681,15 @@
wrappers_required=yes
case $host in
@@ -8709,7 +16857,7 @@
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
-@@ -8023,7 +7698,7 @@
+@@ -8878,19 +7698,13 @@
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
@@ -8718,7 +16866,37 @@
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
-@@ -8070,7 +7745,7 @@
+ exit_status=0
+ func_show_eval "$link_command" 'exit_status=$?'
+
+- if test -n "$postlink_cmds"; then
+- func_to_tool_file "$output"
+- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+- func_execute_cmds "$postlink_cmds" 'exit $?'
+- fi
+-
+ # Delete the generated files.
+ if test -f "$output_objdir/${outputname}S.${objext}"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+@@ -8913,7 +7727,7 @@
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+- func_append rpath "$dir:"
++ rpath="$rpath$dir:"
+ done
+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+@@ -8921,7 +7735,7 @@
+ # We should set the runpath_var.
+ rpath=
+ for dir in $finalize_perm_rpath; do
+- func_append rpath "$dir:"
++ rpath="$rpath$dir:"
+ done
+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+@@ -8931,18 +7745,11 @@
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
@@ -8727,7 +16905,18 @@
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
-@@ -8089,7 +7764,7 @@
+ func_show_eval "$link_command" 'exit $?'
+-
+- if test -n "$postlink_cmds"; then
+- func_to_tool_file "$output"
+- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+- func_execute_cmds "$postlink_cmds" 'exit $?'
+- fi
+-
+ exit $EXIT_SUCCESS
+ fi
+
+@@ -8957,7 +7764,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -8736,7 +16925,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -8101,7 +7776,7 @@
+@@ -8969,19 +7776,13 @@
fi
# Replace the output file specification.
@@ -8745,7 +16934,19 @@
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-@@ -8125,7 +7800,18 @@
+
+ func_show_eval "$link_command" 'exit $?'
+
+- if test -n "$postlink_cmds"; then
+- func_to_tool_file "$output_objdir/$outputname"
+- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+- func_execute_cmds "$postlink_cmds" 'exit $?'
+- fi
+-
+ # Now create the wrapper script.
+ func_verbose "creating $output"
+
+@@ -8999,7 +7800,18 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -8765,16 +16966,83 @@
fi
# Only actually do things if not in dry run mode.
-@@ -8246,7 +7932,7 @@
+@@ -9079,7 +7891,7 @@
+ else
+ oldobjs="$old_deplibs $non_pic_objects"
+ if test "$preload" = yes && test -f "$symfileobj"; then
+- func_append oldobjs " $symfileobj"
++ oldobjs="$oldobjs $symfileobj"
+ fi
+ fi
+ addlibs="$old_convenience"
+@@ -9087,10 +7899,10 @@
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- func_append generated " $gentop"
++ generated="$generated $gentop"
+
+ func_extract_archives $gentop $addlibs
+- func_append oldobjs " $func_extract_archives_result"
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+ # Do each command in the archive commands.
+@@ -9101,10 +7913,10 @@
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+- func_append generated " $gentop"
++ generated="$generated $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+- func_append oldobjs " $func_extract_archives_result"
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+ # POSIX demands no paths to be encoded in archives. We have
+@@ -9120,9 +7932,9 @@
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- echo "copying selected object files to avoid basename conflicts..."
+ $ECHO "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+- func_append generated " $gentop"
++ generated="$generated $gentop"
func_mkdir_p "$gentop"
-@@ -8357,7 +8043,7 @@
+ save_oldobjs=$oldobjs
+ oldobjs=
+@@ -9146,9 +7958,9 @@
+ esac
+ done
+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+- func_append oldobjs " $gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
+ ;;
+- *) func_append oldobjs " $obj" ;;
++ *) oldobjs="$oldobjs $obj" ;;
+ esac
+ done
+ fi
+@@ -9158,16 +7970,6 @@
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ cmds=$old_archive_cmds
+- elif test -n "$archiver_list_spec"; then
+- func_verbose "using command file archive linking..."
+- for obj in $oldobjs
+- do
+- func_to_tool_file "$obj"
+- $ECHO "$func_to_tool_file_result"
+- done > $output_objdir/$libname.libcmd
+- func_to_tool_file "$output_objdir/$libname.libcmd"
+- oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+- cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ func_verbose "using piecewise archive linking..."
+@@ -9241,7 +8043,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -8783,7 +17051,66 @@
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -8442,27 +8128,9 @@
+@@ -9264,19 +8066,9 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
+- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+- ;;
+- -L*)
+- func_stripname -L '' "$deplib"
+- func_replace_sysroot "$func_stripname_result"
+- func_append newdependency_libs " -L$func_replace_sysroot_result"
++ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+- -R*)
+- func_stripname -R '' "$deplib"
+- func_replace_sysroot "$func_stripname_result"
+- func_append newdependency_libs " -R$func_replace_sysroot_result"
+- ;;
+- *) func_append newdependency_libs " $deplib" ;;
++ *) newdependency_libs="$newdependency_libs $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+@@ -9290,9 +8082,9 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
++ newdlfiles="$newdlfiles $libdir/$name"
+ ;;
+- *) func_append newdlfiles " $lib" ;;
++ *) newdlfiles="$newdlfiles $lib" ;;
+ esac
+ done
+ dlfiles="$newdlfiles"
+@@ -9309,7 +8101,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
++ newdlprefiles="$newdlprefiles $libdir/$name"
+ ;;
+ esac
+ done
+@@ -9321,7 +8113,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+- func_append newdlfiles " $abs"
++ newdlfiles="$newdlfiles $abs"
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+@@ -9330,33 +8122,15 @@
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+- func_append newdlprefiles " $abs"
++ newdlprefiles="$newdlprefiles $abs"
+ done
+ dlprefiles="$newdlprefiles"
fi
$RM $output
# place dlname in correct position for cygwin
@@ -8812,6 +17139,170 @@
esac
$ECHO > $output "\
# $outputname - a libtool library file
+@@ -9415,7 +8189,7 @@
+ exit $EXIT_SUCCESS
+ }
+
+-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
++{ test "$mode" = link || test "$mode" = relink; } &&
+ func_mode_link ${1+"$@"}
+
+
+@@ -9435,9 +8209,9 @@
+ for arg
+ do
+ case $arg in
+- -f) func_append RM " $arg"; rmforce=yes ;;
+- -*) func_append RM " $arg" ;;
+- *) func_append files " $arg" ;;
++ -f) RM="$RM $arg"; rmforce=yes ;;
++ -*) RM="$RM $arg" ;;
++ *) files="$files $arg" ;;
+ esac
+ done
+
+@@ -9446,23 +8220,24 @@
+
+ rmdirs=
+
++ origobjdir="$objdir"
+ for file in $files; do
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
+ if test "X$dir" = X.; then
+- odir="$objdir"
++ objdir="$origobjdir"
+ else
+- odir="$dir/$objdir"
++ objdir="$dir/$origobjdir"
+ fi
+ func_basename "$file"
+ name="$func_basename_result"
+- test "$opt_mode" = uninstall && odir="$dir"
++ test "$mode" = uninstall && objdir="$dir"
+
+- # Remember odir for removal later, being careful to avoid duplicates
+- if test "$opt_mode" = clean; then
++ # Remember objdir for removal later, being careful to avoid duplicates
++ if test "$mode" = clean; then
+ case " $rmdirs " in
+- *" $odir "*) ;;
+- *) func_append rmdirs " $odir" ;;
++ *" $objdir "*) ;;
++ *) rmdirs="$rmdirs $objdir" ;;
+ esac
+ fi
+
+@@ -9488,17 +8263,18 @@
+
+ # Delete the libtool libraries and symlinks.
+ for n in $library_names; do
+- func_append rmfiles " $odir/$n"
++ rmfiles="$rmfiles $objdir/$n"
+ done
+- test -n "$old_library" && func_append rmfiles " $odir/$old_library"
++ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+
+- case "$opt_mode" in
++ case "$mode" in
+ clean)
+- case " $library_names " in
++ case " $library_names " in
++ # " " in the beginning catches empty $dlname
+ *" $dlname "*) ;;
+- *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
++ *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ esac
+- test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ ;;
+ uninstall)
+ if test -n "$library_names"; then
+@@ -9526,19 +8302,19 @@
+ # Add PIC object to the list of files to remove.
+ if test -n "$pic_object" &&
+ test "$pic_object" != none; then
+- func_append rmfiles " $dir/$pic_object"
++ rmfiles="$rmfiles $dir/$pic_object"
+ fi
+
+ # Add non-PIC object to the list of files to remove.
+ if test -n "$non_pic_object" &&
+ test "$non_pic_object" != none; then
+- func_append rmfiles " $dir/$non_pic_object"
++ rmfiles="$rmfiles $dir/$non_pic_object"
+ fi
+ fi
+ ;;
+
+ *)
+- if test "$opt_mode" = clean ; then
++ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+ *.exe)
+@@ -9548,7 +8324,7 @@
+ noexename=$func_stripname_result
+ # $file with .exe has already been added to rmfiles,
+ # add $file without .exe
+- func_append rmfiles " $file"
++ rmfiles="$rmfiles $file"
+ ;;
+ esac
+ # Do a test to see if this is a libtool program.
+@@ -9557,7 +8333,7 @@
+ func_ltwrapper_scriptname "$file"
+ relink_command=
+ func_source $func_ltwrapper_scriptname_result
+- func_append rmfiles " $func_ltwrapper_scriptname_result"
++ rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+ else
+ relink_command=
+ func_source $dir/$noexename
+@@ -9565,12 +8341,12 @@
+
+ # note $name still contains .exe if it was in $file originally
+ # as does the version of $file that was added into $rmfiles
+- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
++ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ if test "$fast_install" = yes && test -n "$relink_command"; then
+- func_append rmfiles " $odir/lt-$name"
++ rmfiles="$rmfiles $objdir/lt-$name"
+ fi
+ if test "X$noexename" != "X$name" ; then
+- func_append rmfiles " $odir/lt-${noexename}.c"
++ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ fi
+ fi
+ fi
+@@ -9578,6 +8354,7 @@
+ esac
+ func_show_eval "$RM $rmfiles" 'exit_status=1'
+ done
++ objdir="$origobjdir"
+
+ # Try to remove the ${objdir}s in the directories where we deleted files
+ for dir in $rmdirs; do
+@@ -9589,16 +8366,16 @@
+ exit $exit_status
+ }
+
+-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
++{ test "$mode" = uninstall || test "$mode" = clean; } &&
+ func_mode_uninstall ${1+"$@"}
+
+-test -z "$opt_mode" && {
++test -z "$mode" && {
+ help="$generic_help"
+ func_fatal_help "you must specify a MODE"
+ }
+
+ test -z "$exec_cmd" && \
+- func_fatal_help "invalid operation mode \`$opt_mode'"
++ func_fatal_help "invalid operation mode \`$mode'"
+
+ if test -n "$exec_cmd"; then
+ eval exec "$exec_cmd"
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,14 +38,14 @@
@@ -8831,15 +17322,33 @@
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -201,6 +201,7 @@
+@@ -141,7 +141,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -202,8 +201,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -281,6 +282,7 @@
+ MSGFMT = @MSGFMT@
+@@ -249,7 +248,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -284,6 +282,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8847,7 +17356,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -327,7 +329,7 @@
+@@ -330,7 +329,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -8856,7 +17365,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -354,9 +356,9 @@
+@@ -357,9 +356,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -8868,7 +17377,7 @@
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-@@ -369,7 +371,7 @@
+@@ -372,7 +371,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -8888,15 +17397,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -240,6 +240,7 @@
+@@ -180,7 +180,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -241,8 +240,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -320,6 +321,7 @@
+ MSGFMT = @MSGFMT@
+@@ -288,7 +287,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -323,6 +321,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8904,7 +17431,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -372,7 +374,7 @@
+@@ -375,7 +374,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -8913,7 +17440,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -397,9 +399,9 @@
+@@ -400,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9101,15 +17628,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -217,6 +217,7 @@
+@@ -157,7 +157,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -218,8 +217,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -297,6 +298,7 @@
+ MSGFMT = @MSGFMT@
+@@ -265,7 +264,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -300,6 +298,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9117,7 +17662,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -351,7 +353,7 @@
+@@ -354,7 +353,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9126,7 +17671,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -376,9 +378,9 @@
+@@ -379,9 +378,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9149,15 +17694,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -219,6 +219,7 @@
+@@ -159,7 +159,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -220,8 +219,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -299,6 +300,7 @@
+ MSGFMT = @MSGFMT@
+@@ -267,7 +266,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -302,6 +300,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9165,7 +17728,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -357,7 +359,7 @@
+@@ -360,7 +359,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9174,7 +17737,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -382,9 +384,9 @@
+@@ -385,9 +384,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9197,15 +17760,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -236,6 +236,7 @@
+@@ -176,7 +176,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -237,8 +236,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -316,6 +317,7 @@
+ MSGFMT = @MSGFMT@
+@@ -284,7 +283,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -319,6 +317,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9213,7 +17794,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -352,7 +354,7 @@
+@@ -355,7 +354,7 @@
-I$(top_srcdir)/common -I$(top_srcdir)/monitor/proxy \
$(GLIB_CFLAGS) $(GPHOTO2_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
@@ -9222,7 +17803,7 @@
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE $(NULL) $(am__append_1) \
$(am__append_2)
gvfs_gphoto2_volume_monitor_LDFLAGS = \
-@@ -373,7 +375,7 @@
+@@ -376,7 +375,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9231,7 +17812,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -398,9 +400,9 @@
+@@ -401,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9254,15 +17835,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -222,6 +222,7 @@
+@@ -162,7 +162,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -223,8 +222,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -302,6 +303,7 @@
+ MSGFMT = @MSGFMT@
+@@ -270,7 +269,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -305,6 +303,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9270,7 +17869,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -341,7 +343,6 @@
+@@ -344,7 +343,6 @@
$(HAL_CFLAGS) \
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9278,7 +17877,7 @@
$(NULL)
gvfs_hal_volume_monitor_LDFLAGS = \
-@@ -365,7 +366,7 @@
+@@ -368,7 +366,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9287,7 +17886,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -390,9 +391,9 @@
+@@ -393,9 +391,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9310,15 +17909,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -188,6 +188,7 @@
+@@ -128,7 +128,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -189,8 +188,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -268,6 +269,7 @@
+ MSGFMT = @MSGFMT@
+@@ -236,7 +235,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -271,6 +269,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9326,7 +17943,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -289,7 +291,7 @@
+@@ -292,7 +291,7 @@
all: all-recursive
.SUFFIXES:
@@ -9335,7 +17952,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -314,9 +316,9 @@
+@@ -317,9 +316,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9358,15 +17975,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -225,6 +225,7 @@
+@@ -165,7 +165,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -226,8 +225,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -305,6 +306,7 @@
+ MSGFMT = @MSGFMT@
+@@ -273,7 +272,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -308,6 +306,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9374,7 +18009,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -342,7 +344,6 @@
+@@ -345,7 +344,6 @@
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9382,7 +18017,7 @@
$(NULL)
libgioremote_volume_monitor_la_LDFLAGS = \
-@@ -369,7 +370,6 @@
+@@ -372,7 +370,6 @@
$(GDU_CFLAGS) \
-DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9390,7 +18025,7 @@
$(NULL)
libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
-@@ -382,7 +382,7 @@
+@@ -385,7 +382,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9399,7 +18034,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -407,9 +407,9 @@
+@@ -410,9 +407,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9422,15 +18057,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -269,6 +269,7 @@
+@@ -209,7 +209,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -270,8 +269,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -349,6 +350,7 @@
+ MSGFMT = @MSGFMT@
+@@ -317,7 +316,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -352,6 +350,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9438,7 +18091,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -370,7 +372,7 @@
+@@ -373,7 +372,7 @@
-I$(top_builddir) \
$(GLIB_CFLAGS) \
-DGVFS_LOCALEDIR=\""$(localedir)"\" \
@@ -9447,7 +18100,7 @@
libraries = \
$(GLIB_LIBS)
-@@ -418,7 +420,7 @@
+@@ -421,7 +420,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9456,7 +18109,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -443,9 +445,9 @@
+@@ -446,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9479,15 +18132,33 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -200,6 +200,7 @@
+@@ -140,7 +140,6 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+-DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -201,8 +200,8 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+-MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -280,6 +281,7 @@
+ MSGFMT = @MSGFMT@
+@@ -248,7 +247,6 @@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+@@ -283,6 +281,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -9495,7 +18166,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-@@ -300,7 +302,7 @@
+@@ -303,7 +302,7 @@
-I$(top_srcdir) \
-I$(top_builddir) \
$(GLIB_CFLAGS) \
@@ -9504,7 +18175,7 @@
AM_LDFLAGS = \
$(GLIB_LIBS)
-@@ -310,7 +312,7 @@
+@@ -313,7 +312,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -9513,7 +18184,7 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -335,9 +337,9 @@
+@@ -338,9 +337,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the pkg-gnome-commits
mailing list