Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 261079 Details for
Bug 352961
dev-libs/libxml2-2.7.8 version bump request
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
libxml2_2.7.8.dfsg-2.patch (text/plain), 459.82 KB, created by
megabaks
on 2011-01-30 10:25:03 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
megabaks
Created:
2011-01-30 10:25:03 UTC
Size:
459.82 KB
patch
obsolete
>--- libxml2-2.7.8.dfsg.orig/xml2-config.1 >+++ libxml2-2.7.8.dfsg/xml2-config.1 >@@ -9,7 +9,6 @@ > linker flags that should be used to compile and link programs that use > \fIGNOME-XML\fP. > .SH OPTIONS >-.l > \fIxml-config\fP accepts the following options: > .TP 8 > .B \-\-version >@@ -17,6 +16,8 @@ > .TP 8 > .B \-\-libs > Print the linker flags that are necessary to link a \fIGNOME-XML\fP program. >+Add the \fB\-\-static\fP option to print the linker flags that are necessary to >+\fBstatically\fP link a \fIGNOME-XML\fP program. > .TP 8 > .B \-\-cflags > Print the compiler flags that are necessary to compile a \fIGNOME-XML\fP program. >--- libxml2-2.7.8.dfsg.orig/config.guess >+++ libxml2-2.7.8.dfsg/config.guess >@@ -1,10 +1,10 @@ > #! /bin/sh > # Attempt to guess a canonical system name. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, >-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 >+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 > # Free Software Foundation, Inc. > >-timestamp='2009-11-20' >+timestamp='2009-12-30' > > # This file is free software; you can redistribute it and/or modify it > # under the terms of the GNU General Public License as published by >@@ -56,8 +56,9 @@ > GNU config.guess ($timestamp) > > Originally written by Per Bothner. >-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, >-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. >+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, >+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free >+Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." >--- libxml2-2.7.8.dfsg.orig/xml2-config.in >+++ libxml2-2.7.8.dfsg/xml2-config.in >@@ -15,6 +15,7 @@ > --prefix=DIR change libxml prefix [default $prefix] > --exec-prefix=DIR change libxml exec prefix [default $exec_prefix] > --libs print library linking information >+ add --static to print static library linking information > --cflags print pre-processor and compiler flags > --modules module support enabled > --help display this help and exit >@@ -86,13 +87,19 @@ > then > if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] > then >- echo @XML_LIBS@ >+ LIBS="@XML_LIBS@" > else >- echo @XML_LIBDIR@ @XML_LIBS@ >+ LIBS="@XML_LIBDIR@ @XML_LIBS@" > fi > else >- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ >+ LIBS="@XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@" > fi >+ if [ "$2" = "--static" ] >+ then >+ shift >+ LIBS="${LIBS} @Z_LIBS@ @BASE_THREAD_LIBS@ @THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@" >+ fi >+ echo ${LIBS} > ;; > > *) >--- libxml2-2.7.8.dfsg.orig/libxml.h >+++ libxml2-2.7.8.dfsg/libxml.h >@@ -13,6 +13,9 @@ > #ifndef _LARGEFILE_SOURCE > #define _LARGEFILE_SOURCE > #endif >+#ifndef _LARGEFILE64_SOURCE >+#define _LARGEFILE64_SOURCE >+#endif > #ifndef _FILE_OFFSET_BITS > #define _FILE_OFFSET_BITS 64 > #endif >--- libxml2-2.7.8.dfsg.orig/libxml-2.0-uninstalled.pc.in >+++ libxml2-2.7.8.dfsg/libxml-2.0-uninstalled.pc.in >@@ -8,5 +8,6 @@ > Version: @VERSION@ > Description: libXML library version2. > Requires: >-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ >+Libs: -L${libdir} -lxml2 >+Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ > Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ >--- libxml2-2.7.8.dfsg.orig/config.sub >+++ libxml2-2.7.8.dfsg/config.sub >@@ -1,10 +1,10 @@ > #! /bin/sh > # Configuration validation subroutine script. > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, >-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 >+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 > # Free Software Foundation, Inc. > >-timestamp='2009-11-20' >+timestamp='2010-01-22' > > # This file is (in principle) common to ALL GNU software. > # The presence of a machine in this file suggests that SOME GNU software >@@ -75,8 +75,9 @@ > version="\ > GNU config.sub ($timestamp) > >-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, >-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. >+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, >+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free >+Software Foundation, Inc. > > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." >@@ -380,7 +381,8 @@ > | sparclite-* \ > | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ > | tahoe-* | thumb-* \ >- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ >+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ >+ | tile-* | tilegx-* \ > | tron-* \ > | ubicom32-* \ > | v850-* | v850e-* | vax-* \ >@@ -1085,6 +1087,11 @@ > basic_machine=tic6x-unknown > os=-coff > ;; >+ # This must be matched before tile*. >+ tilegx*) >+ basic_machine=tilegx-unknown >+ os=-linux-gnu >+ ;; > tile*) > basic_machine=tile-unknown > os=-linux-gnu >@@ -1435,6 +1442,8 @@ > -dicos*) > os=-dicos > ;; >+ -nacl*) >+ ;; > -none) > ;; > *) >--- libxml2-2.7.8.dfsg.orig/xpath.c >+++ libxml2-2.7.8.dfsg/xpath.c >@@ -11763,11 +11763,16 @@ > > if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { > xmlXPathObjectPtr tmp; >- /* pop the result */ >+ /* pop the result if any */ > tmp = valuePop(ctxt); >- xmlXPathReleaseObject(xpctxt, tmp); >- /* then pop off contextObj, which will be freed later */ >- valuePop(ctxt); >+ if (tmp != contextObj) { >+ /* >+ * Free up the result >+ * then pop off contextObj, which will be freed later >+ */ >+ xmlXPathReleaseObject(xpctxt, tmp); >+ valuePop(ctxt); >+ } > goto evaluation_error; > } > >--- libxml2-2.7.8.dfsg.orig/aclocal.m4 >+++ libxml2-2.7.8.dfsg/aclocal.m4 >@@ -13,8 +13,8 @@ > > 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.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'.])]) >@@ -599,6 +599,46 @@ > rmdir .tst 2>/dev/null > AC_SUBST([am__leading_dot])]) > >+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- >+# From Jim Meyering >+ >+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 >+# Free Software Foundation, Inc. >+# >+# This file is free software; the Free Software Foundation >+# gives unlimited permission to copy and/or distribute it, >+# with or without modifications, as long as this notice is preserved. >+ >+# serial 5 >+ >+# AM_MAINTAINER_MODE([DEFAULT-MODE]) >+# ---------------------------------- >+# Control maintainer-specific portions of Makefiles. >+# Default is to disable them, unless `enable' is passed literally. >+# For symmetry, `disable' may be passed as well. Anyway, the user >+# can override the default with the --enable/--disable switch. >+AC_DEFUN([AM_MAINTAINER_MODE], >+[m4_case(m4_default([$1], [disable]), >+ [enable], [m4_define([am_maintainer_other], [disable])], >+ [disable], [m4_define([am_maintainer_other], [enable])], >+ [m4_define([am_maintainer_other], [enable]) >+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) >+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) >+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed >+ AC_ARG_ENABLE([maintainer-mode], >+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful >+ (and sometimes confusing) to the casual installer], >+ [USE_MAINTAINER_MODE=$enableval], >+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) >+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) >+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) >+ MAINT=$MAINTAINER_MODE_TRUE >+ AC_SUBST([MAINT])dnl >+] >+) >+ >+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) >+ > # Check to see how 'make' treats includes. -*- Autoconf -*- > > # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. >--- libxml2-2.7.8.dfsg.orig/ltmain.sh >+++ libxml2-2.7.8.dfsg/ltmain.sh >@@ -1,10 +1,9 @@ > # Generated from ltmain.m4sh. > >-# libtool (GNU libtool) 2.2.10 >+# ltmain.sh (GNU libtool) 2.2.6b > # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 > >-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, >-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. >+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. > # 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 @@ > # > # Provide generalized library-building support services. > # >-# --config show all configuration variables >-# --debug enable verbose shell tracing >-# -n, --dry-run display commands without modifying any files >-# --features display basic configuration information and exit >-# --mode=MODE use operation mode MODE >-# --preserve-dup-deps don't remove duplicate dependency libraries >-# --quiet, --silent don't print informational messages >-# --no-quiet, --no-silent >-# print informational messages (default) >-# --tag=TAG use configuration variables from tag TAG >-# -v, --verbose print more informational messages than default >-# --no-verbose don't print the extra informational messages >-# --version print version information >-# -h, --help, --help-all print short, long, or detailed help message >+# --config show all configuration variables >+# --debug enable verbose shell tracing >+# -n, --dry-run display commands without modifying any files >+# --features display basic configuration information and exit >+# --mode=MODE use operation mode MODE >+# --preserve-dup-deps don't remove duplicate dependency libraries >+# --quiet, --silent don't print informational messages >+# --tag=TAG use configuration variables from tag TAG >+# -v, --verbose print informational messages (default) >+# --version print version information >+# -h, --help print short or long help message > # > # MODE must be one of the following: > # >-# clean remove files from the build directory >-# compile compile a source file into a libtool object >-# execute automatically set library path, then run a program >-# finish complete the installation of libtool libraries >-# install install libraries or executables >-# link create a library or an executable >-# uninstall remove libraries from an installed directory >+# clean remove files from the build directory >+# compile compile a source file into a libtool object >+# execute automatically set library path, then run a program >+# finish complete the installation of libtool libraries >+# install install libraries or executables >+# link create a library or an executable >+# uninstall remove libraries from an installed directory > # >-# MODE-ARGS vary depending on the MODE. When passed as first option, >-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. >+# MODE-ARGS vary depending on the MODE. > # Try `$progname --help --mode=MODE' for a more detailed description of MODE. > # > # When reporting a bug, please describe a test case to reproduce it and > # include the following information: > # >-# host-triplet: $host >-# shell: $SHELL >-# compiler: $LTCC >-# compiler flags: $LTCFLAGS >-# linker: $LD (gnu? $with_gnu_ld) >-# $progname: (GNU libtool) 2.2.10 >-# automake: $automake_version >-# autoconf: $autoconf_version >+# host-triplet: $host >+# shell: $SHELL >+# compiler: $LTCC >+# compiler flags: $LTCFLAGS >+# linker: $LD (gnu? $with_gnu_ld) >+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 >+# automake: $automake_version >+# autoconf: $autoconf_version > # > # Report bugs to <bug-libtool@gnu.org>. > >-PROGRAM=libtool >+PROGRAM=ltmain.sh > PACKAGE=libtool >-VERSION=2.2.10 >+VERSION="2.2.6b Debian-2.2.6b-2" > TIMESTAMP="" >-package_revision=1.3175 >+package_revision=1.3017 > > # Be Bourne compatible > if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then >@@ -96,15 +91,10 @@ > BIN_SH=xpg4; export BIN_SH # for Tru64 > DUALCASE=1; export DUALCASE # for MKS sh > >-# A function that is used when there is no print builtin or printf. >-func_fallback_echo () >-{ >- eval 'cat <<_LTECHO_EOF >-$1 >-_LTECHO_EOF' >-} >- > # NLS nuisances: We save the old values to restore during execute mode. >+# Only set LANG and LC_ALL to C if already set. >+# These must not be set unconditionally because not all systems understand >+# e.g. LANG=C (notably SCO). > lt_user_locale= > lt_safe_locale= > for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES >@@ -117,24 +107,15 @@ > lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" > fi" > done >-LC_ALL=C >-LANGUAGE=C >-export LANGUAGE LC_ALL > > $lt_unset CDPATH > > >-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh >-# is ksh but when the shell is invoked as "sh" and the current value of >-# the _XPG environment variable is not equal to 1 (one), the special >-# positional parameter $0, within a function call, is the name of the >-# function. >-progpath="$0" > > > > : ${CP="cp -f"} >-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} >+: ${ECHO="echo"} > : ${EGREP="/bin/grep -E"} > : ${FGREP="/bin/grep -F"} > : ${GREP="/bin/grep"} >@@ -178,168 +159,32 @@ > 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. > >-# These SED scripts presuppose an absolute path with a trailing slash. >-pathcar='s,^/\([^/]*\).*$,\1,' >-pathcdr='s,^/[^/]*,,' >-removedotparts=':dotsl >- s@/\./@/@g >- t dotsl >- s,/\.$,/,' >-collapseslashes='s@/\{1,\}@/@g' >-finalslash='s,/*$,/,' >- >-# func_normal_abspath PATH >-# Remove doubled-up and trailing slashes, "." path components, >-# and cancel out any ".." path components in PATH after making >-# it an absolute path. >-# value returned in "$func_normal_abspath_result" >-func_normal_abspath () >-{ >- # Start from root dir and reassemble the path. >- func_normal_abspath_result= >- func_normal_abspath_tpath=$1 >- func_normal_abspath_altnamespace= >- case $func_normal_abspath_tpath in >- "") >- # Empty path, that just means $cwd. >- func_stripname '' '/' "`pwd`" >- func_normal_abspath_result=$func_stripname_result >- return >- ;; >- # The next three entries are used to spot a run of precisely >- # two leading slashes without using negated character classes; >- # we take advantage of case's first-match behaviour. >- ///*) >- # Unusual form of absolute path, do nothing. >- ;; >- //*) >- # Not necessarily an ordinary path; POSIX reserves leading '//' >- # and for example Cygwin uses it to access remote file shares >- # over CIFS/SMB, so we conserve a leading double slash if found. >- func_normal_abspath_altnamespace=/ >- ;; >- /*) >- # Absolute path, do nothing. >- ;; >- *) >- # Relative path, prepend $cwd. >- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath >- ;; >- esac >- # Cancel out all the simple stuff to save iterations. We also want >- # the path to end with a slash for ease of parsing, so make sure >- # there is one (and only one) here. >- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ >- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` >- while :; do >- # Processed it all yet? >- if test "$func_normal_abspath_tpath" = / ; then >- # If we ascended to the root using ".." the result may be empty now. >- if test -z "$func_normal_abspath_result" ; then >- func_normal_abspath_result=/ >- fi >- break >- fi >- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ >- -e "$pathcar"` >- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ >- -e "$pathcdr"` >- # Figure out what to do with it >- case $func_normal_abspath_tcomponent in >- "") >- # Trailing empty path component, ignore it. >- ;; >- ..) >- # Parent dir; strip last assembled component from result. >- func_dirname "$func_normal_abspath_result" >- func_normal_abspath_result=$func_dirname_result >- ;; >- *) >- # Actual path component, append it. >- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent >- ;; >- esac >- done >- # Restore leading double-slash if one was found on entry. >- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result >-} >- >-# 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 >-# without needing to append a separator. >-# value returned in "$func_relative_path_result" >-func_relative_path () >-{ >- func_relative_path_result= >- func_normal_abspath "$1" >- func_relative_path_tlibdir=$func_normal_abspath_result >- func_normal_abspath "$2" >- func_relative_path_tbindir=$func_normal_abspath_result >- >- # Ascend the tree starting from libdir >- while :; do >- # check if we have found a prefix of bindir >- case $func_relative_path_tbindir in >- $func_relative_path_tlibdir) >- # found an exact match >- func_relative_path_tcancelled= >- break >- ;; >- $func_relative_path_tlibdir*) >- # found a matching prefix >- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" >- func_relative_path_tcancelled=$func_stripname_result >- if test -z "$func_relative_path_result"; then >- func_relative_path_result=. >- fi >- break >- ;; >- *) >- func_dirname $func_relative_path_tlibdir >- func_relative_path_tlibdir=${func_dirname_result} >- if test "x$func_relative_path_tlibdir" = x ; then >- # Have to descend all the way to the root! >- func_relative_path_result=../$func_relative_path_result >- func_relative_path_tcancelled=$func_relative_path_tbindir >- break >- fi >- func_relative_path_result=../$func_relative_path_result >- ;; >- esac >- done >- >- # Now calculate path; take care to avoid doubling-up slashes. >- func_stripname '' '/' "$func_relative_path_result" >- func_relative_path_result=$func_stripname_result >- func_stripname '/' '/' "$func_relative_path_tcancelled" >- if test "x$func_stripname_result" != x ; then >- func_relative_path_result=${func_relative_path_result}/${func_stripname_result} >- fi >- >- # Normalisation. If bindir is libdir, return empty string, >- # else relative path ending with a slash; either way, target >- # file name can be directly appended. >- if test ! -z "$func_relative_path_result"; then >- func_stripname './' '' "$func_relative_path_result/" >- func_relative_path_result=$func_stripname_result >- fi >-} >+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh >+# is ksh but when the shell is invoked as "sh" and the current value of >+# the _XPG environment variable is not equal to 1 (one), the special >+# positional parameter $0, within a function call, is the name of the >+# function. >+progpath="$0" > > # The name of this program: >+# In the unlikely event $progname began with a '-', it would play havoc with >+# func_echo (imagine progname=-n), so we prepend ./ in that case: > func_dirname_and_basename "$progpath" > progname=$func_basename_result >+case $progname in >+ -*) progname=./$progname ;; >+esac > > # Make sure we have an absolute path for reexecution: > case $progpath in >@@ -413,13 +258,6 @@ > : > } > >-# func_echo_all arg... >-# Invoke $ECHO with all args, space-separated. >-func_echo_all () >-{ >- $ECHO "$*" >-} >- > # func_error arg... > # Echo program name prefixed message to standard error. > func_error () >@@ -488,9 +326,9 @@ > case $my_directory_path in */*) ;; *) break ;; esac > > # ...otherwise throw away the child directory and loop >- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` >+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` > done >- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` >+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` > > save_mkdir_p_IFS="$IFS"; IFS=':' > for my_dir in $my_dir_list; do >@@ -540,7 +378,7 @@ > func_fatal_error "cannot create temporary directory \`$my_tmpdir'" > fi > >- $ECHO "$my_tmpdir" >+ $ECHO "X$my_tmpdir" | $Xsed > } > > >@@ -554,7 +392,7 @@ > { > case $1 in > *[\\\`\"\$]*) >- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; >+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; > *) > func_quote_for_eval_unquoted_result="$1" ;; > esac >@@ -581,7 +419,7 @@ > { > case $1 in > *[\\\`\"]*) >- my_arg=`$ECHO "$1" | $SED \ >+ my_arg=`$ECHO "X$1" | $Xsed \ > -e "$double_quote_subst" -e "$sed_double_backslash"` ;; > *) > my_arg="$1" ;; >@@ -651,19 +489,14 @@ > } > > >+ >+ >+ > # func_version > # Echo version message to standard output and exit. > func_version () > { >- $SED -n '/(C)/!b go >- :more >- /\./!{ >- N >- s/\n# / / >- b more >- } >- :go >- /^# '$PROGRAM' (GNU /,/# warranty; / { >+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { > s/^# // > s/^# *$// > s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ >@@ -676,20 +509,19 @@ > # Echo short help message to standard output and exit. > func_usage () > { >- $SED -n '/^# Usage:/,/^# *.*--help/ { >+ $SED -n '/^# Usage:/,/# -h/ { > s/^# // > s/^# *$// > s/\$progname/'$progname'/ > p > }' < "$progpath" >- echo >+ $ECHO > $ECHO "run \`$progname --help | more' for full usage" > exit $? > } > >-# func_help [NOEXIT] >-# Echo long help message to standard output and exit, >-# unless 'noexit' is passed as argument. >+# func_help >+# Echo long help message to standard output and exit. > func_help () > { > $SED -n '/^# Usage:/,/# Report bugs to/ { >@@ -706,10 +538,7 @@ > s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ > p > }' < "$progpath" >- ret=$? >- if test -z "$1"; then >- exit $ret >- fi >+ exit $? > } > > # func_missing_arg argname >@@ -717,7 +546,7 @@ > # exit_cmd. > func_missing_arg () > { >- func_error "missing argument for $1." >+ func_error "missing argument for $1" > exit_cmd=exit > } > >@@ -727,6 +556,29 @@ > > > >+# Check that we have a working $ECHO. >+if test "X$1" = X--no-reexec; then >+ # Discard the --no-reexec flag, and continue. >+ shift >+elif test "X$1" = X--fallback-echo; then >+ # Avoid inline document here, it may be left over >+ : >+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then >+ # Yippee, $ECHO works! >+ : >+else >+ # 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 >+ cat <<EOF >+$* >+EOF >+ exit $EXIT_SUCCESS >+fi > > magic="%%%MAGIC variable%%%" > magic_exe="%%%MAGIC EXE variable%%%" >@@ -784,16 +636,16 @@ > # Display the features supported by this script. > func_features () > { >- echo "host: $host" >+ $ECHO "host: $host" > if test "$build_libtool_libs" = yes; then >- echo "enable shared libraries" >+ $ECHO "enable shared libraries" > else >- echo "disable shared libraries" >+ $ECHO "disable shared libraries" > fi > if test "$build_old_libs" = yes; then >- echo "enable static libraries" >+ $ECHO "enable static libraries" > else >- echo "disable static libraries" >+ $ECHO "disable static libraries" > fi > > exit $? >@@ -920,21 +772,10 @@ > > --quiet|--silent) preserve_args="$preserve_args $opt" > opt_silent=: >- opt_verbose=false >- ;; >- >- --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" > done >- CC_expanded=`func_echo_all $CC` >- CC_quoted_expanded=`func_echo_all $CC_quoted` > case $@ in > # Blanks in the command may have been stripped by the calling shell, > # but not from the CC environment variable when configure was run. >- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ >- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; >+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; > # 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" > done >- CC_expanded=`func_echo_all $CC` >- CC_quoted_expanded=`func_echo_all $CC_quoted` > case "$@ " in >- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ >- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) >+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) > # 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 @@ > *.[cCFSifmso] | \ > *.ada | *.adb | *.ads | *.asm | \ > *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ >- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) >+ *.[fF][09]? | *.for | *.java | *.obj | *.sx) > func_xform "$libobj" > libobj=$func_xform_result > ;; >@@ -1454,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 >- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} >+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} > lockfile="$output_obj.lock" > else > output_obj= >@@ -1611,7 +1445,7 @@ > } > > $opt_help || { >- test "$mode" = compile && func_mode_compile ${1+"$@"} >+test "$mode" = compile && func_mode_compile ${1+"$@"} > } > > func_mode_help () >@@ -1648,11 +1482,10 @@ > > -o OUTPUT-FILE set the output file name to OUTPUT-FILE > -no-suppress do not suppress compiler output for multiple passes >- -prefer-pic try to build PIC objects only >- -prefer-non-pic try to build non-PIC objects only >+ -prefer-pic try to building PIC objects only >+ -prefer-non-pic try to building non-PIC objects only > -shared do not build a \`.o' file suitable for static linking > -static only build a \`.o' file suitable for static linking >- -Wc,FLAG pass FLAG directly to the compiler > > COMPILE-COMMAND is a command to be used in creating a \`standard' object file > from the given SOURCEFILE. >@@ -1705,7 +1538,7 @@ > > The following components of INSTALL-COMMAND are treated specially: > >- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation >+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation > > The rest of the components are interpreted as arguments to that command (only > BSD-compatible install options are recognized)." >@@ -1725,8 +1558,6 @@ > > -all-static do not do any dynamic linking at all > -avoid-version do not add a version suffix if possible >- -bindir BINDIR specify path to binaries directory (for systems where >- libraries must be found in the PATH setting at runtime) > -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 @@ > -version-info CURRENT[:REVISION[:AGE]] > specify library version info [each variable defaults to 0] > -weak LIBNAME declare that the target provides the LIBNAME interface >- -Wc,FLAG >- -Xcompiler FLAG pass linker-specific FLAG directly to the compiler >- -Wl,FLAG >- -Xlinker FLAG pass linker-specific FLAG directly to the linker >- -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) > > All other options (arguments beginning with \`-') are ignored. > >@@ -1797,40 +1623,14 @@ > ;; > esac > >- echo >+ $ECHO > $ECHO "Try \`$progname --help' for more information about other modes." >+ >+ exit $? > } > >-# Now that we've collected a possible --mode arg, show help if necessary >-if $opt_help; then >- if test "$opt_help" = :; then >- func_mode_help >- else >- { >- func_help noexit >- for 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 >- echo >- func_mode_help >- done >- } | >- sed '1d >- /^When reporting/,/^Report/{ >- H >- d >- } >- $x >- /information about other modes/d >- /more detailed .*MODE/d >- s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' >- fi >- exit $? >-fi >+ # Now that we've collected a possible --mode arg, show help if necessary >+ $opt_help && func_mode_help > > > # func_mode_execute arg... >@@ -1912,7 +1712,7 @@ > for file > do > case $file in >- -* | *.la | *.lo ) ;; >+ -*) ;; > *) > # Do a test to see if this is really a libtool program. > if func_ltwrapper_script_p "$file"; then >@@ -1954,7 +1754,7 @@ > # Display what would be done. > if test -n "$shlibpath_var"; then > eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" >- echo "export $shlibpath_var" >+ $ECHO "export $shlibpath_var" > 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:" >+ $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:" >+ $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" >+ $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" >+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" >+ $ECHO " during linking" > 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'" >+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" > fi >- echo >+ $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." >+ $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 "----------------------------------------------------------------------" >+ $ECHO "X----------------------------------------------------------------------" | $Xsed > exit $EXIT_SUCCESS > } > >@@ -2052,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. >- case $nonopt in *shtool*) :;; *) false;; esac; then >+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then > # Aesthetically quote it. > func_quote_for_eval "$nonopt" > install_prog="$func_quote_for_eval_result " >@@ -2067,11 +1867,6 @@ > # Aesthetically quote it. > func_quote_for_eval "$arg" > install_prog="$install_prog$func_quote_for_eval_result" >- install_shared_prog=$install_prog >- case " $install_prog " in >- *[\\\ /]cp\ *) install_cp=: ;; >- *) install_cp=false ;; >- esac > > # We need to accept at least all the BSD install flags. > dest= >@@ -2081,10 +1876,8 @@ > install_type= > isdir=no > stripme= >- no_mode=: > for arg > do >- arg2= > if test -n "$dest"; then > files="$files $dest" > dest=$arg >@@ -2094,9 +1887,10 @@ > case $arg in > -d) isdir=yes ;; > -f) >- if $install_cp; then :; else >- prev=$arg >- fi >+ case " $install_prog " in >+ *[\\\ /]cp\ *) ;; >+ *) prev=$arg ;; >+ esac > ;; > -g | -m | -o) > prev=$arg >@@ -2110,10 +1904,6 @@ > *) > # If the previous option needed an argument, then skip it. > if test -n "$prev"; then >- if test "x$prev" = x-m && test -n "$install_override_mode"; then >- arg2=$install_override_mode >- no_mode=false >- fi > prev= > else > dest=$arg >@@ -2125,10 +1915,6 @@ > # Aesthetically quote the argument. > func_quote_for_eval "$arg" > install_prog="$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" > done > > test -z "$install_prog" && \ >@@ -2137,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" >- fi >- fi >- > if test -z "$files"; then > if test -z "$dest"; then > func_fatal_help "no file or destination specified" >@@ -2231,7 +2010,7 @@ > > if test -n "$relink_command"; then > # Determine the prefix the user has applied to our future dir. >- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` >+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` > > # 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 @@ > > if test -n "$inst_prefix_dir"; then > # Stick the inst_prefix_dir data into the link command. >- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` >+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` > else >- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` >+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` > fi > > func_warning "relinking \`$file'" >@@ -2264,7 +2043,7 @@ > test -n "$relink_command" && srcname="$realname"T > > # Install the shared library and build the symlinks. >- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ >+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ > 'exit $?' > tstripme="$stripme" > case $host_os in >@@ -2404,7 +2183,7 @@ > if test -f "$lib"; then > func_source "$lib" > fi >- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test >+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test > if test -n "$libdir" && test ! -f "$libfile"; then > func_warning "\`$lib' has not been installed in \`$libdir'" > finalize=no >@@ -2423,7 +2202,7 @@ > file="$func_basename_result" > outputname="$tmpdir/$file" > # Replace the output file specification. >- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` >+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` > > $opt_silent || { > func_quote_for_expand "$relink_command" >@@ -2442,7 +2221,7 @@ > } > else > # Install the binary that we compiled earlier. >- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` >+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` > fi > fi > >@@ -2544,10 +2323,6 @@ > extern \"C\" { > #endif > >-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) >-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" >-#endif >- > /* External symbol declarations for the compiler. */\ > " > >@@ -2557,7 +2332,7 @@ > $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 @@ > eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' > eval '$MV "$nlist"T "$nlist"' > case $host in >- *cygwin* | *mingw* | *cegcc* ) >+ *cygwin | *mingw* | *cegcc* ) > eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' > eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' > ;; >@@ -2640,10 +2415,10 @@ > if test -f "$nlist"S; then > eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' > else >- echo '/* NONE */' >> "$output_objdir/$my_dlsyms" >+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" > fi > >- echo >> "$output_objdir/$my_dlsyms" "\ >+ $ECHO >> "$output_objdir/$my_dlsyms" "\ > > /* The mapping between symbol names and symbols. */ > typedef struct { >@@ -2653,7 +2428,7 @@ > " > case $host in > *cygwin* | *mingw* | *cegcc* ) >- echo >> "$output_objdir/$my_dlsyms" "\ >+ $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" "\ >+ $ECHO >> "$output_objdir/$my_dlsyms" "\ > extern $lt_dlsym_const lt_dlsymlist > lt_${my_prefix}_LTX_preloaded_symbols[]; > $lt_dlsym_const lt_dlsymlist >@@ -2682,7 +2457,7 @@ > eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" > ;; > esac >- echo >> "$output_objdir/$my_dlsyms" "\ >+ $ECHO >> "$output_objdir/$my_dlsyms" "\ > {0, (void *) 0} > }; > >@@ -2740,16 +2515,16 @@ > case $host in > *cygwin* | *mingw* | *cegcc* ) > if test -f "$output_objdir/$my_outputname.def"; then >- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` >- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` >+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` >+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` > else >- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` >- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` >+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` >+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` > fi > ;; > *) >- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` >- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` >+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` >+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` > ;; > esac > ;; >@@ -2763,8 +2538,8 @@ > # really was required. > > # Nullify the symbol file. >- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` >- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` >+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` >+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` > fi > } > >@@ -2774,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. >-# Despite the name, also deal with 64 bit binaries. > func_win32_libid () > { > $opt_debug >@@ -2785,9 +2559,8 @@ > 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 >+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then > win32_nmres=`eval $NM -f posix -A $1 | > $SED -n -e ' > 1,100{ >@@ -2825,18 +2598,7 @@ > $opt_debug > f_ex_an_ar_dir="$1"; shift > f_ex_an_ar_oldlib="$1" >- if test "$lock_old_archive_extraction" = yes; then >- lockfile=$f_ex_an_ar_oldlib.lock >- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do >- func_echo "Waiting for $lockfile to be removed" >- sleep 2 >- done >- fi >- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ >- 'stat=$?; rm -f "$lockfile"; exit $stat' >- if test "$lock_old_archive_extraction" = yes; then >- $opt_dry_run || rm -f "$lockfile" >- fi >+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' > if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then > : > else >@@ -2907,7 +2669,7 @@ > darwin_file= > darwin_files= > for darwin_file in $darwin_filelist; do >- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` >+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` > $LIPO -create -output "$darwin_file" $darwin_files > done # $darwin_filelist > $RM -rf unfat-$$ >@@ -2922,30 +2684,25 @@ > func_extract_an_archive "$my_xdir" "$my_xabs" > ;; > esac >- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` >+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` > done > > func_extract_archives_result="$my_oldobjs" > } > > >-# func_emit_wrapper [arg=no] >-# >-# Emit a libtool wrapper script on stdout. >-# Don't directly open a file because we may want to >-# incorporate the script contents within a cygwin/mingw >-# wrapper executable. Must ONLY be called from within >-# func_mode_link because it depends on a number of variables >-# set therein. >+ >+# func_emit_wrapper_part1 [arg=no] > # >-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR >-# variable will take. If 'yes', then the emitted script >-# will assume that the directory in which it is stored is >-# the $objdir directory. This is a cygwin/mingw-specific >-# behavior. >-func_emit_wrapper () >-{ >- func_emit_wrapper_arg1=${1-no} >+# Emit the first part of a libtool wrapper script on stdout. >+# For more information, see the description associated with >+# func_emit_wrapper(), below. >+func_emit_wrapper_part1 () >+{ >+ func_emit_wrapper_part1_arg1=no >+ if test -n "$1" ; then >+ func_emit_wrapper_part1_arg1=$1 >+ fi > > $ECHO "\ > #! $SHELL >@@ -2961,6 +2718,7 @@ > > # Sed substitution that helps us do robust quoting. It backslashifies > # metacharacters that are still active within double-quoted strings. >+Xsed='${SED} -e 1s/^X//' > sed_quote_subst='$sed_quote_subst' > > # Be Bourne compatible >@@ -2991,132 +2749,31 @@ > else > # When we are sourced in execute mode, \$file and \$ECHO are already set. > if test \"\$libtool_execute_magic\" != \"$magic\"; then >- file=\"\$0\"" >- >- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` >- $ECHO "\ >- >-# A function that is used when there is no print builtin or printf. >-func_fallback_echo () >-{ >- eval 'cat <<_LTECHO_EOF >-\$1 >-_LTECHO_EOF' >-} >- ECHO=\"$qECHO\" >- fi >- >-# Very basic option parsing. These options are (a) specific to >-# the libtool wrapper, (b) are identical between the wrapper >-# /script/ and the wrapper /executable/ which is used only on >-# windows platforms, and (c) all begin with the string "--lt-" >-# (application programs are unlikely to have options which match >-# this pattern). >-# >-# There are only two supported options: --lt-debug and >-# --lt-dump-script. There is, deliberately, no --lt-help. >-# >-# The first argument to this parsing function should be the >-# script's $0 value, followed by "$@". >-lt_option_debug= >-func_parse_lt_options () >-{ >- lt_script_arg0=\$0 >- shift >- for lt_opt >- do >- case \"\$lt_opt\" in >- --lt-debug) lt_option_debug=1 ;; >- --lt-dump-script) >- lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` >- test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. >- lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` >- cat \"\$lt_dump_D/\$lt_dump_F\" >- exit 0 >- ;; >- --lt-*) >- \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 >- exit 1 >- ;; >- esac >- done >- >- # Print the debug banner immediately: >- if test -n \"\$lt_option_debug\"; then >- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 >- fi >-} >- >-# Used when --lt-debug. Prints its arguments to stdout >-# (redirection is the responsibility of the caller) >-func_lt_dump_args () >-{ >- lt_dump_args_N=1; >- for lt_arg >- do >- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" >- lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` >- done >-} >- >-# Core function for launching the target application >-func_exec_program_core () >-{ >-" >- case $host in >- # Backslashes separate directories on plain windows >- *-*-mingw | *-*-os2* | *-cegcc*) >- $ECHO "\ >- if test -n \"\$lt_option_debug\"; then >- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 >- func_lt_dump_args \${1+\"\$@\"} 1>&2 >- fi >- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} >-" >- ;; >- >- *) >- $ECHO "\ >- if test -n \"\$lt_option_debug\"; then >- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 >- func_lt_dump_args \${1+\"\$@\"} 1>&2 >- fi >- exec \"\$progdir/\$program\" \${1+\"\$@\"} >+ ECHO=\"$qecho\" >+ file=\"\$0\" >+ # Make sure echo works. >+ if test \"X\$1\" = X--no-reexec; then >+ # Discard the --no-reexec flag, and continue. >+ shift >+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then >+ # Yippee, \$ECHO works! >+ : >+ else >+ # Restart under the correct shell, and then maybe \$ECHO will work. >+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} >+ fi >+ fi\ > " >- ;; >- esac >- $ECHO "\ >- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 >- exit 1 >-} >- >-# A function to encapsulate launching the target application >-# Strips options in the --lt-* namespace from \$@ and >-# launches target application with the remaining arguments. >-func_exec_program () >-{ >- for lt_wr_arg >- do >- case \$lt_wr_arg in >- --lt-*) ;; >- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; >- esac >- shift >- done >- func_exec_program_core \${1+\"\$@\"} >-} >- >- # Parse options >- func_parse_lt_options \"\$0\" \${1+\"\$@\"} >+ $ECHO "\ > > # Find the directory that this script lives in. >- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` >+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` > test \"x\$thisdir\" = \"x\$file\" && thisdir=. > > # Follow symbolic links until we get to the real thisdir. >- file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` >+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` > while test -n \"\$file\"; do >- destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` >+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` > > # If there was a directory component, then change thisdir. > if test \"x\$destdir\" != \"x\$file\"; then >@@ -3126,13 +2783,30 @@ > esac > fi > >- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` >- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` >+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` >+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` > done >+" >+} >+# end: func_emit_wrapper_part1 >+ >+# func_emit_wrapper_part2 [arg=no] >+# >+# Emit the second part of a libtool wrapper script on stdout. >+# For more information, see the description associated with >+# func_emit_wrapper(), below. >+func_emit_wrapper_part2 () >+{ >+ func_emit_wrapper_part2_arg1=no >+ if test -n "$1" ; then >+ func_emit_wrapper_part2_arg1=$1 >+ fi >+ >+ $ECHO "\ > > # Usually 'no', except on cygwin/mingw when embedded into > # the cwrapper. >- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 >+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 > if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then > # special case for '.' > if test \"\$thisdir\" = \".\"; then >@@ -3140,7 +2814,7 @@ > fi > # remove .libs from thisdir > case \"\$thisdir\" in >- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; >+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; > $objdir ) thisdir=. ;; > esac > fi >@@ -3203,7 +2877,7 @@ > > # Some systems cannot cope with colon-terminated $shlibpath_var > # The second colon is a workaround for a bug in BeOS R4 sed >- $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` >+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` > > export $shlibpath_var > " >@@ -3220,18 +2894,64 @@ > $ECHO "\ > if test \"\$libtool_execute_magic\" != \"$magic\"; then > # Run the actual program with our arguments. >- func_exec_program \${1+\"\$@\"} >+" >+ case $host in >+ # Backslashes separate directories on plain windows >+ *-*-mingw | *-*-os2* | *-cegcc*) >+ $ECHO "\ >+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} >+" >+ ;; >+ >+ *) >+ $ECHO "\ >+ exec \"\$progdir/\$program\" \${1+\"\$@\"} >+" >+ ;; >+ esac >+ $ECHO "\ >+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 >+ exit 1 > fi > else > # The program doesn't exist. > \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 > \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 >- \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 >+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 > exit 1 > fi > fi\ > " > } >+# end: func_emit_wrapper_part2 >+ >+ >+# func_emit_wrapper [arg=no] >+# >+# Emit a libtool wrapper script on stdout. >+# Don't directly open a file because we may want to >+# incorporate the script contents within a cygwin/mingw >+# wrapper executable. Must ONLY be called from within >+# func_mode_link because it depends on a number of variables >+# set therein. >+# >+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR >+# variable will take. If 'yes', then the emitted script >+# will assume that the directory in which it is stored is >+# the $objdir directory. This is a cygwin/mingw-specific >+# behavior. >+func_emit_wrapper () >+{ >+ func_emit_wrapper_arg1=no >+ if test -n "$1" ; then >+ func_emit_wrapper_arg1=$1 >+ fi >+ >+ # split this up so that func_emit_cwrapperexe_src >+ # can call each part independently. >+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" >+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" >+} > > > # func_to_host_path arg >@@ -3258,19 +2978,23 @@ > func_to_host_path () > { > func_to_host_path_result="$1" >- if test -n "$1"; then >+ 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"` >+ 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"` >+ 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" | >+ 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= >+ 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'" >+ 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 >+ 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 >+ 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"` >+ 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" | >+ 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" >+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" > fi > fi > fi >+ IFS=: > done > IFS=$func_to_host_pathlist_oldIFS > ;; > esac >- if test -z "$func_to_host_pathlist_result"; then >+ 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 " '$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_to_host_pathlist_result="$func_to_host_pathlist_result;" > ;; > esac > ;; >@@ -3410,23 +3141,31 @@ > > This wrapper executable should never be moved out of the build directory. > If it is, it will not operate correctly. >+ >+ Currently, it simply execs the wrapper *script* "$SHELL $output", >+ but could eventually absorb all of the scripts functionality and >+ exec $objdir/$outputname directly. > */ > EOF > cat <<"EOF" >-#ifdef _MSC_VER >-# define _CRT_SECURE_NO_DEPRECATE 1 >-#endif > #include <stdio.h> > #include <stdlib.h> > #ifdef _MSC_VER > # include <direct.h> > # include <process.h> > # include <io.h> >+# define setmode _setmode > #else > # include <unistd.h> > # 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> > >-/* declarations of non-ANSI functions */ >-#if defined(__MINGW32__) >-# ifdef __STRICT_ANSI__ >-int _putenv (const char *); >-# endif >-#elif defined(__CYGWIN__) >-# ifdef __STRICT_ANSI__ >-char *realpath (const char *, char *); >-int putenv (char *); >-int setenv (const char *, const char *, int); >-# endif >-/* #elif defined (other platforms) ... */ >-#endif >- >-/* portability defines, excluding path handling macros */ >-#if defined(_MSC_VER) >-# define setmode _setmode >-# define stat _stat >-# define chmod _chmod >-# define getcwd _getcwd >-# define putenv _putenv >-# define S_IXUSR _S_IEXEC >-# ifndef _INTPTR_T_DEFINED >-# define _INTPTR_T_DEFINED >-# define intptr_t int >-# endif >-#elif defined(__MINGW32__) >-# define setmode _setmode >-# define stat _stat >-# define chmod _chmod >-# define getcwd _getcwd >-# define putenv _putenv >-#elif defined(__CYGWIN__) >-# define HAVE_SETENV >-# define FOPEN_WB "wb" >-/* #elif defined (other platforms) ... */ >-#endif >- > #if defined(PATH_MAX) > # define LT_PATHMAX PATH_MAX > #elif defined(MAXPATHLEN) >@@ -3491,7 +3192,14 @@ > # define S_IXGRP 0 > #endif > >-/* path handling portability macros */ >+#ifdef _MSC_VER >+# define S_IXUSR _S_IEXEC >+# define stat _stat >+# ifndef _INTPTR_T_DEFINED >+# define intptr_t int >+# endif >+#endif >+ > #ifndef DIR_SEPARATOR > # define DIR_SEPARATOR '/' > # define PATH_SEPARATOR ':' >@@ -3522,6 +3230,10 @@ > # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) > #endif /* PATH_SEPARATOR_2 */ > >+#ifdef __CYGWIN__ >+# define FOPEN_WB "wb" >+#endif >+ > #ifndef FOPEN_WB > # define FOPEN_WB "w" > #endif >@@ -3534,13 +3246,22 @@ > if (stale) { free ((void *) stale); stale = 0; } \ > } while (0) > >-#if defined(LT_DEBUGWRAPPER) >-static int lt_debug = 1; >+#undef LTWRAPPER_DEBUGPRINTF >+#if defined DEBUGWRAPPER >+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args >+static void >+ltwrapper_debugprintf (const char *fmt, ...) >+{ >+ va_list args; >+ va_start (args, fmt); >+ (void) vfprintf (stderr, fmt, args); >+ va_end (args); >+} > #else >-static int lt_debug = 0; >+# define LTWRAPPER_DEBUGPRINTF(args) > #endif > >-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ >+const char *program_name = NULL; > > void *xmalloc (size_t num); > char *xstrdup (const char *string); >@@ -3550,17 +3271,31 @@ > int make_executable (const char *path); > int check_executable (const char *path); > char *strendzap (char *str, const char *pat); >-void lt_debugprintf (const char *file, int line, const char *fmt, ...); >-void lt_fatal (const char *file, int line, const char *message, ...); >-static const char *nonnull (const char *s); >-static const char *nonempty (const char *s); >+void lt_fatal (const char *message, ...); > void lt_setenv (const char *name, const char *value); > char *lt_extend_str (const char *orig_value, const char *add, int to_end); >+void lt_opt_process_env_set (const char *arg); >+void lt_opt_process_env_prepend (const char *arg); >+void lt_opt_process_env_append (const char *arg); >+int lt_split_name_value (const char *arg, char** name, char** value); > void lt_update_exe_path (const char *name, const char *value); > void lt_update_lib_path (const char *name, const char *value); >-char **prepare_spawn (char **argv); >-void lt_dump_script (FILE *f); >+ >+static const char *script_text_part1 = >+EOF >+ >+ func_emit_wrapper_part1 yes | >+ $SED -e 's/\([\\"]\)/\\\1/g' \ >+ -e 's/^/ "/' -e 's/$/\\n"/' >+ echo ";" >+ cat <<EOF >+ >+static const char *script_text_part2 = > EOF >+ func_emit_wrapper_part2 yes | >+ $SED -e 's/\([\\"]\)/\\\1/g' \ >+ -e 's/^/ "/' -e 's/$/\\n"/' >+ echo ";" > > cat <<EOF > const char * MAGIC_EXE = "$magic_exe"; >@@ -3605,10 +3340,24 @@ > cat <<"EOF" > > #define LTWRAPPER_OPTION_PREFIX "--lt-" >+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 > >+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; > static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; >+ > static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; >-static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; >+ >+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; >+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; >+ /* argument is putenv-style "foo=bar", value of foo is set to bar */ >+ >+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; >+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; >+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ >+ >+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; >+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; >+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ > > int > main (int argc, char *argv[]) >@@ -3625,13 +3374,10 @@ > int i; > > program_name = (char *) xstrdup (base_name (argv[0])); >- newargz = XMALLOC (char *, argc + 1); >+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); >+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); > >- /* very simple arg parsing; don't want to rely on getopt >- * also, copy all non cwrapper options to newargz, except >- * argz[0], which is handled differently >- */ >- newargc=0; >+ /* very simple arg parsing; don't want to rely on getopt */ > for (i = 1; i < argc; i++) > { > if (strcmp (argv[i], dumpscript_opt) == 0) >@@ -3645,57 +3391,25 @@ > esac > > cat <<"EOF" >- lt_dump_script (stdout); >+ printf ("%s", script_text_part1); >+ printf ("%s", script_text_part2); > return 0; > } >- if (strcmp (argv[i], debug_opt) == 0) >- { >- lt_debug = 1; >- continue; >- } >- if (strcmp (argv[i], ltwrapper_option_prefix) == 0) >- { >- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX >- namespace, but it is not one of the ones we know about and >- have already dealt with, above (inluding dump-script), then >- report an error. Otherwise, targets might begin to believe >- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX >- namespace. The first time any user complains about this, we'll >- need to make LTWRAPPER_OPTION_PREFIX a configure-time option >- or a configure.ac-settable value. >- */ >- lt_fatal (__FILE__, __LINE__, >- "unrecognized %s option: '%s'", >- ltwrapper_option_prefix, argv[i]); >- } >- /* otherwise ... */ >- newargz[++newargc] = xstrdup (argv[i]); > } >- newargz[++newargc] = NULL; >- >-EOF >- cat <<EOF >- /* The GNU banner must be the first non-error debug message */ >- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); >-EOF >- cat <<"EOF" >- lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); >- lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); > >+ newargz = XMALLOC (char *, argc + 1); > tmp_pathspec = find_executable (argv[0]); > if (tmp_pathspec == NULL) >- lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); >- lt_debugprintf (__FILE__, __LINE__, >- "(main) found exe (before symlink chase) at: %s\n", >- tmp_pathspec); >+ lt_fatal ("Couldn't find %s", argv[0]); >+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", >+ tmp_pathspec)); > > actual_cwrapper_path = chase_symlinks (tmp_pathspec); >- lt_debugprintf (__FILE__, __LINE__, >- "(main) found exe (after symlink chase) at: %s\n", >- actual_cwrapper_path); >+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", >+ actual_cwrapper_path)); > XFREE (tmp_pathspec); > >- actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); >+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); > strendzap (actual_cwrapper_path, actual_cwrapper_name); > > /* wrapper name transforms */ >@@ -3713,9 +3427,8 @@ > target_name = tmp_pathspec; > tmp_pathspec = 0; > >- lt_debugprintf (__FILE__, __LINE__, >- "(main) libtool target name: %s\n", >- target_name); >+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", >+ target_name)); > EOF > > cat <<EOF >@@ -3768,12 +3481,77 @@ > 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)); >+ newargc=0; >+ for (i = 1; i < argc; i++) >+ { >+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) >+ { >+ if (argv[i][env_set_opt_len] == '=') >+ { >+ const char *p = argv[i] + env_set_opt_len + 1; >+ lt_opt_process_env_set (p); >+ } >+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) >+ { >+ lt_opt_process_env_set (argv[++i]); /* don't copy */ >+ } >+ else >+ lt_fatal ("%s missing required argument", env_set_opt); >+ continue; >+ } >+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) >+ { >+ if (argv[i][env_prepend_opt_len] == '=') >+ { >+ const char *p = argv[i] + env_prepend_opt_len + 1; >+ lt_opt_process_env_prepend (p); >+ } >+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) >+ { >+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */ >+ } >+ else >+ lt_fatal ("%s missing required argument", env_prepend_opt); >+ continue; >+ } >+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) >+ { >+ if (argv[i][env_append_opt_len] == '=') >+ { >+ const char *p = argv[i] + env_append_opt_len + 1; >+ lt_opt_process_env_append (p); >+ } >+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) >+ { >+ lt_opt_process_env_append (argv[++i]); /* don't copy */ >+ } >+ else >+ lt_fatal ("%s missing required argument", env_append_opt); >+ continue; >+ } >+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) >+ { >+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX >+ namespace, but it is not one of the ones we know about and >+ have already dealt with, above (inluding dump-script), then >+ report an error. Otherwise, targets might begin to believe >+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX >+ namespace. The first time any user complains about this, we'll >+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option >+ or a configure.ac-settable value. >+ */ >+ lt_fatal ("Unrecognized option in %s namespace: '%s'", >+ ltwrapper_option_prefix, argv[i]); >+ } >+ /* otherwise ... */ >+ newargz[++newargc] = xstrdup (argv[i]); >+ } >+ newargz[++newargc] = NULL; >+ >+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); > for (i = 0; i < newargc; i++) > { >- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", >- i, nonnull (newargz[i])); >+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); > } > > EOF >@@ -3782,14 +3560,11 @@ > mingw*) > cat <<"EOF" > /* execv doesn't actually work on mingw as expected on unix */ >- newargz = prepare_spawn (newargz); > rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); > if (rval == -1) > { > /* failed to start process */ >- lt_debugprintf (__FILE__, __LINE__, >- "(main) failed to launch target \"%s\": %s\n", >- lt_argv_zero, nonnull (strerror (errno))); >+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); > return 127; > } > return rval; >@@ -3811,7 +3586,7 @@ > { > void *p = (void *) malloc (num); > if (!p) >- lt_fatal (__FILE__, __LINE__, "memory exhausted"); >+ lt_fatal ("Memory exhausted"); > > return p; > } >@@ -3845,8 +3620,8 @@ > { > struct stat st; > >- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", >- nonempty (path)); >+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", >+ path ? (*path ? path : "EMPTY!") : "NULL!")); > if ((!path) || (!*path)) > return 0; > >@@ -3863,8 +3638,8 @@ > int rval = 0; > struct stat st; > >- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", >- nonempty (path)); >+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", >+ path ? (*path ? path : "EMPTY!") : "NULL!")); > if ((!path) || (!*path)) > return 0; > >@@ -3890,8 +3665,8 @@ > int tmp_len; > char *concat_name; > >- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", >- nonempty (wrapper)); >+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", >+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); > > if ((wrapper == NULL) || (*wrapper == '\0')) > return NULL; >@@ -3944,8 +3719,7 @@ > { > /* empty path: current directory */ > if (getcwd (tmp, LT_PATHMAX) == NULL) >- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", >- nonnull (strerror (errno))); >+ lt_fatal ("getcwd failed"); > tmp_len = strlen (tmp); > concat_name = > XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); >@@ -3970,8 +3744,7 @@ > } > /* Relative path | not found in path: prepend cwd */ > if (getcwd (tmp, LT_PATHMAX) == NULL) >- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", >- nonnull (strerror (errno))); >+ lt_fatal ("getcwd failed"); > tmp_len = strlen (tmp); > concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); > memcpy (concat_name, tmp, tmp_len); >@@ -3997,9 +3770,8 @@ > int has_symlinks = 0; > while (strlen (tmp_pathspec) && !has_symlinks) > { >- lt_debugprintf (__FILE__, __LINE__, >- "checking path component for symlinks: %s\n", >- tmp_pathspec); >+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", >+ tmp_pathspec)); > if (lstat (tmp_pathspec, &s) == 0) > { > if (S_ISLNK (s.st_mode) != 0) >@@ -4021,9 +3793,8 @@ > } > else > { >- lt_fatal (__FILE__, __LINE__, >- "error accessing file \"%s\": %s", >- tmp_pathspec, nonnull (strerror (errno))); >+ char *errstr = strerror (errno); >+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); > } > } > XFREE (tmp_pathspec); >@@ -4036,8 +3807,7 @@ > tmp_pathspec = realpath (pathspec, buf); > if (tmp_pathspec == 0) > { >- lt_fatal (__FILE__, __LINE__, >- "could not follow symlinks for %s", pathspec); >+ lt_fatal ("Could not follow symlinks for %s", pathspec); > } > return xstrdup (tmp_pathspec); > #endif >@@ -4063,25 +3833,11 @@ > return str; > } > >-void >-lt_debugprintf (const char *file, int line, const char *fmt, ...) >-{ >- va_list args; >- if (lt_debug) >- { >- (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); >- va_start (args, fmt); >- (void) vfprintf (stderr, fmt, args); >- va_end (args); >- } >-} >- > static void >-lt_error_core (int exit_status, const char *file, >- int line, const char *mode, >+lt_error_core (int exit_status, const char *mode, > const char *message, va_list ap) > { >- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); >+ fprintf (stderr, "%s: %s: ", program_name, mode); > vfprintf (stderr, message, ap); > fprintf (stderr, ".\n"); > >@@ -4090,32 +3846,20 @@ > } > > void >-lt_fatal (const char *file, int line, const char *message, ...) >+lt_fatal (const char *message, ...) > { > va_list ap; > va_start (ap, message); >- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); >+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); > va_end (ap); > } > >-static const char * >-nonnull (const char *s) >-{ >- return s ? s : "(null)"; >-} >- >-static const char * >-nonempty (const char *s) >-{ >- return (s && !*s) ? "(empty)" : nonnull (s); >-} >- > void > lt_setenv (const char *name, const char *value) > { >- lt_debugprintf (__FILE__, __LINE__, >- "(lt_setenv) setting '%s' to '%s'\n", >- nonnull (name), nonnull (value)); >+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", >+ (name ? name : "<NULL>"), >+ (value ? value : "<NULL>"))); > { > #ifdef HAVE_SETENV > /* always make a copy, for consistency with !HAVE_SETENV */ >@@ -4160,12 +3904,95 @@ > return new_value; > } > >+int >+lt_split_name_value (const char *arg, char** name, char** value) >+{ >+ const char *p; >+ int len; >+ if (!arg || !*arg) >+ return 1; >+ >+ p = strchr (arg, (int)'='); >+ >+ if (!p) >+ return 1; >+ >+ *value = xstrdup (++p); >+ >+ len = strlen (arg) - strlen (*value); >+ *name = XMALLOC (char, len); >+ strncpy (*name, arg, len-1); >+ (*name)[len - 1] = '\0'; >+ >+ return 0; >+} >+ >+void >+lt_opt_process_env_set (const char *arg) >+{ >+ char *name = NULL; >+ char *value = NULL; >+ >+ if (lt_split_name_value (arg, &name, &value) != 0) >+ { >+ XFREE (name); >+ XFREE (value); >+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); >+ } >+ >+ lt_setenv (name, value); >+ XFREE (name); >+ XFREE (value); >+} >+ >+void >+lt_opt_process_env_prepend (const char *arg) >+{ >+ char *name = NULL; >+ char *value = NULL; >+ char *new_value = NULL; >+ >+ if (lt_split_name_value (arg, &name, &value) != 0) >+ { >+ XFREE (name); >+ XFREE (value); >+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); >+ } >+ >+ new_value = lt_extend_str (getenv (name), value, 0); >+ lt_setenv (name, new_value); >+ XFREE (new_value); >+ XFREE (name); >+ XFREE (value); >+} >+ >+void >+lt_opt_process_env_append (const char *arg) >+{ >+ char *name = NULL; >+ char *value = NULL; >+ char *new_value = NULL; >+ >+ if (lt_split_name_value (arg, &name, &value) != 0) >+ { >+ XFREE (name); >+ XFREE (value); >+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); >+ } >+ >+ new_value = lt_extend_str (getenv (name), value, 1); >+ lt_setenv (name, new_value); >+ XFREE (new_value); >+ XFREE (name); >+ XFREE (value); >+} >+ > void > lt_update_exe_path (const char *name, const char *value) > { >- lt_debugprintf (__FILE__, __LINE__, >- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", >- nonnull (name), nonnull (value)); >+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", >+ (name ? name : "<NULL>"), >+ (value ? value : "<NULL>"))); > > if (name && *name && value && *value) > { >@@ -4184,9 +4011,9 @@ > void > lt_update_lib_path (const char *name, const char *value) > { >- lt_debugprintf (__FILE__, __LINE__, >- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", >- nonnull (name), nonnull (value)); >+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", >+ (name ? name : "<NULL>"), >+ (value ? value : "<NULL>"))); > > if (name && *name && value && *value) > { >@@ -4196,152 +4023,11 @@ > } > } > >-EOF >- case $host_os in >- mingw*) >- cat <<"EOF" >- >-/* Prepares an argument vector before calling spawn(). >- Note that spawn() does not by itself call the command interpreter >- (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : >- ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); >- GetVersionEx(&v); >- v.dwPlatformId == VER_PLATFORM_WIN32_NT; >- }) ? "cmd.exe" : "command.com"). >- Instead it simply concatenates the arguments, separated by ' ', and calls >- CreateProcess(). We must quote the arguments since Win32 CreateProcess() >- interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a >- special way: >- - Space and tab are interpreted as delimiters. They are not treated as >- delimiters if they are surrounded by double quotes: "...". >- - Unescaped double quotes are removed from the input. Their only effect is >- that within double quotes, space and tab are treated like normal >- characters. >- - Backslashes not followed by double quotes are not special. >- - But 2*n+1 backslashes followed by a double quote become >- n backslashes followed by a double quote (n >= 0): >- \" -> " >- \\\" -> \" >- \\\\\" -> \\" >- */ >-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" >-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" >-char ** >-prepare_spawn (char **argv) >-{ >- size_t argc; >- char **new_argv; >- size_t i; >- >- /* Count number of arguments. */ >- for (argc = 0; argv[argc] != NULL; argc++) >- ; >- >- /* Allocate new argument vector. */ >- new_argv = XMALLOC (char *, argc + 1); >- >- /* Put quoted arguments into the new argument vector. */ >- for (i = 0; i < argc; i++) >- { >- const char *string = argv[i]; >- >- if (string[0] == '\0') >- new_argv[i] = xstrdup ("\"\""); >- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) >- { >- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); >- size_t length; >- unsigned int backslashes; >- const char *s; >- char *quoted_string; >- char *p; >- >- length = 0; >- backslashes = 0; >- if (quote_around) >- length++; >- for (s = string; *s != '\0'; s++) >- { >- char c = *s; >- if (c == '"') >- length += backslashes + 1; >- length++; >- if (c == '\\') >- backslashes++; >- else >- backslashes = 0; >- } >- if (quote_around) >- length += backslashes + 1; >- >- quoted_string = XMALLOC (char, length + 1); >- >- p = quoted_string; >- backslashes = 0; >- if (quote_around) >- *p++ = '"'; >- for (s = string; *s != '\0'; s++) >- { >- char c = *s; >- if (c == '"') >- { >- unsigned int j; >- for (j = backslashes + 1; j > 0; j--) >- *p++ = '\\'; >- } >- *p++ = c; >- if (c == '\\') >- backslashes++; >- else >- backslashes = 0; >- } >- if (quote_around) >- { >- unsigned int j; >- for (j = backslashes; j > 0; j--) >- *p++ = '\\'; >- *p++ = '"'; >- } >- *p = '\0'; >- >- new_argv[i] = quoted_string; >- } >- else >- new_argv[i] = (char *) string; >- } >- new_argv[argc] = NULL; >- >- return new_argv; >-} >-EOF >- ;; >- esac >- >- cat <<"EOF" >-void lt_dump_script (FILE* f) >-{ >-EOF >- func_emit_wrapper yes | >- $SED -e 's/\([\\"]\)/\\\1/g' \ >- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' > >- cat <<"EOF" >-} > EOF > } > # end: func_emit_cwrapperexe_src > >-# func_win32_import_lib_p ARG >-# True if ARG is an import lib, as indicated by $file_magic_cmd >-func_win32_import_lib_p () >-{ >- $opt_debug >- case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in >- *import*) : ;; >- *) false ;; >- esac >-} >- > # func_mode_link arg... > func_mode_link () > { >@@ -4386,7 +4072,6 @@ > new_inherited_linker_flags= > > avoid_version=no >- bindir= > dlfiles= > dlprefiles= > dlself=no >@@ -4479,11 +4164,6 @@ > esac > > case $prev in >- bindir) >- bindir="$arg" >- prev= >- continue >- ;; > dlfiles|dlprefiles) > if test "$preload" = no; then > # Add the symbol object into the linking commands. >@@ -4745,11 +4425,6 @@ > continue > ;; > >- -bindir) >- prev=bindir >- continue >- ;; >- > -dlopen) > prev=dlfiles > continue >@@ -4828,7 +4503,7 @@ > esac > case $host in > *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) >- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` >+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` > case :$dllsearchpath: in > *":$dir:"*) ;; > ::) dllsearchpath=$dir;; >@@ -4847,7 +4522,7 @@ > -l*) > if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then > case $host in >- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) >+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) > # These systems don't actually have a C or math library (as such) > continue > ;; >@@ -5033,7 +4708,7 @@ > for flag in $args; do > IFS="$save_ifs" > func_quote_for_eval "$flag" >- arg="$arg $func_quote_for_eval_result" >+ arg="$arg $wl$func_quote_for_eval_result" > compiler_flags="$compiler_flags $func_quote_for_eval_result" > done > IFS="$save_ifs" >@@ -5079,19 +4754,18 @@ > arg="$func_quote_for_eval_result" > ;; > >- # Flags to be passed through unchanged, with rationale: >- # -64, -mips[0-9] enable 64-bit mode for the SGI compiler >- # -r[0-9][0-9]* specify processor for the SGI compiler >- # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler >- # +DA*, +DD* enable 64-bit mode for the HP compiler >- # -q* compiler args for the IBM compiler >- # -m*, -t[45]*, -txscale* architecture-specific flags for GCC >- # -F/path path to uninstalled frameworks, gcc on darwin >- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC >- # @file GCC response files >- # -tp=* Portland pgcc target processor selection >+ # -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 >+ # +DA*, +DD* enable 64-bit mode on the HP compiler >+ # -q* pass through compiler args for the IBM compiler >+ # -m*, -t[45]*, -txscale* pass through architecture-specific >+ # compiler args for GCC >+ # -F/path gives path to uninstalled frameworks, gcc on darwin >+ # -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*|@*) > func_quote_for_eval "$arg" > arg="$func_quote_for_eval_result" > func_append compile_command " $arg" >@@ -5251,7 +4925,7 @@ > > if test -n "$shlibpath_var"; then > # get the directories listed in $shlibpath_var >- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` >+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` > else > shlib_search_path= > fi >@@ -5359,7 +5033,10 @@ > case $pass in > dlopen) libs="$dlfiles" ;; > dlpreopen) libs="$dlprefiles" ;; >- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; >+ link) >+ libs="$deplibs %DEPLIBS%" >+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" >+ ;; > esac > fi > if test "$linkmode,$pass" = "lib,dlpreopen"; then >@@ -5374,8 +5051,7 @@ > # Collect preopened libtool deplibs, except any this library > # has declared as weak libs > for deplib in $dependency_libs; do >- func_basename "$deplib" >- deplib_base=$func_basename_result >+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` > case " $weak_libs " in > *" $deplib_base "*) ;; > *) deplibs="$deplibs $deplib" ;; >@@ -5554,7 +5230,7 @@ > match_pattern*) > set dummy $deplibs_check_method; shift > match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` >- if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ >+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ > | $EGREP "$match_pattern_regex" > /dev/null; then > valid_a_lib=yes > fi >@@ -5564,15 +5240,15 @@ > ;; > esac > if test "$valid_a_lib" != yes; then >- echo >+ $ECHO > $ECHO "*** Warning: Trying to link with static lib archive $deplib." >- echo "*** I have the capability to make that library automatically link in when" >- echo "*** you link to this library. But I can only do this if you have a" >- echo "*** shared version of the library, which you do not appear to have" >- echo "*** because the file extensions .$libext of this argument makes me believe" >- echo "*** that it is just a static archive that I should not use here." >+ $ECHO "*** I have the capability to make that library automatically link in when" >+ $ECHO "*** you link to this library. But I can only do this if you have a" >+ $ECHO "*** shared version of the library, which you do not appear to have" >+ $ECHO "*** because the file extensions .$libext of this argument makes me believe" >+ $ECHO "*** that it is just a static archive that I should not use here." > else >- echo >+ $ECHO > $ECHO "*** Warning: Linking the shared library $output against the" > $ECHO "*** static library $deplib is not portable!" > deplibs="$deplib $deplibs" >@@ -5645,7 +5321,7 @@ > > # Convert "-framework foo" to "foo.ltframework" > if test -n "$inherited_linker_flags"; then >- tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` >+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` > 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 @@ > esac > done > fi >- dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` >+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` > if test "$linkmode,$pass" = "lib,link" || > test "$linkmode,$pass" = "prog,scan" || > { test "$linkmode" != prog && test "$linkmode" != lib; }; then >@@ -5671,19 +5347,19 @@ > # 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" >+ tmp_libs= >+ for deplib in $dependency_libs; do >+ deplibs="$deplib $deplibs" >+ if $opt_duplicate_deps ; then >+ case "$tmp_libs " in >+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; >+ esac >+ fi >+ tmp_libs="$tmp_libs $deplib" >+ done > elif test "$linkmode" != prog && test "$linkmode" != lib; then > func_fatal_error "\`$lib' is not a convenience library" > fi >- tmp_libs= >- for deplib in $dependency_libs; do >- deplibs="$deplib $deplibs" >- if $opt_duplicate_deps ; then >- case "$tmp_libs " in >- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; >- esac >- fi >- tmp_libs="$tmp_libs $deplib" >- done > continue > fi # $pass = conv > >@@ -5907,7 +5583,7 @@ > fi > done > if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then >- echo >+ $ECHO > if test "$linkmode" = prog; then > $ECHO "*** Warning: Linking the executable $output against the loadable module" > else >@@ -6010,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 >- echo >- echo "*** And there doesn't seem to be a static archive available" >- echo "*** The link will probably fail, sorry" >+ $ECHO >+ $ECHO "*** And there doesn't seem to be a static archive available" >+ $ECHO "*** The link will probably fail, sorry" > else > add="$dir/$old_library" > fi >@@ -6152,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. >- echo >+ $ECHO > $ECHO "*** Warning: This system can not link to static lib archive $lib." >- echo "*** I have the capability to make that library automatically link in when" >- echo "*** you link to this library. But I can only do this if you have a" >- echo "*** shared version of the library, which you do not appear to have." >+ $ECHO "*** I have the capability to make that library automatically link in when" >+ $ECHO "*** you link to this library. But I can only do this if you have a" >+ $ECHO "*** shared version of the library, which you do not appear to have." > if test "$module" = yes; then >- echo "*** But as you try to build a module library, libtool will still create " >- echo "*** a static module, that should work as long as the dlopening application" >- echo "*** is linked with the -dlopen flag to resolve symbols at runtime." >+ $ECHO "*** But as you try to build a module library, libtool will still create " >+ $ECHO "*** a static module, that should work as long as the dlopening application" >+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." > if test -z "$global_symbol_pipe"; then >- echo >- echo "*** However, this would only work if libtool was able to extract symbol" >- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" >- echo "*** not find such a program. So, this module is probably useless." >- echo "*** \`nm' from GNU binutils and a full rebuild may help." >+ $ECHO >+ $ECHO "*** However, this would only work if libtool was able to extract symbol" >+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" >+ $ECHO "*** not find such a program. So, this module is probably useless." >+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." > fi > if test "$build_old_libs" = no; then > build_libtool_libs=module >@@ -6286,7 +5962,7 @@ > compile_deplibs="$new_inherited_linker_flags $compile_deplibs" > finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" > else >- compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` >+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` > fi > fi > dependency_libs="$newdependency_libs" >@@ -6454,7 +6130,7 @@ > 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 >- echo >+ $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 @@ > age="$number_minor" > revision="$number_revision" > ;; >- freebsd-aout|freebsd-elf|qnx|sunos) >+ freebsd-aout|freebsd-elf|sunos) > current="$number_major" > revision="$number_minor" > age="0" >@@ -6534,6 +6210,9 @@ > revision="$number_minor" > lt_irix_increment=no > ;; >+ *) >+ func_fatal_configuration "$modename: unknown library version type \`$version_type'" >+ ;; > esac > ;; > no) >@@ -6756,14 +6435,14 @@ > oldlibs="$oldlibs $output_objdir/$libname.$libext" > > # Transform .lo files to .o files. >- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` >+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` > fi > > # Eliminate all temporary directories. > #for path in $notinst_path; do >- # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` >- # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` >- # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` >+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` >+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` >+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` > #done > > if test -n "$xrpath"; then >@@ -6804,7 +6483,7 @@ > if test "$build_libtool_libs" = yes; then > if test -n "$rpath"; then > case $host in >- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) >+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) > # these systems don't actually have a c library (as such)! > ;; > *-*-rhapsody* | *-*-darwin1.[012]) >@@ -6889,13 +6568,13 @@ > newdeplibs="$newdeplibs $i" > else > droppeddeps=yes >- echo >+ $ECHO > $ECHO "*** Warning: dynamic linker does not accept needed library $i." >- echo "*** I have the capability to make that library automatically link in when" >- echo "*** you link to this library. But I can only do this if you have a" >- echo "*** shared version of the library, which I believe you do not have" >- echo "*** because a test_compile did reveal that the linker did not use it for" >- echo "*** its dynamic dependency list that programs get resolved with at runtime." >+ $ECHO "*** I have the capability to make that library automatically link in when" >+ $ECHO "*** you link to this library. But I can only do this if you have a" >+ $ECHO "*** shared version of the library, which I believe you do not have" >+ $ECHO "*** because a test_compile did reveal that the linker did not use it for" >+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." > fi > fi > ;; >@@ -6932,22 +6611,22 @@ > newdeplibs="$newdeplibs $i" > else > droppeddeps=yes >- echo >+ $ECHO > $ECHO "*** Warning: dynamic linker does not accept needed library $i." >- echo "*** I have the capability to make that library automatically link in when" >- echo "*** you link to this library. But I can only do this if you have a" >- echo "*** shared version of the library, which you do not appear to have" >- echo "*** because a test_compile did reveal that the linker did not use this one" >- echo "*** as a dynamic dependency that programs can get resolved with at runtime." >+ $ECHO "*** I have the capability to make that library automatically link in when" >+ $ECHO "*** you link to this library. But I can only do this if you have a" >+ $ECHO "*** shared version of the library, which you do not appear to have" >+ $ECHO "*** because a test_compile did reveal that the linker did not use this one" >+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." > fi > fi > else > droppeddeps=yes >- echo >+ $ECHO > $ECHO "*** Warning! Library $i is needed by this library but I was not able to" >- echo "*** make it link in! You will probably need to install it or some" >- echo "*** library that it depends on before this library will be fully" >- echo "*** functional. Installing it before continuing would be even better." >+ $ECHO "*** make it link in! You will probably need to install it or some" >+ $ECHO "*** library that it depends on before this library will be fully" >+ $ECHO "*** functional. Installing it before continuing would be even better." > fi > ;; > *) >@@ -6993,7 +6672,7 @@ > potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` > case $potliblink in > [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; >- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; >+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; > esac > done > if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | >@@ -7008,12 +6687,12 @@ > fi > if test -n "$a_deplib" ; then > droppeddeps=yes >- echo >+ $ECHO > $ECHO "*** Warning: linker path does not have real file for library $a_deplib." >- echo "*** I have the capability to make that library automatically link in when" >- echo "*** you link to this library. But I can only do this if you have a" >- echo "*** shared version of the library, which you do not appear to have" >- echo "*** because I did check the linker path looking for a file starting" >+ $ECHO "*** I have the capability to make that library automatically link in when" >+ $ECHO "*** you link to this library. But I can only do this if you have a" >+ $ECHO "*** shared version of the library, which you do not appear to have" >+ $ECHO "*** because I did check the linker path looking for a file starting" > if test -z "$potlib" ; then > $ECHO "*** with $libname but no candidates were found. (...for file magic test)" > else >@@ -7051,7 +6730,7 @@ > 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" > a_deplib="" >@@ -7062,12 +6741,12 @@ > fi > if test -n "$a_deplib" ; then > droppeddeps=yes >- echo >+ $ECHO > $ECHO "*** Warning: linker path does not have real file for library $a_deplib." >- echo "*** I have the capability to make that library automatically link in when" >- echo "*** you link to this library. But I can only do this if you have a" >- echo "*** shared version of the library, which you do not appear to have" >- echo "*** because I did check the linker path looking for a file starting" >+ $ECHO "*** I have the capability to make that library automatically link in when" >+ $ECHO "*** you link to this library. But I can only do this if you have a" >+ $ECHO "*** shared version of the library, which you do not appear to have" >+ $ECHO "*** because I did check the linker path looking for a file starting" > if test -z "$potlib" ; then > $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" > else >@@ -7085,25 +6764,25 @@ > ;; > none | unknown | *) > newdeplibs="" >- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` >+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ >+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` > if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then > for i in $predeps $postdeps ; do > # can't use Xsed below, because $i might contain '/' >- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` >+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` > done > fi >- case $tmp_deplibs in >- *[!\ \ ]*) >- echo >+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | >+ $GREP . >/dev/null; then >+ $ECHO > if test "X$deplibs_check_method" = "Xnone"; then >- echo "*** Warning: inter-library dependencies are not supported in this platform." >+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform." > else >- echo "*** Warning: inter-library dependencies are not known to be supported." >+ $ECHO "*** Warning: inter-library dependencies are not known to be supported." > fi >- echo "*** All declared inter-library dependencies are being dropped." >+ $ECHO "*** All declared inter-library dependencies are being dropped." > droppeddeps=yes >- ;; >- esac >+ fi > ;; > esac > versuffix=$versuffix_save >@@ -7115,23 +6794,23 @@ > case $host in > *-*-rhapsody* | *-*-darwin1.[012]) > # On Rhapsody replace the C library with the System framework >- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` >+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` > ;; > esac > > if test "$droppeddeps" = yes; then > if test "$module" = yes; then >- echo >- echo "*** Warning: libtool could not satisfy all declared inter-library" >+ $ECHO >+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library" > $ECHO "*** dependencies of module $libname. Therefore, libtool will create" >- echo "*** a static module, that should work as long as the dlopening" >- echo "*** application is linked with the -dlopen flag." >+ $ECHO "*** a static module, that should work as long as the dlopening" >+ $ECHO "*** application is linked with the -dlopen flag." > if test -z "$global_symbol_pipe"; then >- echo >- echo "*** However, this would only work if libtool was able to extract symbol" >- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" >- echo "*** not find such a program. So, this module is probably useless." >- echo "*** \`nm' from GNU binutils and a full rebuild may help." >+ $ECHO >+ $ECHO "*** However, this would only work if libtool was able to extract symbol" >+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" >+ $ECHO "*** not find such a program. So, this module is probably useless." >+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." > fi > if test "$build_old_libs" = no; then > oldlibs="$output_objdir/$libname.$libext" >@@ -7141,16 +6820,16 @@ > build_libtool_libs=no > fi > else >- echo "*** The inter-library dependencies that have been dropped here will be" >- echo "*** automatically added whenever a program is linked with this library" >- echo "*** or is declared to -dlopen it." >+ $ECHO "*** The inter-library dependencies that have been dropped here will be" >+ $ECHO "*** automatically added whenever a program is linked with this library" >+ $ECHO "*** or is declared to -dlopen it." > > if test "$allow_undefined" = no; then >- echo >- echo "*** Since this library must not contain undefined symbols," >- echo "*** because either the platform does not support them or" >- echo "*** it was explicitly requested with -no-undefined," >- echo "*** libtool will only create a static version of it." >+ $ECHO >+ $ECHO "*** Since this library must not contain undefined symbols," >+ $ECHO "*** because either the platform does not support them or" >+ $ECHO "*** it was explicitly requested with -no-undefined," >+ $ECHO "*** libtool will only create a static version of it." > if test "$build_old_libs" = no; then > oldlibs="$output_objdir/$libname.$libext" > build_libtool_libs=module >@@ -7167,9 +6846,9 @@ > # Time to change all our "foo.ltframework" stuff back to "-framework foo" > case $host in > *-*-darwin*) >- newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` >- new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` >- deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` >+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` >+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` >+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` > ;; > esac > >@@ -7291,7 +6970,7 @@ > done > > # Use standard objects if they are pic >- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` >+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` > test "X$libobjs" = "X " && libobjs= > > delfiles= >@@ -7357,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" >- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' >+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' > fi > > if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then >@@ -7458,8 +7137,7 @@ > save_libobjs=$libobjs > fi > save_output=$output >- func_basename "$output" >- output_la=$func_basename_result >+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"` > > # Clear the reloadable object creation command queue and > # initialize k to one. >@@ -7472,12 +7150,12 @@ > 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" >- echo 'INPUT (' > $output >+ $ECHO 'INPUT (' > $output > for obj in $save_libobjs > do > $ECHO "$obj" >> $output > done >- echo ')' >> $output >+ $ECHO ')' >> $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 @@ > # command to the queue. > if test "$k" -eq 1 ; then > # The first file doesn't have a previous command to add. >- reload_objs=$objlist >- eval concat_cmds=\"$reload_cmds\" >+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" > else > # All subsequent reloadable object files will link in > # the last one created. >- reload_objs="$objlist $last_robj" >- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" >+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" > fi > last_robj=$output_objdir/$output_la-${k}.$objext > func_arith $k + 1 > k=$func_arith_result > output=$output_objdir/$output_la-${k}.$objext >- objlist=" $obj" >+ objlist=$obj > func_len " $last_robj" > func_arith $len0 + $func_len_result > len=$func_arith_result >@@ -7541,8 +7217,7 @@ > # reloadable object file. All subsequent reloadable object > # files will link in the last one created. > test -z "$concat_cmds" || concat_cmds=$concat_cmds~ >- reload_objs="$objlist $last_robj" >- eval concat_cmds=\"\${concat_cmds}$reload_cmds\" >+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" > if test -n "$last_robj"; then > eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" > fi >@@ -7601,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" >- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' >+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' > fi > > if test -n "$orig_export_symbols"; then >@@ -7766,7 +7441,7 @@ > if test -n "$convenience"; then > if test -n "$whole_archive_flag_spec"; then > eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" >- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` >+ 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 @@ > fi > > # 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 @@ > case $host in > *-*-rhapsody* | *-*-darwin1.[012]) > # On Rhapsody replace the C library is the System framework >- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` >- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` >+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` >+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` > ;; > esac > >@@ -7855,8 +7530,8 @@ > esac > fi > # Time to change all our "foo.ltframework" stuff back to "-framework foo" >- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` >- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` >+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` >+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` > ;; > esac > >@@ -7993,8 +7668,8 @@ > > if test -n "$libobjs" && test "$build_old_libs" = yes; then > # Transform all the library objects into standard objects. >- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` >- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` >+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` >+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` > fi > > func_generate_dlsyms "$outputname" "@PROGRAM@" "no" >@@ -8006,15 +7681,15 @@ > > wrappers_required=yes > case $host in >- *cegcc* | *mingw32ce*) >- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. >- wrappers_required=no >- ;; > *cygwin* | *mingw* ) > if test "$build_libtool_libs" != yes; then > wrappers_required=no > fi > ;; >+ *cegcc) >+ # Disable wrappers for cegcc, we are cross compiling anyway. >+ wrappers_required=no >+ ;; > *) > if test "$need_relink" = no || test "$build_libtool_libs" != yes; then > wrappers_required=no >@@ -8023,7 +7698,7 @@ > esac > if test "$wrappers_required" = no; then > # Replace the output file specification. >- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` >+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` > link_command="$compile_command$compile_rpath" > > # We have no uninstalled library dependencies, so finalize right now. >@@ -8070,7 +7745,7 @@ > # We don't need to create a wrapper script. > link_command="$compile_var$compile_command$compile_rpath" > # Replace the output file specification. >- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` >+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` > # Delete the old output file. > $opt_dry_run || $RM $output > # Link the executable and exit >@@ -8089,7 +7764,7 @@ > if test "$fast_install" != no; then > link_command="$finalize_var$compile_command$finalize_rpath" > if test "$fast_install" = yes; then >- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` >+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` > else > # fast_install is set to needless > relink_command= >@@ -8101,7 +7776,7 @@ > fi > > # Replace the output file specification. >- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` >+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` > > # Delete the old output files. > $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname >@@ -8125,7 +7800,18 @@ > fi > done > relink_command="(cd `pwd`; $relink_command)" >- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` >+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` >+ fi >+ >+ # Quote $ECHO for shipping. >+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then >+ case $progpath in >+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; >+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; >+ esac >+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` >+ else >+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` > fi > > # Only actually do things if not in dry run mode. >@@ -8246,7 +7932,7 @@ > 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_mkdir_p "$gentop" >@@ -8357,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@)" >- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` >+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` > if test "$hardcode_automatic" = yes ; then > relink_command= > fi >@@ -8442,27 +8128,9 @@ > fi > $RM $output > # place dlname in correct position for cygwin >- # In fact, it would be nice if we could use this code for all target >- # systems that can't hard-code library paths into their executables >- # and that have no shared library path variable independent of PATH, >- # but it turns out we can't easily determine that from inspecting >- # libtool variables, so we have to hard-code the OSs to which it >- # applies here; at the moment, that means platforms that use the PE >- # object format with DLL files. See the long comment at the top of >- # tests/bindir.at for full details. > tdlname=$dlname > case $host,$output,$installed,$module,$dlname in >- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) >- # If a -bindir argument was supplied, place the dll there. >- if test "x$bindir" != x ; >- then >- func_relative_path "$install_libdir" "$bindir" >- tdlname=$func_relative_path_result$dlname >- else >- # Otherwise fall back on heuristic. >- tdlname=../bin/$dlname >- fi >- ;; >+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; > esac > $ECHO > $output "\ > # $outputname - a libtool library file >--- libxml2-2.7.8.dfsg.orig/configure.in >+++ libxml2-2.7.8.dfsg/configure.in >@@ -70,6 +70,8 @@ > AC_LIBTOOL_WIN32_DLL > AM_PROG_LIBTOOL > >+AM_MAINTAINER_MODE >+ > dnl > dnl if the system support linker version scripts for symbol versioning > dnl then add it >@@ -84,7 +86,7 @@ > esac > fi > AC_SUBST(VERSION_SCRIPT_FLAGS) >-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) >+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) > > dnl > dnl We process the AC_ARG_WITH first so that later we can modify >@@ -1319,7 +1321,7 @@ > *) M_LIBS="-lm" > ;; > esac >-XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS" >+XML_LIBS="-lxml2" > XML_LIBTOOLLIBS="libxml2.la" > AC_SUBST(WITH_ICONV) > >--- libxml2-2.7.8.dfsg.orig/xmllint.c >+++ libxml2-2.7.8.dfsg/xmllint.c >@@ -2976,7 +2976,7 @@ > printf("\t--huge : remove any internal arbitrary parser limits\n"); > printf("\t--noent : substitute entity references by their value\n"); > printf("\t--noout : don't output the result tree\n"); >- printf("\t--path 'paths': provide a set of paths for resources\n"); >+ printf("\t--path 'paths' : provide a set of paths for resources\n"); > printf("\t--load-trace : print trace of all external entites loaded\n"); > printf("\t--nonet : refuse to fetch DTDs or entities over network\n"); > printf("\t--nocompact : do not generate compact text nodes\n"); >@@ -3032,7 +3032,7 @@ > printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n"); > printf("\t otherwise XML Catalogs starting from \n"); > printf("\t %s are activated by default\n", XML_XML_DEFAULT_CATALOG); >- printf("\t--nocatalogs: deactivate all catalogs\n"); >+ printf("\t--nocatalogs : deactivate all catalogs\n"); > #endif > printf("\t--auto : generate a small doc on the fly\n"); > #ifdef LIBXML_XINCLUDE_ENABLED >--- libxml2-2.7.8.dfsg.orig/Makefile.in >+++ libxml2-2.7.8.dfsg/Makefile.in >@@ -37,13 +37,6 @@ > POST_UNINSTALL = : > build_triplet = @build@ > host_triplet = @host@ >-noinst_PROGRAMS = testSchemas$(EXEEXT) testRelax$(EXEEXT) \ >- testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \ >- testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \ >- testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \ >- testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \ >- runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \ >- runxmlconf$(EXEEXT) testrecurse$(EXEEXT) > bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT) > subdir = . > DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ >@@ -92,7 +85,7 @@ > "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ > "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(confexecdir)" \ > "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" >-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) >+LTLIBRARIES = $(lib_LTLIBRARIES) > am__DEPENDENCIES_1 = > libxml2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) > am__libxml2_la_SOURCES_DIST = SAX.c entities.c encoding.c error.c \ >@@ -139,111 +132,10 @@ > libxml2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ > $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > $(libxml2_la_LDFLAGS) $(LDFLAGS) -o $@ >-testdso_la_LIBADD = >-am_testdso_la_OBJECTS = testdso.lo >-testdso_la_OBJECTS = $(am_testdso_la_OBJECTS) >-testdso_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testdso_la_LDFLAGS) $(LDFLAGS) -o $@ >-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) >-am_runsuite_OBJECTS = runsuite.$(OBJEXT) >-runsuite_OBJECTS = $(am_runsuite_OBJECTS) >-am__DEPENDENCIES_2 = $(top_builddir)/libxml2.la $(am__DEPENDENCIES_1) >-runsuite_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(runsuite_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_runtest_OBJECTS = runtest.$(OBJEXT) >-runtest_OBJECTS = $(am_runtest_OBJECTS) >-runtest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(runtest_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_runxmlconf_OBJECTS = runxmlconf.$(OBJEXT) >-runxmlconf_OBJECTS = $(am_runxmlconf_OBJECTS) >-runxmlconf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(runxmlconf_LDFLAGS) $(LDFLAGS) -o $@ >-am_testAutomata_OBJECTS = testAutomata.$(OBJEXT) >-testAutomata_OBJECTS = $(am_testAutomata_OBJECTS) >-testAutomata_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testAutomata_LDFLAGS) $(LDFLAGS) -o $@ >-am_testC14N_OBJECTS = testC14N.$(OBJEXT) >-testC14N_OBJECTS = $(am_testC14N_OBJECTS) >-testC14N_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testC14N_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_testHTML_OBJECTS = testHTML.$(OBJEXT) >-testHTML_OBJECTS = $(am_testHTML_OBJECTS) >-testHTML_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testHTML_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_testModule_OBJECTS = testModule.$(OBJEXT) >-testModule_OBJECTS = $(am_testModule_OBJECTS) >-testModule_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testModule_LDFLAGS) $(LDFLAGS) -o $@ >-am_testReader_OBJECTS = testReader.$(OBJEXT) >-testReader_OBJECTS = $(am_testReader_OBJECTS) >-testReader_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testReader_LDFLAGS) $(LDFLAGS) -o $@ >-am_testRegexp_OBJECTS = testRegexp.$(OBJEXT) >-testRegexp_OBJECTS = $(am_testRegexp_OBJECTS) >-testRegexp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testRegexp_LDFLAGS) $(LDFLAGS) -o $@ >-am_testRelax_OBJECTS = testRelax.$(OBJEXT) >-testRelax_OBJECTS = $(am_testRelax_OBJECTS) >-testRelax_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testRelax_LDFLAGS) $(LDFLAGS) -o $@ >-am_testSAX_OBJECTS = testSAX.$(OBJEXT) >-testSAX_OBJECTS = $(am_testSAX_OBJECTS) >-testSAX_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testSAX_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_testSchemas_OBJECTS = testSchemas.$(OBJEXT) >-testSchemas_OBJECTS = $(am_testSchemas_OBJECTS) >-testSchemas_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testSchemas_LDFLAGS) $(LDFLAGS) -o $@ >-am_testThreads_OBJECTS = testThreads@THREADS_W32@.$(OBJEXT) >-testThreads_OBJECTS = $(am_testThreads_OBJECTS) >-testThreads_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testThreads_LDFLAGS) $(LDFLAGS) -o $@ >-am_testURI_OBJECTS = testURI.$(OBJEXT) >-testURI_OBJECTS = $(am_testURI_OBJECTS) >-testURI_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testURI_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_testXPath_OBJECTS = testXPath.$(OBJEXT) >-testXPath_OBJECTS = $(am_testXPath_OBJECTS) >-testXPath_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testXPath_LDFLAGS) $(LDFLAGS) -o $@ >-am_testapi_OBJECTS = testapi.$(OBJEXT) >-testapi_OBJECTS = $(am_testapi_OBJECTS) >-testapi_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testapi_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_testchar_OBJECTS = testchar.$(OBJEXT) >-testchar_OBJECTS = $(am_testchar_OBJECTS) >-testchar_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testchar_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_testdict_OBJECTS = testdict.$(OBJEXT) >-testdict_OBJECTS = $(am_testdict_OBJECTS) >-testdict_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ >- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(testdict_LDFLAGS) \ >- $(LDFLAGS) -o $@ >-am_testrecurse_OBJECTS = testrecurse.$(OBJEXT) >-testrecurse_OBJECTS = $(am_testrecurse_OBJECTS) >-testrecurse_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ >- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ >- $(testrecurse_LDFLAGS) $(LDFLAGS) -o $@ >+PROGRAMS = $(bin_PROGRAMS) > am_xmlcatalog_OBJECTS = xmlcatalog.$(OBJEXT) > xmlcatalog_OBJECTS = $(am_xmlcatalog_OBJECTS) >+am__DEPENDENCIES_2 = $(top_builddir)/libxml2.la $(am__DEPENDENCIES_1) > xmlcatalog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ > $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > $(xmlcatalog_LDFLAGS) $(LDFLAGS) -o $@ >@@ -266,25 +158,9 @@ > LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ > --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ > $(LDFLAGS) -o $@ >-SOURCES = $(libxml2_la_SOURCES) $(testdso_la_SOURCES) \ >- $(runsuite_SOURCES) $(runtest_SOURCES) $(runxmlconf_SOURCES) \ >- $(testAutomata_SOURCES) $(testC14N_SOURCES) \ >- $(testHTML_SOURCES) $(testModule_SOURCES) \ >- $(testReader_SOURCES) $(testRegexp_SOURCES) \ >- $(testRelax_SOURCES) $(testSAX_SOURCES) $(testSchemas_SOURCES) \ >- $(testThreads_SOURCES) $(testURI_SOURCES) $(testXPath_SOURCES) \ >- $(testapi_SOURCES) $(testchar_SOURCES) $(testdict_SOURCES) \ >- $(testrecurse_SOURCES) $(xmlcatalog_SOURCES) \ >+SOURCES = $(libxml2_la_SOURCES) $(xmlcatalog_SOURCES) \ > $(xmllint_SOURCES) >-DIST_SOURCES = $(am__libxml2_la_SOURCES_DIST) $(testdso_la_SOURCES) \ >- $(runsuite_SOURCES) $(runtest_SOURCES) $(runxmlconf_SOURCES) \ >- $(testAutomata_SOURCES) $(testC14N_SOURCES) \ >- $(testHTML_SOURCES) $(testModule_SOURCES) \ >- $(testReader_SOURCES) $(testRegexp_SOURCES) \ >- $(testRelax_SOURCES) $(testSAX_SOURCES) $(testSchemas_SOURCES) \ >- $(testThreads_SOURCES) $(testURI_SOURCES) $(testXPath_SOURCES) \ >- $(testapi_SOURCES) $(testchar_SOURCES) $(testdict_SOURCES) \ >- $(testrecurse_SOURCES) $(xmlcatalog_SOURCES) \ >+DIST_SOURCES = $(am__libxml2_la_SOURCES_DIST) $(xmlcatalog_SOURCES) \ > $(xmllint_SOURCES) > RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ > html-recursive info-recursive install-data-recursive \ >@@ -401,6 +277,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -547,6 +424,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -678,7 +556,8 @@ > testModule_LDFLAGS = > testModule_DEPENDENCIES = $(DEPS) > testModule_LDADD = $(LDADDS) >-noinst_LTLIBRARIES = testdso.la >+ >+#noinst_LTLIBRARIES = testdso.la > testdso_la_SOURCES = testdso.c > testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir) > testapi_SOURCES = testapi.c >@@ -729,19 +608,19 @@ > .SUFFIXES: .c .lo .o .obj > am--refresh: > @: >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ >- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ >+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ >+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ > && exit 0; \ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu Makefile >+ $(AUTOMAKE) --foreign Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -756,9 +635,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > $(SHELL) ./config.status --recheck > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > $(am__cd) $(srcdir) && $(AUTOCONF) >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) > $(am__aclocal_m4_deps): > >@@ -771,7 +650,7 @@ > stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status > @rm -f stamp-h1 > cd $(top_builddir) && $(SHELL) ./config.status config.h >-$(srcdir)/config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h >+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h > ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) > rm -f stamp-h1 > touch $@ >@@ -817,19 +696,8 @@ > echo "rm -f \"$${dir}/so_locations\""; \ > rm -f "$${dir}/so_locations"; \ > done >- >-clean-noinstLTLIBRARIES: >- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) >- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ >- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ >- test "$$dir" != "$$p" || dir=.; \ >- echo "rm -f \"$${dir}/so_locations\""; \ >- rm -f "$${dir}/so_locations"; \ >- done > libxml2.la: $(libxml2_la_OBJECTS) $(libxml2_la_DEPENDENCIES) > $(libxml2_la_LINK) -rpath $(libdir) $(libxml2_la_OBJECTS) $(libxml2_la_LIBADD) $(LIBS) >-testdso.la: $(testdso_la_OBJECTS) $(testdso_la_DEPENDENCIES) >- $(testdso_la_LINK) $(testdso_la_OBJECTS) $(testdso_la_LIBADD) $(LIBS) > install-binPROGRAMS: $(bin_PROGRAMS) > @$(NORMAL_INSTALL) > test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" >@@ -873,72 +741,6 @@ > list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ > echo " rm -f" $$list; \ > rm -f $$list >- >-clean-noinstPROGRAMS: >- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ >- echo " rm -f" $$list; \ >- rm -f $$list || exit $$?; \ >- test -n "$(EXEEXT)" || exit 0; \ >- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ >- echo " rm -f" $$list; \ >- rm -f $$list >-runsuite$(EXEEXT): $(runsuite_OBJECTS) $(runsuite_DEPENDENCIES) >- @rm -f runsuite$(EXEEXT) >- $(runsuite_LINK) $(runsuite_OBJECTS) $(runsuite_LDADD) $(LIBS) >-runtest$(EXEEXT): $(runtest_OBJECTS) $(runtest_DEPENDENCIES) >- @rm -f runtest$(EXEEXT) >- $(runtest_LINK) $(runtest_OBJECTS) $(runtest_LDADD) $(LIBS) >-runxmlconf$(EXEEXT): $(runxmlconf_OBJECTS) $(runxmlconf_DEPENDENCIES) >- @rm -f runxmlconf$(EXEEXT) >- $(runxmlconf_LINK) $(runxmlconf_OBJECTS) $(runxmlconf_LDADD) $(LIBS) >-testAutomata$(EXEEXT): $(testAutomata_OBJECTS) $(testAutomata_DEPENDENCIES) >- @rm -f testAutomata$(EXEEXT) >- $(testAutomata_LINK) $(testAutomata_OBJECTS) $(testAutomata_LDADD) $(LIBS) >-testC14N$(EXEEXT): $(testC14N_OBJECTS) $(testC14N_DEPENDENCIES) >- @rm -f testC14N$(EXEEXT) >- $(testC14N_LINK) $(testC14N_OBJECTS) $(testC14N_LDADD) $(LIBS) >-testHTML$(EXEEXT): $(testHTML_OBJECTS) $(testHTML_DEPENDENCIES) >- @rm -f testHTML$(EXEEXT) >- $(testHTML_LINK) $(testHTML_OBJECTS) $(testHTML_LDADD) $(LIBS) >-testModule$(EXEEXT): $(testModule_OBJECTS) $(testModule_DEPENDENCIES) >- @rm -f testModule$(EXEEXT) >- $(testModule_LINK) $(testModule_OBJECTS) $(testModule_LDADD) $(LIBS) >-testReader$(EXEEXT): $(testReader_OBJECTS) $(testReader_DEPENDENCIES) >- @rm -f testReader$(EXEEXT) >- $(testReader_LINK) $(testReader_OBJECTS) $(testReader_LDADD) $(LIBS) >-testRegexp$(EXEEXT): $(testRegexp_OBJECTS) $(testRegexp_DEPENDENCIES) >- @rm -f testRegexp$(EXEEXT) >- $(testRegexp_LINK) $(testRegexp_OBJECTS) $(testRegexp_LDADD) $(LIBS) >-testRelax$(EXEEXT): $(testRelax_OBJECTS) $(testRelax_DEPENDENCIES) >- @rm -f testRelax$(EXEEXT) >- $(testRelax_LINK) $(testRelax_OBJECTS) $(testRelax_LDADD) $(LIBS) >-testSAX$(EXEEXT): $(testSAX_OBJECTS) $(testSAX_DEPENDENCIES) >- @rm -f testSAX$(EXEEXT) >- $(testSAX_LINK) $(testSAX_OBJECTS) $(testSAX_LDADD) $(LIBS) >-testSchemas$(EXEEXT): $(testSchemas_OBJECTS) $(testSchemas_DEPENDENCIES) >- @rm -f testSchemas$(EXEEXT) >- $(testSchemas_LINK) $(testSchemas_OBJECTS) $(testSchemas_LDADD) $(LIBS) >-testThreads$(EXEEXT): $(testThreads_OBJECTS) $(testThreads_DEPENDENCIES) >- @rm -f testThreads$(EXEEXT) >- $(testThreads_LINK) $(testThreads_OBJECTS) $(testThreads_LDADD) $(LIBS) >-testURI$(EXEEXT): $(testURI_OBJECTS) $(testURI_DEPENDENCIES) >- @rm -f testURI$(EXEEXT) >- $(testURI_LINK) $(testURI_OBJECTS) $(testURI_LDADD) $(LIBS) >-testXPath$(EXEEXT): $(testXPath_OBJECTS) $(testXPath_DEPENDENCIES) >- @rm -f testXPath$(EXEEXT) >- $(testXPath_LINK) $(testXPath_OBJECTS) $(testXPath_LDADD) $(LIBS) >-testapi$(EXEEXT): $(testapi_OBJECTS) $(testapi_DEPENDENCIES) >- @rm -f testapi$(EXEEXT) >- $(testapi_LINK) $(testapi_OBJECTS) $(testapi_LDADD) $(LIBS) >-testchar$(EXEEXT): $(testchar_OBJECTS) $(testchar_DEPENDENCIES) >- @rm -f testchar$(EXEEXT) >- $(testchar_LINK) $(testchar_OBJECTS) $(testchar_LDADD) $(LIBS) >-testdict$(EXEEXT): $(testdict_OBJECTS) $(testdict_DEPENDENCIES) >- @rm -f testdict$(EXEEXT) >- $(testdict_LINK) $(testdict_OBJECTS) $(testdict_LDADD) $(LIBS) >-testrecurse$(EXEEXT): $(testrecurse_OBJECTS) $(testrecurse_DEPENDENCIES) >- @rm -f testrecurse$(EXEEXT) >- $(testrecurse_LINK) $(testrecurse_OBJECTS) $(testrecurse_LDADD) $(LIBS) > xmlcatalog$(EXEEXT): $(xmlcatalog_OBJECTS) $(xmlcatalog_DEPENDENCIES) > @rm -f xmlcatalog$(EXEEXT) > $(xmlcatalog_LINK) $(xmlcatalog_OBJECTS) $(xmlcatalog_LDADD) $(LIBS) >@@ -1009,27 +811,7 @@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parserInternals.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relaxng.Plo@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runsuite.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runtest.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runxmlconf.Po@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/schematron.Plo@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testAutomata.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testC14N.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testHTML.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testModule.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testReader.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testRegexp.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testRelax.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testSAX.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testSchemas.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testThreads@THREADS_W32@.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testURI.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testXPath.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testapi.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testchar.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdict.Po@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdso.Plo@am__quote@ >-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testrecurse.Po@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree.Plo@am__quote@ > @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trio.Plo@am__quote@ >@@ -1586,8 +1368,7 @@ > clean: clean-recursive > > clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ >- clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ >- mostlyclean-am >+ clean-libtool mostlyclean-am > > distclean: distclean-recursive > -rm -f $(am__CONFIG_DISTCLEAN_FILES) >@@ -1670,8 +1451,7 @@ > > .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ > all all-am am--refresh check check-am clean clean-binPROGRAMS \ >- clean-generic clean-libLTLIBRARIES clean-libtool \ >- clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags \ >+ clean-generic clean-libLTLIBRARIES clean-libtool ctags \ > ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ > dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ > distclean distclean-compile distclean-generic distclean-hdr \ >--- libxml2-2.7.8.dfsg.orig/configure >+++ libxml2-2.7.8.dfsg/configure >@@ -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.67. > # > # > # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, >@@ -171,15 +171,7 @@ > 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 >-test \$(( 1 + 1 )) = 2 || exit 1 >- >- 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\" ) || exit 1" >+test \$(( 1 + 1 )) = 2 || exit 1" > if (eval "$as_required") 2>/dev/null; then : > as_have_required=yes > else >@@ -533,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'" > >+ >+ >+# Check that we are running under the correct shell. > SHELL=${CONFIG_SHELL-/bin/sh} > >+case X$lt_ECHO in >+X*--fallback-echo) >+ # Remove one level of quotation (which was required for Make). >+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` >+ ;; >+esac >+ >+ECHO=${lt_ECHO-echo} >+if test "X$1" = X--no-reexec; then >+ # Discard the --no-reexec flag, and continue. >+ shift >+elif test "X$1" = X--fallback-echo; then >+ # Avoid inline document here, it may be left over >+ : >+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then >+ # Yippee, $ECHO works! >+ : >+else >+ # Restart under the correct shell. >+ exec $SHELL "$0" --no-reexec ${1+"$@"} >+fi >+ >+if test "X$1" = X--fallback-echo; then >+ # used as fallback echo >+ shift >+ cat <<_LT_EOF >+$* >+_LT_EOF >+ exit 0 >+fi >+ >+# 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 >+ >+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 >+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do >+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... >+ if { echo_test_string=`eval $cmd`; } 2>/dev/null && >+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null >+ then >+ break >+ fi >+ done >+ fi >+ >+ 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 >+ : >+ else >+ # The Solaris, AIX, and Digital Unix default echo programs unquote >+ # backslashes. This makes it impossible to quote backslashes using >+ # echo "$something" | sed 's/\\/\\\\/g' >+ # >+ # So, first we look for a working echo in the user's PATH. >+ >+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR >+ for dir in $PATH /usr/ucb; do >+ IFS="$lt_save_ifs" >+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && >+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && >+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ ECHO="$dir/echo" >+ break >+ 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' && >+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ # This shell has a builtin print -r that does the trick. >+ ECHO='print -r' >+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && >+ test "X$CONFIG_SHELL" != X/bin/ksh; then >+ # If we have ksh, try running configure again with it. >+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} >+ export ORIGINAL_CONFIG_SHELL >+ CONFIG_SHELL=/bin/ksh >+ export CONFIG_SHELL >+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} >+ else >+ # Try using printf. >+ ECHO='printf %s\n' >+ 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 >+ # Cool, printf works >+ : >+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && >+ test "X$echo_testing_string" = 'X\t' && >+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL >+ export CONFIG_SHELL >+ SHELL="$CONFIG_SHELL" >+ export SHELL >+ ECHO="$CONFIG_SHELL $0 --fallback-echo" >+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && >+ test "X$echo_testing_string" = 'X\t' && >+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ ECHO="$CONFIG_SHELL $0 --fallback-echo" >+ else >+ # maybe with a smaller string... >+ prev=: >+ >+ 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 >+ break >+ fi >+ prev="$cmd" >+ done >+ >+ if test "$prev" != 'sed 50q "$0"'; then >+ echo_test_string=`eval $prev` >+ export echo_test_string >+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} >+ else >+ # Oops. We lost completely, so just stick with echo. >+ ECHO=echo >+ fi >+ fi >+ fi >+ fi >+ fi >+fi >+ >+# 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 >+ >+ >+ > > test -n "$DJDIR" || exec 7<&0 </dev/null > exec 6>&1 >@@ -708,11 +847,15 @@ > USE_VERSION_SCRIPT_FALSE > USE_VERSION_SCRIPT_TRUE > VERSION_SCRIPT_FLAGS >+MAINT >+MAINTAINER_MODE_FALSE >+MAINTAINER_MODE_TRUE > OTOOL64 > OTOOL > LIPO > NMEDIT > DSYMUTIL >+lt_ECHO > RANLIB > AR > LN_S >@@ -840,6 +983,7 @@ > enable_fast_install > with_gnu_ld > enable_libtool_lock >+enable_maintainer_mode > with_c14n > with_catalog > with_debug >@@ -953,8 +1097,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 ;; > esac > > # Accept the important Cygnus configure options, so we can diagnose typos. >@@ -1515,6 +1660,8 @@ > --enable-fast-install[=PKGS] > optimize for fast installation [default=yes] > --disable-libtool-lock avoid locking (might break parallel builds) >+ --enable-maintainer-mode enable make rules and dependencies not useful >+ (and sometimes confusing) to the casual installer > --enable-rebuild-docs[=yes/no] rebuild some generated docs [default=yes] > --enable-ipv6[=yes/no] enables compilation of IPv6 code [default=yes] > >@@ -1643,7 +1790,7 @@ > if $ac_init_version; then > cat <<\_ACEOF > configure >-generated by GNU Autoconf 2.66 >+generated by GNU Autoconf 2.67 > > Copyright (C) 2010 Free Software Foundation, Inc. > This configure script is free software; the Free Software Foundation >@@ -1715,7 +1862,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 : >@@ -1820,7 +1967,7 @@ > else > ac_header_preproc=no > 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; } > >@@ -2008,7 +2155,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.67. Invocation command line was > > $ $0 $@ > >@@ -2266,7 +2413,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 >-See \`config.log' for more details" "$LINENO" 5; } >+See \`config.log' for more details" "$LINENO" 5 ; } > fi > done > >@@ -2409,7 +2556,7 @@ > $as_echo "$ac_cv_build" >&6; } > case $ac_cv_build in > *-*-*) ;; >-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; >+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; > esac > build=$ac_cv_build > ac_save_IFS=$IFS; IFS='-' >@@ -2442,7 +2589,7 @@ > $as_echo "$ac_cv_host" >&6; } > case $ac_cv_host in > *-*-*) ;; >-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; >+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; > esac > host=$ac_cv_host > ac_save_IFS=$IFS; IFS='-' >@@ -2608,11 +2755,11 @@ > ' > case `pwd` in > *[\\\"\#\$\&\'\`$am_lf]*) >- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; >+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; > esac > case $srcdir in > *[\\\"\#\$\&\'\`$am_lf\ \ ]*) >- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; >+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; > esac > > # Do `set' in a subshell so we don't clobber the current shell's >@@ -3282,7 +3429,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 >-See \`config.log' for more details" "$LINENO" 5; } >+See \`config.log' for more details" "$LINENO" 5 ; } > > # Provide some information about the compiler. > $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 >@@ -3397,7 +3544,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 >-See \`config.log' for more details" "$LINENO" 5; } >+See \`config.log' for more details" "$LINENO" 5 ; } > else > { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 > $as_echo "yes" >&6; } >@@ -3440,7 +3587,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 >-See \`config.log' for more details" "$LINENO" 5; } >+See \`config.log' for more details" "$LINENO" 5 ; } > fi > rm -f conftest conftest$ac_cv_exeext > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 >@@ -3499,7 +3646,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'. >-See \`config.log' for more details" "$LINENO" 5; } >+See \`config.log' for more details" "$LINENO" 5 ; } > fi > fi > fi >@@ -3551,7 +3698,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 >-See \`config.log' for more details" "$LINENO" 5; } >+See \`config.log' for more details" "$LINENO" 5 ; } > fi > rm -f conftest.$ac_cv_objext conftest.$ac_ext > fi >@@ -4004,7 +4151,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. >@@ -4020,11 +4167,11 @@ > 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 : > break > fi >@@ -4063,7 +4210,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. >@@ -4079,18 +4226,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 : > > else > { { $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 >-See \`config.log' for more details" "$LINENO" 5; } >+See \`config.log' for more details" "$LINENO" 5 ; } > fi > > ac_ext=c >@@ -4690,7 +4837,7 @@ > enable_win32_dll=yes > > case $host in >-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) >+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) > if test -n "$ac_tool_prefix"; then > # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. > set dummy ${ac_tool_prefix}as; ac_word=$2 >@@ -4998,8 +5145,8 @@ > > > >-macro_version='2.2.10' >-macro_revision='1.3175' >+macro_version='2.2.6b' >+macro_revision='1.3017' > > > >@@ -5015,75 +5162,6 @@ > > ltmain="$ac_aux_dir/ltmain.sh" > >-# Backslashify metacharacters that are still active within >-# double-quoted strings. >-sed_quote_subst='s/\(["`$\\]\)/\\\1/g' >- >-# Same as above, but do not quote variable references. >-double_quote_subst='s/\(["`\\]\)/\\\1/g' >- >-# Sed substitution to delay expansion of an escaped shell variable in a >-# double_quote_subst'ed string. >-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' >- >-# Sed substitution to delay expansion of an escaped single quote. >-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' >- >-# Sed substitution to avoid accidental globbing in evaled expressions >-no_glob_subst='s/\*/\\\*/g' >- >-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' >-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO >-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO >- >-{ $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 && \ >- 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 >- ECHO='printf %s\n' >-else >- # Use this function as a fallback that always works. >- func_fallback_echo () >- { >- eval 'cat <<_LTECHO_EOF >-$1 >-_LTECHO_EOF' >- } >- ECHO='func_fallback_echo' >-fi >- >-# func_echo_all arg... >-# Invoke $ECHO with all args, space-separated. >-func_echo_all () >-{ >- $ECHO "" >-} >- >-case "$ECHO" in >- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 >-$as_echo "printf" >&6; } ;; >- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 >-$as_echo "print -r" >&6; } ;; >- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 >-$as_echo "cat" >&6; } ;; >-esac >- >- >- >- >- >- >- >- >- >- >- >- >- >- > { $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 : >@@ -5419,11 +5497,8 @@ > NM="$lt_cv_path_NM" > else > # Didn't find any BSD compatible name lister, look for dumpbin. >- if test -n "$DUMPBIN"; then : >- # Let the user override the test. >- else >- if test -n "$ac_tool_prefix"; then >- for ac_prog in dumpbin "link -dump" >+ if test -n "$ac_tool_prefix"; then >+ for ac_prog in "dumpbin -symbols" "link -dump -symbols" > 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 >@@ -5467,7 +5542,7 @@ > fi > if test -z "$DUMPBIN"; then > ac_ct_DUMPBIN=$DUMPBIN >- for ac_prog in dumpbin "link -dump" >+ for ac_prog in "dumpbin -symbols" "link -dump -symbols" > do > # Extract the first word of "$ac_prog", so it can be a program name with args. > set dummy $ac_prog; ac_word=$2 >@@ -5522,15 +5597,6 @@ > fi > fi > >- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in >- *COFF*) >- DUMPBIN="$DUMPBIN -symbols" >- ;; >- *) >- DUMPBIN=: >- ;; >- esac >- fi > > if test "$DUMPBIN" != ":"; then > NM="$DUMPBIN" >@@ -5550,13 +5616,13 @@ > else > lt_cv_nm_interface="BSD nm" > echo "int some_variable = 0;" > conftest.$ac_ext >- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) >+ (eval echo "\"\$as_me:5619: $ac_compile\"" >&5) > (eval "$ac_compile" 2>conftest.err) > cat conftest.err >&5 >- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) >+ (eval echo "\"\$as_me:5622: $NM \\\"conftest.$ac_objext\\\"\"" >&5) > (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) > cat conftest.err >&5 >- (eval echo "\"\$as_me:$LINENO: output\"" >&5) >+ (eval echo "\"\$as_me:5625: output\"" >&5) > cat conftest.out >&5 > if $GREP 'External.*some_variable' conftest.out > /dev/null; then > lt_cv_nm_interface="MS dumpbin" >@@ -5613,11 +5679,6 @@ > lt_cv_sys_max_cmd_len=8192; > ;; > >- mint*) >- # On MiNT this can take a long time and run out of memory. >- lt_cv_sys_max_cmd_len=8192; >- ;; >- > amigaos*) > # On AmigaOS with pdksh, this test takes hours, literally. > # So we just punt and use a minimum line length of 8192. >@@ -5682,8 +5743,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. >- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ >- = "X$teststring$teststring"; } >/dev/null 2>&1 && >+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ >+ = "XX$teststring$teststring"; } >/dev/null 2>&1 && > test $i != 17 # 1/2 MB should be enough > do > i=`expr $i + 1` >@@ -5951,18 +6012,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. >- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. >- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then >+ if ( file / ) >/dev/null 2>&1; then > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else >- # Keep this pattern in sync with the one in func_win32_libid. >- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > >-cegcc*) >+cegcc) > # 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' >@@ -5992,10 +6051,6 @@ > lt_cv_deplibs_check_method=pass_all > ;; > >-haiku*) >- lt_cv_deplibs_check_method=pass_all >- ;; >- > hpux10.20* | hpux11*) > lt_cv_file_magic_cmd=/usr/bin/file > case $host_cpu in >@@ -6004,11 +6059,11 @@ > lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so > ;; > hppa*64*) >- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' >+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' > lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl > ;; > *) >- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' >+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' > lt_cv_file_magic_test_file=/usr/lib/libc.sl > ;; > esac >@@ -6034,7 +6089,7 @@ > lt_cv_deplibs_check_method=pass_all > ;; > >-netbsd*) >+netbsd* | netbsdelf*-gnu) > 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 >@@ -6446,18 +6501,6 @@ > old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" > fi > >-case $host_os in >- darwin*) >- lock_old_archive_extraction=yes ;; >- *) >- lock_old_archive_extraction=no ;; >-esac >- >- >- >- >- >- > > > >@@ -6627,8 +6670,8 @@ > test $ac_status = 0; }; then > # Now try to grab the symbols. > nlist=conftest.nm >- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 >- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 >+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 >+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; } && test -s "$nlist"; then >@@ -6781,7 +6824,7 @@ > ;; > *-*-irix6*) > # Find out which ABI we are using. >- echo '#line '$LINENO' "configure"' > conftest.$ac_ext >+ echo '#line 6827 "configure"' > conftest.$ac_ext > if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > (eval $ac_compile) 2>&5 > ac_status=$? >@@ -7493,38 +7536,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 : >- $as_echo_n "(cached) " >&6 >-else >- lt_cv_ld_force_load=no >- cat > conftest.c << _LT_EOF >-int forced_loaded() { return 2;} >-_LT_EOF >- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 >- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 >- echo "$AR cru libconftest.a conftest.o" >&5 >- $AR cru libconftest.a conftest.o 2>&5 >- echo "$RANLIB libconftest.a" >&5 >- $RANLIB libconftest.a 2>&5 >- cat > conftest.c << _LT_EOF >-int main() { return 0;} >-_LT_EOF >- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 >- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err >- _lt_result=$? >- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then >- lt_cv_ld_force_load=yes >- else >- cat conftest.err >&5 >- fi >- rm -f conftest.err libconftest.a conftest conftest.c >- rm -rf conftest.dSYM >- >-fi >-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 >-$as_echo "$lt_cv_ld_force_load" >&6; } > case $host_os in > rhapsody* | darwin1.[012]) > _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; >@@ -7552,7 +7563,7 @@ > else > _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' > fi >- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then >+ if test "$DSYMUTIL" != ":"; then > _lt_dsymutil='~$DSYMUTIL $lib || :' > else > _lt_dsymutil= >@@ -7575,8 +7586,6 @@ > > > >- >- > # Set options > > >@@ -7727,7 +7736,6 @@ > > > >- > test -z "$LN_S" && LN_S="ln -s" > > >@@ -7777,6 +7785,19 @@ > > > >+ >+ >+ >+ >+ >+ >+ >+ >+ >+ >+ >+ >+ > case $host_os in > aix3*) > # AIX sometimes has problems with the GCC collect2 program. For some >@@ -7789,6 +7810,23 @@ > ;; > esac > >+# Sed substitution that helps us do robust quoting. It backslashifies >+# metacharacters that are still active within double-quoted strings. >+sed_quote_subst='s/\(["`$\\]\)/\\\1/g' >+ >+# Same as above, but do not quote variable references. >+double_quote_subst='s/\(["`\\]\)/\\\1/g' >+ >+# Sed substitution to delay expansion of an escaped shell variable in a >+# double_quote_subst'ed string. >+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' >+ >+# Sed substitution to delay expansion of an escaped single quote. >+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' >+ >+# Sed substitution to avoid accidental globbing in evaled expressions >+no_glob_subst='s/\*/\\\*/g' >+ > # Global variables: > ofile=libtool > can_build_shared=yes >@@ -7817,7 +7855,7 @@ > *) break;; > esac > done >-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` >+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` > > > # Only perform the check for file, if the check method requires it >@@ -8026,12 +8064,7 @@ > lt_prog_compiler_no_builtin_flag= > > if test "$GCC" = yes; then >- case $cc_basename in >- nvcc*) >- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; >- *) >- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; >- esac >+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' > > { $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; } >@@ -8051,15 +8084,15 @@ > -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ > -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ > -e 's:$: $lt_compiler_flag:'` >- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) >+ (eval echo "\"\$as_me:8087: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ echo "$as_me:8091: \$? = $ac_status" >&5 > if (exit $ac_status) && test -s "$ac_outfile"; then > # The compiler can only warn and ignore the option if not recognized > # So say no if there are warnings other than the usual output. >- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp >+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp > $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 >@@ -8137,12 +8170,6 @@ > lt_prog_compiler_pic='-fno-common' > ;; > >- haiku*) >- # PIC is the default for Haiku. >- # The "-static" flag exists, but is broken. >- lt_prog_compiler_static= >- ;; >- > 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 >@@ -8185,13 +8212,6 @@ > lt_prog_compiler_pic='-fPIC' > ;; > esac >- >- case $cc_basename in >- nvcc*) # Cuda Compiler Driver 2.2 >- lt_prog_compiler_wl='-Xlinker ' >- lt_prog_compiler_pic='-Xcompiler -fPIC' >- ;; >- esac > else > # PORTME Check for flag to pass linker flags through the system compiler. > case $host_os in >@@ -8254,7 +8274,7 @@ > lt_prog_compiler_pic='--shared' > lt_prog_compiler_static='--static' > ;; >- 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,' >@@ -8266,26 +8286,26 @@ > # All Alpha code is PIC. > lt_prog_compiler_static='-non_shared' > ;; >- xl* | bgxl* | bgf* | mpixl*) >- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene >+ xl*) >+ # IBM XL C 8.0/Fortran 10.1 on PPC > lt_prog_compiler_wl='-Wl,' > lt_prog_compiler_pic='-qpic' > lt_prog_compiler_static='-qstaticlink' > ;; > *) > case `$CC -V 2>&1 | sed 5q` in >- *Sun\ F* | *Sun*Fortran*) >- # Sun Fortran 8.3 passes all unrecognized flags to the linker >- lt_prog_compiler_pic='-KPIC' >- lt_prog_compiler_static='-Bstatic' >- lt_prog_compiler_wl='' >- ;; > *Sun\ C*) > # Sun C 5.9 > lt_prog_compiler_pic='-KPIC' > lt_prog_compiler_static='-Bstatic' > lt_prog_compiler_wl='-Wl,' > ;; >+ *Sun\ F*) >+ # Sun Fortran 8.3 passes all unrecognized flags to the linker >+ lt_prog_compiler_pic='-KPIC' >+ lt_prog_compiler_static='-Bstatic' >+ lt_prog_compiler_wl='' >+ ;; > esac > ;; > esac >@@ -8316,7 +8336,7 @@ > lt_prog_compiler_pic='-KPIC' > lt_prog_compiler_static='-Bstatic' > case $cc_basename in >- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) >+ f77* | f90* | f95*) > lt_prog_compiler_wl='-Qoption ld ';; > *) > lt_prog_compiler_wl='-Wl,';; >@@ -8403,15 +8423,15 @@ > -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ > -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ > -e 's:$: $lt_compiler_flag:'` >- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) >+ (eval echo "\"\$as_me:8426: $lt_compile\"" >&5) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ echo "$as_me:8430: \$? = $ac_status" >&5 > if (exit $ac_status) && test -s "$ac_outfile"; then > # The compiler can only warn and ignore the option if not recognized > # So say no if there are warnings other than the usual output. >- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp >+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp > $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 >@@ -8459,7 +8479,7 @@ > if test -s conftest.err; then > # Append any errors to the config.log. > cat conftest.err 1>&5 >- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp >+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp > $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 > if diff conftest.exp conftest.er2 >/dev/null; then > lt_cv_prog_compiler_static_works=yes >@@ -8508,16 +8528,16 @@ > -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ > -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ > -e 's:$: $lt_compiler_flag:'` >- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) >+ (eval echo "\"\$as_me:8531: $lt_compile\"" >&5) > (eval "$lt_compile" 2>out/conftest.err) > ac_status=$? > cat out/conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ echo "$as_me:8535: \$? = $ac_status" >&5 > if (exit $ac_status) && test -s out/conftest2.$ac_objext > then > # The compiler can only warn and ignore the option if not recognized > # So say no if there are warnings >- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp >+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp > $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 >@@ -8563,16 +8583,16 @@ > -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ > -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ > -e 's:$: $lt_compiler_flag:'` >- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) >+ (eval echo "\"\$as_me:8586: $lt_compile\"" >&5) > (eval "$lt_compile" 2>out/conftest.err) > ac_status=$? > cat out/conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >+ echo "$as_me:8590: \$? = $ac_status" >&5 > if (exit $ac_status) && test -s out/conftest2.$ac_objext > then > # The compiler can only warn and ignore the option if not recognized > # So say no if there are warnings >- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp >+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp > $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 >@@ -8682,36 +8702,13 @@ > openbsd*) > with_gnu_ld=no > ;; >+ linux* | k*bsd*-gnu) >+ link_all_deplibs=no >+ ;; > esac > > ld_shlibs=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 >- case $host_os in >- aix*) >- # The AIX port of GNU ld has always aspired to compatibility >- # with the native linker. However, as the warning in the GNU ld >- # block says, versions before 2.19.5* couldn't really create working >- # shared libraries, regardless of the interface used. >- case `$LD -v 2>&1` in >- *\ \(GNU\ Binutils\)\ 2.19.5*) ;; >- *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; >- *\ \(GNU\ Binutils\)\ [3-9]*) ;; >- *) >- lt_use_gnu_ld_interface=yes >- ;; >- esac >- ;; >- *) >- lt_use_gnu_ld_interface=yes >- ;; >- esac >- fi >- >- if test "$lt_use_gnu_ld_interface" = yes; then > # If archive_cmds runs LD, not CC, wlarc should be empty > wlarc='${wl}' > >@@ -8745,12 +8742,11 @@ > ld_shlibs=no > cat <<_LT_EOF 1>&2 > >-*** Warning: the GNU linker, at least up to release 2.19, is reported >+*** Warning: the GNU linker, at least up to release 2.9.1, is reported > *** to be unable to reliably create shared libraries on AIX. > *** Therefore, libtool is disabling shared libraries support. If you >-*** really care for shared libraries, you may want to install binutils >-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. >-*** You will then need to restart the configuration process. >+*** really care for shared libraries, you may want to modify your PATH >+*** so that a non-GNU linker is found, and then restart. > > _LT_EOF > fi >@@ -8786,7 +8782,6 @@ > # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, > # as there is no search path for DLLs. > hardcode_libdir_flag_spec='-L$libdir' >- export_dynamic_flag_spec='${wl}--export-all-symbols' > allow_undefined_flag=unsupported > always_export_symbols=no > enable_shared_with_static_runtimes=yes >@@ -8808,11 +8803,6 @@ > fi > ;; > >- haiku*) >- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' >- link_all_deplibs=yes >- ;; >- > interix[3-9]*) > hardcode_direct=no > hardcode_shlibpath_var=no >@@ -8842,12 +8832,11 @@ > tmp_sharedflag='-shared' > case $cc_basename,$host_cpu in > pgcc*) # Portland Group C compiler >- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > tmp_addflag=' $pic_flag' > ;; >- pgf77* | pgf90* | pgf95* | pgfortran*) >- # Portland Group f77 and f90 compilers >- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers >+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > tmp_addflag=' $pic_flag -Mnomain' ;; > ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 > tmp_addflag=' -i_dynamic' ;; >@@ -8858,17 +8847,13 @@ > lf95*) # Lahey Fortran 8.1 > whole_archive_flag_spec= > tmp_sharedflag='--shared' ;; >- xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) >+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) > tmp_sharedflag='-qmkshrobj' > tmp_addflag= ;; >- nvcc*) # Cuda Compiler Driver 2.2 >- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >- compiler_needs_object=yes >- ;; > esac > case `$CC -V 2>&1 | sed 5q` in > *Sun\ C*) # Sun C 5.9 >- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > compiler_needs_object=yes > tmp_sharedflag='-G' ;; > *Sun\ F*) # Sun Fortran 8.3 >@@ -8884,17 +8869,17 @@ > fi > > case $cc_basename in >- xlf* | bgf* | bgxlf* | mpixlf*) >+ xlf*) > # IBM XL Fortran 10.1 on PPC cannot create shared libs itself > whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' > hardcode_libdir_flag_spec= > hardcode_libdir_flag_spec_ld='-rpath $libdir' >- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' >+ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' > if test "x$supports_anon_versioning" = xyes; then > archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ > cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ > echo "local: *; };" >> $output_objdir/$libname.ver~ >- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' >+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' > fi > ;; > esac >@@ -8903,7 +8888,7 @@ > fi > ;; > >- netbsd*) >+ netbsd* | netbsdelf*-gnu) > if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then > archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= >@@ -9015,10 +9000,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 >- # Also, AIX nm treats weak defined symbols like other global >- # defined symbols, whereas GNU nm marks them as "W". > if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then >- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' >+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' > 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 >@@ -9080,6 +9063,7 @@ > if test "$aix_use_runtimelinking" = yes; then > shared_flag="$shared_flag "'${wl}-G' > fi >+ link_all_deplibs=no > else > # not using gcc > if test "$host_cpu" = ia64; then >@@ -9136,7 +9120,7 @@ > 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" >+ archive_expsym_cmds='$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 > hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' >@@ -9180,13 +9164,8 @@ > # -berok will link without error, but may produce a broken library. > no_undefined_flag=' ${wl}-bernotok' > allow_undefined_flag=' ${wl}-berok' >- if test "$with_gnu_ld" = yes; then >- # We only use this code for GNU lds that support --whole-archive. >- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' >- else >- # Exported symbols can be pulled into shared objects from archives >- whole_archive_flag_spec='$convenience' >- fi >+ # Exported symbols can be pulled into shared objects from archives >+ whole_archive_flag_spec='$convenience' > 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' >@@ -9225,7 +9204,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=' >+ 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. >@@ -9241,11 +9220,7 @@ > hardcode_direct=no > hardcode_automatic=yes > hardcode_shlibpath_var=unsupported >- if test "$lt_cv_ld_force_load" = "yes"; then >- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' >- else >- whole_archive_flag_spec='' >- fi >+ whole_archive_flag_spec='' > link_all_deplibs=yes > allow_undefined_flag="$_lt_dar_allow_undefined" > case $cc_basename in >@@ -9253,7 +9228,7 @@ > *) _lt_dar_can_shared=$GCC ;; > esac > if test "$_lt_dar_can_shared" = "yes"; then >- output_verbose_link_cmd=func_echo_all >+ output_verbose_link_cmd=echo > 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}" >@@ -9319,7 +9294,7 @@ > ;; > > hpux10*) >- if test "$GCC" = yes && test "$with_gnu_ld" = no; then >+ 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' > else > archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' >@@ -9338,7 +9313,7 @@ > ;; > > hpux11*) >- if test "$GCC" = yes && test "$with_gnu_ld" = no; then >+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then > case $host_cpu in > hppa*64*) > archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' >@@ -9359,46 +9334,7 @@ > archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' > ;; > *) >- >- # Older versions of the 11.00 compiler do not understand -b yet >- # (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 : >- $as_echo_n "(cached) " >&6 >-else >- lt_cv_prog_compiler__b=no >- save_LDFLAGS="$LDFLAGS" >- LDFLAGS="$LDFLAGS -b" >- echo "$lt_simple_link_test_code" > conftest.$ac_ext >- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then >- # The linker can only warn and ignore the option if not recognized >- # So say no if there are warnings >- if test -s conftest.err; then >- # Append any errors to the config.log. >- cat conftest.err 1>&5 >- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp >- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 >- if diff conftest.exp conftest.er2 >/dev/null; then >- lt_cv_prog_compiler__b=yes >- fi >- else >- lt_cv_prog_compiler__b=yes >- fi >- fi >- $RM -r conftest* >- LDFLAGS="$save_LDFLAGS" >- >-fi >-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 >-$as_echo "$lt_cv_prog_compiler__b" >&6; } >- >-if test x"$lt_cv_prog_compiler__b" = xyes; then >- archive_cmds='$CC -b ${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' >-fi >- >+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' > ;; > esac > fi >@@ -9426,7 +9362,7 @@ > > 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 $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. >@@ -9437,15 +9373,15 @@ > 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' >+ 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" > 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' >+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' >+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' > fi > archive_cmds_need_lc='no' > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' >@@ -9454,7 +9390,7 @@ > link_all_deplibs=yes > ;; > >- netbsd*) >+ netbsd* | netbsdelf*-gnu) > if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then > archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out > else >@@ -9507,17 +9443,17 @@ > hardcode_libdir_flag_spec='-L$libdir' > hardcode_minus_L=yes > allow_undefined_flag=unsupported >- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' >+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' > old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' > ;; > > osf3*) > if test "$GCC" = yes; then > allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' >- archive_cmds='$CC -shared${allow_undefined_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${allow_undefined_flag} $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' > else > allow_undefined_flag=' -expect_unresolved \*' >- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' >+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' > fi > archive_cmds_need_lc='no' > hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' >@@ -9527,13 +9463,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} $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 > allow_undefined_flag=' -expect_unresolved \*' >- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' >+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' > archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ >- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' >+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' > > # Both c and cxx compiler support -rpath directly > hardcode_libdir_flag_spec='-rpath $libdir' >@@ -9736,50 +9672,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 : >- $as_echo_n "(cached) " >&6 >-else >- $RM conftest* >- echo "$lt_simple_compile_test_code" > conftest.$ac_ext >+ $RM conftest* >+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext > >- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 >+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 > (eval $ac_compile) 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; } 2>conftest.err; then >- soname=conftest >- lib=conftest >- libobjs=conftest.$ac_objext >- deplibs= >- wl=$lt_prog_compiler_wl >- pic_flag=$lt_prog_compiler_pic >- compiler_flags=-v >- linker_flags=-v >- verstring= >- output_objdir=. >- libname=conftest >- lt_save_allow_undefined_flag=$allow_undefined_flag >- allow_undefined_flag= >- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 >+ soname=conftest >+ lib=conftest >+ libobjs=conftest.$ac_objext >+ deplibs= >+ wl=$lt_prog_compiler_wl >+ pic_flag=$lt_prog_compiler_pic >+ compiler_flags=-v >+ linker_flags=-v >+ verstring= >+ output_objdir=. >+ libname=conftest >+ lt_save_allow_undefined_flag=$allow_undefined_flag >+ allow_undefined_flag= >+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 > (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; } >- then >- lt_cv_archive_cmds_need_lc=no >- else >- lt_cv_archive_cmds_need_lc=yes >- fi >- allow_undefined_flag=$lt_save_allow_undefined_flag >- else >- cat conftest.err 1>&5 >- fi >- $RM conftest* >- >-fi >-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 >-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } >- archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc >+ then >+ archive_cmds_need_lc=no >+ else >+ archive_cmds_need_lc=yes >+ fi >+ allow_undefined_flag=$lt_save_allow_undefined_flag >+ else >+ cat conftest.err 1>&5 >+ fi >+ $RM conftest* >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 >+$as_echo "$archive_cmds_need_lc" >&6; } > ;; > esac > fi >@@ -9950,23 +9880,16 @@ > darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; > *) lt_awk_arg="/^libraries:/" ;; > esac >- case $host_os in >- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; >- *) lt_sed_strip_eq="s,=/,/,g" ;; >- esac >- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` >- case $lt_search_path_spec in >- *\;*) >+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` >+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then > # if the path contains ";" then we assume it to be the separator > # otherwise default to the standard path separator (i.e. ":") - it is > # assumed that no part of a normal pathname contains ";" but that should > # okay in the real world where ";" in dirpaths is itself problematic. >- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` >- ;; >- *) >- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` >- ;; >- esac >+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` >+ else >+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` >+ fi > # 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= >@@ -9979,7 +9902,7 @@ > lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" > fi > done >- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' >+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' > BEGIN {RS=" "; FS="/|\n";} { > lt_foo=""; > lt_count=0; >@@ -9999,13 +9922,7 @@ > if (lt_foo != "") { lt_freq[lt_foo]++; } > if (lt_freq[lt_foo] == 1) { print lt_foo; } > }'` >- # AWK program above erroneously prepends '/' to C:/dos/paths >- # for these hosts. >- case $host_os in >- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ >- $SED 's,/\([A-Za-z]:\),\1,g'` ;; >- esac >- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` >+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` > else > sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" > fi >@@ -10093,7 +10010,7 @@ > m68k) > library_names_spec='$libname.ixlibrary $libname.a' > # Create ${libname}_ixlibrary.a entries in /sys/libs. >- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' >+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' > ;; > esac > ;; >@@ -10146,12 +10063,23 @@ > 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}' >- >- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" >+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" > ;; > mingw* | cegcc*) > # MinGW DLLs use traditional 'lib' prefix > soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' >+ 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 >+ # 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/$PATH_SEPARATOR/ /g"` >+ fi > ;; > pw32*) > # pw32 DLLs use 'pw' prefix rather than 'lib' >@@ -10251,19 +10179,6 @@ > hardcode_into_libs=yes > ;; > >-haiku*) >- version_type=linux >- need_lib_prefix=no >- need_version=no >- dynamic_linker="$host_os runtime_loader" >- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' >- soname_spec='${libname}${release}${shared_ext}$major' >- shlibpath_var=LIBRARY_PATH >- shlibpath_overrides_runpath=yes >- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' >- hardcode_into_libs=yes >- ;; >- > hpux9* | hpux10* | hpux11*) > # Give a soname corresponding to the major version so that dld.sl refuses to > # link against other versions. >@@ -10306,10 +10221,8 @@ > soname_spec='${libname}${release}${shared_ext}$major' > ;; > esac >- # HP-UX runs *really* slowly unless shared libraries are mode 555, ... >+ # HP-UX runs *really* slowly unless shared libraries are mode 555. > postinstall_cmds='chmod 555 $lib' >- # or fails outright, so override atomically: >- install_override_mode=555 > ;; > > interix[3-9]*) >@@ -10376,17 +10289,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 : >- $as_echo_n "(cached) " >&6 >-else >- lt_cv_shlibpath_overrides_runpath=no >- save_LDFLAGS=$LDFLAGS >- save_libdir=$libdir >- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ >- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" >- cat confdefs.h - <<_ACEOF >conftest.$ac_ext >+ save_LDFLAGS=$LDFLAGS >+ save_libdir=$libdir >+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ >+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" >+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > /* end confdefs.h. */ > > int >@@ -10399,31 +10307,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 : >- lt_cv_shlibpath_overrides_runpath=yes >+ shlibpath_overrides_runpath=yes > fi > fi > rm -f core conftest.err conftest.$ac_objext \ > conftest$ac_exeext conftest.$ac_ext >- LDFLAGS=$save_LDFLAGS >- libdir=$save_libdir >- >-fi >- >- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath >+ LDFLAGS=$save_LDFLAGS >+ libdir=$save_libdir > > # This implies no fast_install, which is unacceptable. > # Some rework will be needed to allow for fast_install > # before this can be enabled. > hardcode_into_libs=yes > >- # Add ABI-specific directories to the system library path. >- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" >- > # Append ld.so.conf contents to the search path > if test -f /etc/ld.so.conf; then >- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` >- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" >- >+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` >+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" > fi > > # We used to test for /lib/ld.so.1 and disable shared libraries on >@@ -10435,6 +10335,18 @@ > dynamic_linker='GNU/Linux ld.so' > ;; > >+netbsdelf*-gnu) >+ version_type=linux >+ need_lib_prefix=no >+ need_version=no >+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' >+ soname_spec='${libname}${release}${shared_ext}$major' >+ shlibpath_var=LD_LIBRARY_PATH >+ shlibpath_overrides_runpath=no >+ hardcode_into_libs=yes >+ dynamic_linker='NetBSD ld.elf_so' >+ ;; >+ > netbsd*) > version_type=sunos > need_lib_prefix=no >@@ -10725,11 +10637,6 @@ > > > >- >- >- >- >- > { $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= >@@ -11060,7 +10967,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF >-#line $LINENO "configure" >+#line 10970 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -11101,13 +11008,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"))); >-#endif >- >-void fnord () { int i=42; } >+void fnord() { int i=42;} > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); >@@ -11116,11 +11017,7 @@ > if (self) > { > if (dlsym (self,"fnord")) status = $lt_dlno_uscore; >- else >- { >- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; >- else puts (dlerror ()); >- } >+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; > /* dlclose (self); */ > } > else >@@ -11166,7 +11063,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF >-#line $LINENO "configure" >+#line 11066 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -11207,13 +11104,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"))); >-#endif >- >-void fnord () { int i=42; } >+void fnord() { int i=42;} > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); >@@ -11222,11 +11113,7 @@ > if (self) > { > if (dlsym (self,"fnord")) status = $lt_dlno_uscore; >- else >- { >- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; >- else puts (dlerror ()); >- } >+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; > /* dlclose (self); */ > } > else >@@ -11404,6 +11291,30 @@ > > > >+ >+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 >+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } >+ # Check whether --enable-maintainer-mode was given. >+if test "${enable_maintainer_mode+set}" = set; then : >+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval >+else >+ USE_MAINTAINER_MODE=no >+fi >+ >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 >+$as_echo "$USE_MAINTAINER_MODE" >&6; } >+ if test $USE_MAINTAINER_MODE = yes; then >+ MAINTAINER_MODE_TRUE= >+ MAINTAINER_MODE_FALSE='#' >+else >+ MAINTAINER_MODE_TRUE='#' >+ MAINTAINER_MODE_FALSE= >+fi >+ >+ MAINT=$MAINTAINER_MODE_TRUE >+ >+ >+ > VERSION_SCRIPT_FLAGS= > # lt_cv_prog_gnu_ld is from libtool 2.+ > if test "$lt_cv_prog_gnu_ld" = yes; then >@@ -11414,7 +11325,7 @@ > esac > fi > >- if test -z "$VERSION_SCRIPT_FLAGS"; then >+ if test -n "$VERSION_SCRIPT_FLAGS"; then > USE_VERSION_SCRIPT_TRUE= > USE_VERSION_SCRIPT_FALSE='#' > else >@@ -12998,7 +12909,7 @@ > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of socket length (socklen_t)" >&5 > $as_echo_n "checking for type of socket length (socklen_t)... " >&6; } > cat > conftest.$ac_ext <<EOF >-#line 13001 "configure" >+#line 12912 "configure" > #include "confdefs.h" > > #include <stddef.h> >@@ -13009,7 +12920,7 @@ > (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL) > ; return 0; } > EOF >-if { (eval echo configure:13012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then >+if { (eval echo configure:12923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then > rm -rf conftest* > > { $as_echo "$as_me:${as_lineno-$LINENO}: result: socklen_t *" >&5 >@@ -13021,7 +12932,7 @@ > rm -rf conftest* > > cat > conftest.$ac_ext <<EOF >-#line 13024 "configure" >+#line 12935 "configure" > #include "confdefs.h" > > #include <stddef.h> >@@ -13032,7 +12943,7 @@ > (void)getsockopt (1, 1, 1, NULL, (size_t *)NULL) > ; return 0; } > EOF >-if { (eval echo configure:13035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then >+if { (eval echo configure:12946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then > rm -rf conftest* > > { $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t *" >&5 >@@ -13044,7 +12955,7 @@ > rm -rf conftest* > > cat > conftest.$ac_ext <<EOF >-#line 13047 "configure" >+#line 12958 "configure" > #include "confdefs.h" > > #include <stddef.h> >@@ -13055,7 +12966,7 @@ > (void)getsockopt (1, 1, 1, NULL, (int *)NULL) > ; return 0; } > EOF >-if { (eval echo configure:13058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then >+if { (eval echo configure:12969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then > rm -rf conftest* > > { $as_echo "$as_me:${as_lineno-$LINENO}: result: int *" >&5 >@@ -14457,7 +14368,7 @@ > *) M_LIBS="-lm" > ;; > esac >-XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS" >+XML_LIBS="-lxml2" > XML_LIBTOOLLIBS="libxml2.la" > > >@@ -14754,6 +14665,10 @@ > as_fn_error $? "conditional \"am__fastdepCC\" was never defined. > Usually this means the macro was only invoked conditionally." "$LINENO" 5 > fi >+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then >+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. >+Usually this means the macro was only invoked conditionally." "$LINENO" 5 >+fi > if test -z "${USE_VERSION_SCRIPT_TRUE}" && test -z "${USE_VERSION_SCRIPT_FALSE}"; then > as_fn_error $? "conditional \"USE_VERSION_SCRIPT\" was never defined. > Usually this means the macro was only invoked conditionally." "$LINENO" 5 >@@ -15179,7 +15094,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.67. Invocation command line was > > CONFIG_FILES = $CONFIG_FILES > CONFIG_HEADERS = $CONFIG_HEADERS >@@ -15245,7 +15160,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.67, > with options \\"\$ac_cs_config\\" > > Copyright (C) 2010 Free Software Foundation, Inc. >@@ -15266,11 +15181,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 >@@ -15292,6 +15212,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;; >@@ -15367,148 +15288,133 @@ > sed_quote_subst='$sed_quote_subst' > double_quote_subst='$double_quote_subst' > delay_variable_subst='$delay_variable_subst' >-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' >-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' >-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' >-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' >-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' >-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' >-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' >-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' >-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' >-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' >-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' >-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' >-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' >-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' >-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' >-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' >-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' >-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' >-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' >-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' >-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' >-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' >-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' >-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' >-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' >-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' >-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' >-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' >-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"`' >-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' >-reload_cmds='`$ECHO "$reload_cmds" | $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"`' >-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' >-AR_FLAGS='`$ECHO "$AR_FLAGS" | $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"`' >-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' >-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' >-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' >-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' >-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' >-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' >-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' >-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' >-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"`' >-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_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"`' >-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' >-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' >-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' >-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' >-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' >-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' >-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' >-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' >-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' >-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' >-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' >-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' >-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' >-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' >-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' >-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' >-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' >-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' >-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' >-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' >-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' >-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' >-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' >-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' >-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' >-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' >-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' >-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' >-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' >-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"`' >-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"`' >-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' >-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' >-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' >-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' >-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' >-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' >-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' >-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' >-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' >-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' >-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' >-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' >-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' >-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' >-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' >-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' >-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' >-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' >-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' >-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' >-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' >-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' >+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' >+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' >+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' >+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' >+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' >+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' >+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' >+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' >+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' >+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' >+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' >+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' >+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' >+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' >+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' >+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' >+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' >+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' >+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' >+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' >+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' >+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' >+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' >+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' >+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' >+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' >+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' >+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' >+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' >+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' >+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' >+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' >+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' >+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' >+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' >+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' >+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' >+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' >+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' >+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' >+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' >+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' >+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' >+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' >+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' >+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' >+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' >+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' >+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' >+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' >+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' >+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' >+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' >+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' >+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' >+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' >+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' >+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' >+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' >+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' >+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' >+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' >+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' >+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' >+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' >+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' >+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' >+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' >+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' >+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' >+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' >+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' >+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' >+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' >+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' >+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' >+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' >+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' >+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' >+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' >+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' >+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' >+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' >+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' >+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' >+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' >+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' >+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' >+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' >+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' >+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' >+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' >+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' >+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' >+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' > > LTCC='$LTCC' > LTCFLAGS='$LTCFLAGS' > compiler='$compiler_DEFAULT' > >-# A function that is used when there is no print builtin or printf. >-func_fallback_echo () >-{ >- eval 'cat <<_LTECHO_EOF >-\$1 >-_LTECHO_EOF' >-} >- > # Quote evaled strings. >-for var in AS \ >-DLLTOOL \ >-OBJDUMP \ >-SHELL \ >-ECHO \ >-SED \ >+for var in SED \ > GREP \ > EGREP \ > FGREP \ >@@ -15531,6 +15437,8 @@ > 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 \ >+SHELL \ >+ECHO \ > lt_prog_compiler_no_builtin_flag \ > lt_prog_compiler_wl \ > lt_prog_compiler_pic \ >@@ -15560,13 +15468,12 @@ > libname_spec \ > library_names_spec \ > soname_spec \ >-install_override_mode \ > finish_eval \ > old_striplib \ > striplib; do >- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in >+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in > *[\\\\\\\`\\"\\\$]*) >- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" >+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" > ;; > *) > eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" >@@ -15593,9 +15500,9 @@ > finish_cmds \ > sys_lib_search_path_spec \ > sys_lib_dlsearch_path_spec; do >- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in >+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in > *[\\\\\\\`\\"\\\$]*) >- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" >+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" > ;; > *) > eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" >@@ -15603,6 +15510,12 @@ > esac > done > >+# Fix-up fallback echo if it was mangled by the above quoting rules. >+case \$lt_ECHO in >+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` >+ ;; >+esac >+ > ac_aux_dir='$ac_aux_dir' > xsi_shell='$xsi_shell' > lt_shell_append='$lt_shell_append' >@@ -15651,7 +15564,7 @@ > "libxml-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libxml-2.0-uninstalled.pc" ;; > "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;; > >- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; >+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; > esac > done > >@@ -15967,7 +15880,7 @@ > esac > case $ac_mode$ac_tag in > :[FHL]*:*);; >- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; >+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; > :[FH]-) ac_tag=-:-;; > :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; > esac >@@ -15995,7 +15908,7 @@ > [\\/$]*) false;; > *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; > esac || >- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; >+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; > esac > case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac > as_fn_append ac_file_inputs " '$ac_f'" >@@ -16022,7 +15935,7 @@ > > case $ac_tag in > *:-:* | *:-) cat >"$tmp/stdin" \ >- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; >+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; > esac > ;; > esac >@@ -16358,8 +16271,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, >-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, >-# Inc. >+# 2006, 2007, 2008 Free Software Foundation, Inc. > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. >@@ -16392,13 +16304,13 @@ > # ### BEGIN LIBTOOL CONFIG > > # Assembler program. >-AS=$lt_AS >+AS=$AS > > # DLL creation program. >-DLLTOOL=$lt_DLLTOOL >+DLLTOOL=$DLLTOOL > > # Object dumper program. >-OBJDUMP=$lt_OBJDUMP >+OBJDUMP=$OBJDUMP > > # Which release of libtool.m4 was used? > macro_version=$macro_version >@@ -16416,12 +16328,6 @@ > # Whether or not to optimize for fast installation. > fast_install=$enable_fast_install > >-# Shell to use when invoking shell scripts. >-SHELL=$lt_SHELL >- >-# An echo program that protects backslashes. >-ECHO=$lt_ECHO >- > # The host system. > host_alias=$host_alias > host=$host >@@ -16471,6 +16377,10 @@ > # turn newlines into spaces. > NL2SP=$lt_lt_NL2SP > >+# How to create reloadable object files. >+reload_flag=$lt_reload_flag >+reload_cmds=$lt_reload_cmds >+ > # Method to check whether dependent libraries are shared objects. > deplibs_check_method=$lt_deplibs_check_method > >@@ -16489,9 +16399,6 @@ > old_postinstall_cmds=$lt_old_postinstall_cmds > old_postuninstall_cmds=$lt_old_postuninstall_cmds > >-# Whether to use a lock for old archive extraction. >-lock_old_archive_extraction=$lock_old_archive_extraction >- > # A C compiler. > LTCC=$lt_CC > >@@ -16513,6 +16420,12 @@ > # The name of the directory that contains temporary libtool files. > objdir=$objdir > >+# Shell to use when invoking shell scripts. >+SHELL=$lt_SHELL >+ >+# An echo program that does not interpret backslashes. >+ECHO=$lt_ECHO >+ > # Used to examine libraries when file_magic_cmd begins with "file". > MAGIC_CMD=$MAGIC_CMD > >@@ -16575,9 +16488,6 @@ > # The coded name of the library, if different from the real name. > soname_spec=$lt_soname_spec > >-# Permission mode override for installation of shared libraries. >-install_override_mode=$lt_install_override_mode >- > # Command to use after installation of a shared archive. > postinstall_cmds=$lt_postinstall_cmds > >@@ -16617,10 +16527,6 @@ > # The linker used to build libraries. > LD=$lt_LD > >-# How to create reloadable object files. >-reload_flag=$lt_reload_flag >-reload_cmds=$lt_reload_cmds >- > # Commands used to build an old-style archive. > old_archive_cmds=$lt_old_archive_cmds > >@@ -16880,7 +16786,7 @@ > func_dirname () > { > # Extract subdirectory from the argument. >- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` >+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` > if test "X$func_dirname_result" = "X${1}"; then > func_dirname_result="${3}" > else >@@ -16891,7 +16797,7 @@ > # func_basename file > func_basename () > { >- func_basename_result=`$ECHO "${1}" | $SED "$basename"` >+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` > } > > >@@ -16904,8 +16810,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_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 > } > >@@ -16916,20 +16824,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"` >+ 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_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` > } > > # func_xform libobj-or-source > func_xform () > { >- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` >+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` > } > > # func_arith arithmetic-term... >--- libxml2-2.7.8.dfsg.orig/autogen.sh >+++ libxml2-2.7.8.dfsg/autogen.sh >@@ -0,0 +1,43 @@ >+#!/bin/sh >+## ---------------------------------------------------------------------- >+## autogen.sh : refresh GNU autotools toolchain for libxml2, and >+## refreshes doc/examples/index.html >+## For use in root directory of the build tree ONLY. >+## ---------------------------------------------------------------------- >+## Requires: autoconf (2.6x), automake1.11, libtool (1.5.x), xsltproc, >+## libxml2-utils >+## ---------------------------------------------------------------------- >+ >+## ---------------------------------------------------------------------- >+set -e >+ >+## ---------------------------------------------------------------------- >+libtoolize --force --copy >+ >+## ---------------------------------------------------------------------- >+aclocal-1.11 -Im4 >+ >+## ---------------------------------------------------------------------- >+autoheader >+ >+## ---------------------------------------------------------------------- >+automake-1.11 --foreign --add-missing --force-missing --copy >+ >+## ---------------------------------------------------------------------- >+autoconf >+ >+# clean up the junk that was created >+rm -rf autom4te.cache >+ >+# rebuild doc/examples/index.html >+rm -f doc/examples/index.html >+make -C doc/examples -f Makefile.am rebuild >+#cd doc/examples >+#xsltproc examples.xsl examples.xml >+#xmllint --valid --noout index.html >+#cd ../.. >+ >+## ---------------------------------------------------------------------- >+exit 0 >+ >+## ---------------------------------------------------------------------- >--- libxml2-2.7.8.dfsg.orig/Makefile.am >+++ libxml2-2.7.8.dfsg/Makefile.am >@@ -8,10 +8,10 @@ > > INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ > >-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ >- testThreads testC14N testAutomata testRegexp \ >- testReader testapi testModule runtest runsuite testchar \ >- testdict runxmlconf testrecurse >+#noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ >+# testThreads testC14N testAutomata testRegexp \ >+# testReader testapi testModule runtest runsuite testchar \ >+# testdict runxmlconf testrecurse > > bin_PROGRAMS = xmllint xmlcatalog > >@@ -157,7 +157,7 @@ > testModule_DEPENDENCIES = $(DEPS) > testModule_LDADD= $(LDADDS) > >-noinst_LTLIBRARIES = testdso.la >+#noinst_LTLIBRARIES = testdso.la > testdso_la_SOURCES = testdso.c > testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir) > >--- libxml2-2.7.8.dfsg.orig/xstc/Makefile.in >+++ libxml2-2.7.8.dfsg/xstc/Makefile.in >@@ -109,6 +109,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -255,6 +256,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -297,7 +299,7 @@ > all: all-am > > .SUFFIXES: >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -306,9 +308,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xstc/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xstc/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu xstc/Makefile >+ $(AUTOMAKE) --foreign xstc/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -322,9 +324,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > >--- libxml2-2.7.8.dfsg.orig/python/Makefile.in >+++ libxml2-2.7.8.dfsg/python/Makefile.in >@@ -202,6 +202,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -348,6 +349,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -412,7 +414,7 @@ > > .SUFFIXES: > .SUFFIXES: .c .lo .o .obj >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -437,9 +439,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > setup.py: $(top_builddir)/config.status $(srcdir)/setup.py.in >--- libxml2-2.7.8.dfsg.orig/python/tests/Makefile.in >+++ libxml2-2.7.8.dfsg/python/tests/Makefile.in >@@ -134,6 +134,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -280,6 +281,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -355,7 +357,7 @@ > all: all-am > > .SUFFIXES: >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -364,9 +366,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/tests/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign python/tests/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu python/tests/Makefile >+ $(AUTOMAKE) --foreign python/tests/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -380,9 +382,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > >--- libxml2-2.7.8.dfsg.orig/doc/Makefile.in >+++ libxml2-2.7.8.dfsg/doc/Makefile.in >@@ -174,6 +174,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -320,6 +321,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -365,7 +367,7 @@ > all: all-recursive > > .SUFFIXES: >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -374,9 +376,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu doc/Makefile >+ $(AUTOMAKE) --foreign doc/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -390,9 +392,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > >--- libxml2-2.7.8.dfsg.orig/doc/examples/index.html >+++ libxml2-2.7.8.dfsg/doc/examples/index.html >@@ -0,0 +1,14 @@ >+<?xml version="1.0" encoding="ISO-8859-1"?> >+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="SHORTCUT ICON" href="/favicon.ico" /><style type="text/css"> >+TD {font-family: Verdana,Arial,Helvetica} >+BODY {font-family: Verdana,Arial,Helvetica; margin-top: 2em; margin-left: 0em; margin-right: 0em} >+H1 {font-family: Verdana,Arial,Helvetica} >+H2 {font-family: Verdana,Arial,Helvetica} >+H3 {font-family: Verdana,Arial,Helvetica} >+A:link, A:visited, A:active { text-decoration: underline } >+</style><title>Libxml2 set of examples</title></head><body bgcolor="#8b7765" text="#000000" link="#000000" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="../epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="../gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="../w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="../redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="../Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1></h1><h2>Libxml2 set of examples</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Examples Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="../search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="../index.html">Home</a></li><li><a style="font-weight:bold" href="../docs.html">Developer Menu</a></li><li><a style="font-weight:bold" href="../html/index.html">API Menu</a></li><li><a href="#InputOutput">InputOutput Examples</a></li><li><a href="#Parsing">Parsing Examples</a></li><li><a href="#Tree">Tree Examples</a></li><li><a href="#XPath">XPath Examples</a></li><li><a href="#xmlReader">xmlReader Examples</a></li><li><a href="#xmlWriter">xmlWriter Examples</a></li><li><a href="../guidelines.html">XML Guidelines</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li><li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://opencsw.org/packages/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://codespeak.net/lxml/">lxml Python bindings</a></li><li><a href="http://cpan.uwinnipeg.ca/dist/XML-LibXML">Perl bindings</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p> The examples are stored per section depending on the main focus >+ of the example:</p><ul><li><p><a href="#xmlWriter">xmlWriter</a> :</p><ul><li><a href="#testWriter.c">testWriter.c</a>: use various APIs for the xmlWriter</li></ul></li><li><p><a href="#InputOutput">InputOutput</a> :</p><ul><li><a href="#io2.c">io2.c</a>: Output to char buffer</li><li><a href="#io1.c">io1.c</a>: Example of custom Input/Output</li></ul></li><li><p><a href="#Tree">Tree</a> :</p><ul><li><a href="#tree2.c">tree2.c</a>: Creates a tree</li><li><a href="#tree1.c">tree1.c</a>: Navigates a tree to print element names</li></ul></li><li><p><a href="#XPath">XPath</a> :</p><ul><li><a href="#xpath2.c">xpath2.c</a>: Load a document, locate subelements with XPath, modify said elements and save the resulting document.</li><li><a href="#xpath1.c">xpath1.c</a>: Evaluate XPath expression and prints result node set.</li></ul></li><li><p><a href="#Parsing">Parsing</a> :</p><ul><li><a href="#parse3.c">parse3.c</a>: Parse an XML document in memory to a tree and free it</li><li><a href="#parse4.c">parse4.c</a>: Parse an XML document chunk by chunk to a tree and free it</li><li><a href="#parse1.c">parse1.c</a>: Parse an XML file to a tree and free it</li><li><a href="#parse2.c">parse2.c</a>: Parse and validate an XML file to a tree and free the result</li></ul></li><li><p><a href="#xmlReader">xmlReader</a> :</p><ul><li><a href="#reader2.c">reader2.c</a>: Parse and validate an XML file with an xmlReader</li><li><a href="#reader1.c">reader1.c</a>: Parse an XML file with an xmlReader</li><li><a href="#reader3.c">reader3.c</a>: Show how to extract subdocuments with xmlReader</li><li><a href="#reader4.c">reader4.c</a>: Parse multiple XML files reusing an xmlReader</li></ul></li></ul><p> Getting the compilation options and libraries dependancies needed >+to generate binaries from the examples is best done on Linux/Unix by using >+the xml2-config script which should have been installed as part of <i>make >+install</i> step or when installing the libxml2 development package:</p><pre>gcc -o example `xml2-config --cflags` example.c `xml2-config --libs`</pre><h2><a name="InputOutput" id="InputOutput"></a>InputOutput Examples</h2><h3><a name="io2.c" href="io2.c" id="io2.c">io2.c</a>: Output to char buffer</h3><p>Demonstrate the use of xmlDocDumpMemory to output document to a character buffer</p><p>Includes:</p><ul><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li></ul><p>Uses:</p><ul><li> line 19: Type <a href="../html/libxml-tree.html#xmlNodePtr">xmlNodePtr</a> from tree.h</li><li> line 20: Type <a href="../html/libxml-tree.html#xmlDocPtr">xmlDocPtr</a> from tree.h</li><li> line 27: Function <a href="../html/libxml-tree.html#xmlNewDoc">xmlNewDoc</a> from tree.h</li><li> line 28: Function <a href="../html/libxml-tree.html#xmlNewNode">xmlNewNode</a> from tree.h</li><li> line 29: Function <a href="../html/libxml-tree.html#xmlNodeSetContent">xmlNodeSetContent</a> from tree.h</li><li> line 30: Function <a href="../html/libxml-tree.html#xmlDocSetRootElement">xmlDocSetRootElement</a> from tree.h</li><li> line 36: Function <a href="../html/libxml-tree.html#xmlDocDumpFormatMemory">xmlDocDumpFormatMemory</a> from tree.h</li><li> line 43: Function <a href="../html/libxml-tree.html#xmlFreeDoc">xmlFreeDoc</a> from tree.h</li></ul><p>Usage:</p><p>io2</p><p>Author: John Fleck</p><h3><a name="io1.c" href="io1.c" id="io1.c">io1.c</a>: Example of custom Input/Output</h3><p>Demonstrate the use of xmlRegisterInputCallbacks to build a custom I/O layer, this is used in an XInclude method context to show how dynamic document can be built in a clean way.</p><p>Includes:</p><ul><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li><li><a href="../html/libxml-xmlIO.html"><libxml/xmlIO.h></a></li><li><a href="../html/libxml-xinclude.html"><libxml/xinclude.h></a></li><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li></ul><p>Uses:</p><ul><li> line 117: Function <a href="../html/libxml-xmlIO.html#xmlRegisterInputCallbacks">xmlRegisterInputCallbacks</a> from xmlIO.h</li><li> line 124: Function <a href="../html/libxml-parser.html#xmlReadMemory">xmlReadMemory</a> from parser.h</li><li> line 134: Function <a href="../html/libxml-xinclude.html#xmlXIncludeProcess">xmlXIncludeProcess</a> from xinclude.h</li><li> line 143: Function <a href="../html/libxml-tree.html#xmlDocDump">xmlDocDump</a> from tree.h</li></ul><p>Usage:</p><p>io1</p><p>Author: Daniel Veillard</p><h2><a name="Parsing" id="Parsing"></a>Parsing Examples</h2><h3><a name="parse3.c" href="parse3.c" id="parse3.c">parse3.c</a>: Parse an XML document in memory to a tree and free it</h3><p>Demonstrate the use of xmlReadMemory() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree</p><p>Includes:</p><ul><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li></ul><p>Uses:</p><ul><li> line 27: Type <a href="../html/libxml-tree.html#xmlDocPtr">xmlDocPtr</a> from tree.h</li><li> line 33: Function <a href="../html/libxml-parser.html#xmlReadMemory">xmlReadMemory</a> from parser.h</li><li> line 38: Function <a href="../html/libxml-tree.html#xmlFreeDoc">xmlFreeDoc</a> from tree.h</li><li> line 49: Macro <a href="../html/libxml-xmlversion.html#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a> from xmlversion.h</li><li> line 54: Function <a href="../html/libxml-parser.html#xmlCleanupParser">xmlCleanupParser</a> from parser.h</li><li> line 58: Function <a href="../html/libxml-xmlmemory.html#xmlMemoryDump">xmlMemoryDump</a> from xmlmemory.h</li></ul><p>Usage:</p><p>parse3</p><p>Author: Daniel Veillard</p><h3><a name="parse4.c" href="parse4.c" id="parse4.c">parse4.c</a>: Parse an XML document chunk by chunk to a tree and free it</h3><p>Demonstrate the use of xmlCreatePushParserCtxt() and xmlParseChunk() to read an XML file progressively into a tree and and xmlFreeDoc() to free the resulting tree</p><p>Includes:</p><ul><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li></ul><p>Uses:</p><ul><li> line 45: Type <a href="../html/libxml-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> from tree.h</li><li> line 47: Type <a href="../html/libxml-tree.html#xmlDocPtr">xmlDocPtr</a> from tree.h</li><li> line 67: Function <a href="../html/libxml-parser.html#xmlCreatePushParserCtxt">xmlCreatePushParserCtxt</a> from parser.h</li><li> line 86: Function <a href="../html/libxml-parser.html#xmlParseChunk">xmlParseChunk</a> from parser.h</li><li> line 94: Function <a href="../html/libxml-parser.html#xmlFreeParserCtxt">xmlFreeParserCtxt</a> from parser.h</li></ul><p>Usage:</p><p>parse4 test3.xml</p><p>Author: Daniel Veillard</p><h3><a name="parse1.c" href="parse1.c" id="parse1.c">parse1.c</a>: Parse an XML file to a tree and free it</h3><p>Demonstrate the use of xmlReadFile() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree</p><p>Includes:</p><ul><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li><li><a href="../html/libxml-xpath.html"><libxml/xpath.h></a></li><li><a href="../html/libxml-xpathInternals.html"><libxml/xpathInternals.h></a></li><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li></ul><p>Uses:</p><ul><li> line 26: Function <a href="../html/libxml-parser.html#xmlReadFile">xmlReadFile</a> from parser.h</li></ul><p>Usage:</p><p>parse1 test1.xml</p><p>Author: Daniel Veillard</p><h3><a name="parse2.c" href="parse2.c" id="parse2.c">parse2.c</a>: Parse and validate an XML file to a tree and free the result</h3><p>Create a parser context for an XML file, then parse and validate the file, creating a tree, check the validation result and xmlFreeDoc() to free the resulting tree.</p><p>Includes:</p><ul><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li></ul><p>Uses:</p><ul><li> line 25: Type <a href="../html/libxml-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> from tree.h</li><li> line 29: Function <a href="../html/libxml-parser.html#xmlNewParserCtxt">xmlNewParserCtxt</a> from parser.h</li><li> line 35: Function <a href="../html/libxml-parser.html#xmlCtxtReadFile">xmlCtxtReadFile</a> from parser.h</li><li> line 47: Function <a href="../html/libxml-parser.html#xmlFreeParserCtxt">xmlFreeParserCtxt</a> from parser.h</li></ul><p>Usage:</p><p>parse2 test2.xml</p><p>Author: Daniel Veillard</p><h2><a name="Tree" id="Tree"></a>Tree Examples</h2><h3><a name="tree2.c" href="tree2.c" id="tree2.c">tree2.c</a>: Creates a tree</h3><p>Shows how to create document, nodes and dump it to stdout or file.</p><p>Includes:</p><ul><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li></ul><p>Uses:</p><ul><li> line 34: Macro <a href="../html/libxml-xmlversion.html#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a> from xmlversion.h</li><li> line 39: Function <a href="../html/libxml-tree.html#xmlNewDoc">xmlNewDoc</a> from tree.h</li><li> line 41: Function <a href="../html/libxml-tree.html#xmlDocSetRootElement">xmlDocSetRootElement</a> from tree.h</li><li> line 46: Function <a href="../html/libxml-tree.html#xmlCreateIntSubset">xmlCreateIntSubset</a> from tree.h</li><li> line 74: Function <a href="../html/libxml-tree.html#xmlNewNode">xmlNewNode</a> from tree.h</li><li> line 75: Function <a href="../html/libxml-tree.html#xmlNewText">xmlNewText</a> from tree.h</li><li> line 78: Function <a href="../html/libxml-tree.html#xmlAddChild">xmlAddChild</a> from tree.h</li><li> line 88: Function <a href="../html/libxml-tree.html#xmlNewChild">xmlNewChild</a> from tree.h</li><li> line 89: Function <a href="../html/libxml-tree.html#xmlNewProp">xmlNewProp</a> from tree.h</li><li> line 96: Function <a href="../html/libxml-tree.html#xmlSaveFormatFileEnc">xmlSaveFormatFileEnc</a> from tree.h</li><li> line 99: Function <a href="../html/libxml-tree.html#xmlFreeDoc">xmlFreeDoc</a> from tree.h</li><li> line 105: Function <a href="../html/libxml-parser.html#xmlCleanupParser">xmlCleanupParser</a> from parser.h</li><li> line 110: Function <a href="../html/libxml-xmlmemory.html#xmlMemoryDump">xmlMemoryDump</a> from xmlmemory.h</li></ul><p>Usage:</p><p>tree2 <filename> -Default output: stdout</p><p>Author: Lucas Brasilino <brasilino@recife.pe.gov.br></p><h3><a name="tree1.c" href="tree1.c" id="tree1.c">tree1.c</a>: Navigates a tree to print element names</h3><p>Parse a file to a tree, use xmlDocGetRootElement() to get the root element, then walk the document and print all the element name in document order.</p><p>Includes:</p><ul><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li></ul><p>Uses:</p><ul><li> line 67: Function <a href="../html/libxml-parser.html#xmlReadFile">xmlReadFile</a> from parser.h</li><li> line 74: Function <a href="../html/libxml-tree.html#xmlDocGetRootElement">xmlDocGetRootElement</a> from tree.h</li></ul><p>Usage:</p><p>tree1 filename_or_URL</p><p>Author: Dodji Seketeli</p><h2><a name="XPath" id="XPath"></a>XPath Examples</h2><h3><a name="xpath2.c" href="xpath2.c" id="xpath2.c">xpath2.c</a>: Load a document, locate subelements with XPath, modify said elements and save the resulting document.</h3><p>Shows how to make a full round-trip from a load/edit/save</p><p>Includes:</p><ul><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li><li><a href="../html/libxml-xpath.html"><libxml/xpath.h></a></li><li><a href="../html/libxml-xpathInternals.html"><libxml/xpathInternals.h></a></li><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li></ul><p>Uses:</p><ul><li> line 41: Function <a href="../html/libxml-parser.html#xmlInitParser">xmlInitParser</a> from parser.h</li><li> line 45: Macro <a href="../html/libxml-xmlversion.html#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a> from xmlversion.h</li><li> line 51: Function <a href="../html/libxml-parser.html#xmlCleanupParser">xmlCleanupParser</a> from parser.h</li><li> line 56: Function <a href="../html/libxml-xmlmemory.html#xmlMemoryDump">xmlMemoryDump</a> from xmlmemory.h</li><li> line 86: Type <a href="../html/libxml-tree.html#xmlDocPtr">xmlDocPtr</a> from tree.h</li><li> line 87: Type <a href="../html/libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> from xpath.h</li><li> line 88: Type <a href="../html/libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> from xpath.h</li><li> line 95: Function <a href="../html/libxml-parser.html#xmlParseFile">xmlParseFile</a> from parser.h</li><li> line 102: Function <a href="../html/libxml-xpath.html#xmlXPathNewContext">xmlXPathNewContext</a> from xpath.h</li><li> line 110: Function <a href="../html/libxml-xpath.html#xmlXPathEvalExpression">xmlXPathEvalExpression</a> from xpath.h</li><li> line 123: Function <a href="../html/libxml-xpath.html#xmlXPathFreeObject">xmlXPathFreeObject</a> from xpath.h</li><li> line 124: Function <a href="../html/libxml-xpath.html#xmlXPathFreeContext">xmlXPathFreeContext</a> from xpath.h</li><li> line 127: Function <a href="../html/libxml-tree.html#xmlDocDump">xmlDocDump</a> from tree.h</li><li> line 131: Function <a href="../html/libxml-tree.html#xmlFreeDoc">xmlFreeDoc</a> from tree.h</li><li> line 162: Function <a href="../html/libxml-tree.html#xmlNodeSetContent">xmlNodeSetContent</a> from tree.h</li></ul><p>Usage:</p><p>xpath2 <xml-file> <xpath-expr> <new-value></p><p>Author: Aleksey Sanin and Daniel Veillard</p><h3><a name="xpath1.c" href="xpath1.c" id="xpath1.c">xpath1.c</a>: Evaluate XPath expression and prints result node set.</h3><p>Shows how to evaluate XPath expression and register known namespaces in XPath context.</p><p>Includes:</p><ul><li><a href="../html/libxml-parser.html"><libxml/parser.h></a></li><li><a href="../html/libxml-xpath.html"><libxml/xpath.h></a></li><li><a href="../html/libxml-xpathInternals.html"><libxml/xpathInternals.h></a></li><li><a href="../html/libxml-tree.html"><libxml/tree.h></a></li></ul><p>Uses:</p><ul><li> line 39: Function <a href="../html/libxml-parser.html#xmlInitParser">xmlInitParser</a> from parser.h</li><li> line 43: Macro <a href="../html/libxml-xmlversion.html#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a> from xmlversion.h</li><li> line 49: Function <a href="../html/libxml-parser.html#xmlCleanupParser">xmlCleanupParser</a> from parser.h</li><li> line 54: Function <a href="../html/libxml-xmlmemory.html#xmlMemoryDump">xmlMemoryDump</a> from xmlmemory.h</li><li> line 86: Type <a href="../html/libxml-tree.html#xmlDocPtr">xmlDocPtr</a> from tree.h</li><li> line 87: Type <a href="../html/libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> from xpath.h</li><li> line 88: Type <a href="../html/libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> from xpath.h</li><li> line 94: Function <a href="../html/libxml-parser.html#xmlParseFile">xmlParseFile</a> from parser.h</li><li> line 101: Function <a href="../html/libxml-xpath.html#xmlXPathNewContext">xmlXPathNewContext</a> from xpath.h</li><li> line 117: Function <a href="../html/libxml-xpath.html#xmlXPathEvalExpression">xmlXPathEvalExpression</a> from xpath.h</li><li> line 129: Function <a href="../html/libxml-xpath.html#xmlXPathFreeObject">xmlXPathFreeObject</a> from xpath.h</li><li> line 130: Function <a href="../html/libxml-xpath.html#xmlXPathFreeContext">xmlXPathFreeContext</a> from xpath.h</li><li> line 131: Function <a href="../html/libxml-tree.html#xmlFreeDoc">xmlFreeDoc</a> from tree.h</li><li> line 156: Function <a href="../html/libxml-xmlstring.html#xmlStrdup">xmlStrdup</a> from xmlstring.h</li><li> line 180: Function <a href="../html/libxml-xmlstring.html#xmlStrchr">xmlStrchr</a> from xmlstring.h</li><li> line 186: Function <a href="../html/libxml-xpathInternals.html#xmlXPathRegisterNs">xmlXPathRegisterNs</a> from xpathInternals.h</li><li> line 206: Type <a href="../html/libxml-tree.html#xmlNodePtr">xmlNodePtr</a> from tree.h</li><li> line 218: Type <a href="../html/libxml-tree.html#xmlNsPtr">xmlNsPtr</a> from tree.h</li></ul><p>Usage:</p><p>xpath1 <xml-file> <xpath-expr> [<known-ns-list>]</p><p>Author: Aleksey Sanin</p><h2><a name="xmlReader" id="xmlReader"></a>xmlReader Examples</h2><h3><a name="reader2.c" href="reader2.c" id="reader2.c">reader2.c</a>: Parse and validate an XML file with an xmlReader</h3><p>Demonstrate the use of xmlReaderForFile() to parse an XML file validating the content in the process and activating options like entities substitution, and DTD attributes defaulting. (Note that the XMLReader functions require libxml2 version later than 2.6.)</p><p>Includes:</p><ul><li><a href="../html/libxml-xmlreader.html"><libxml/xmlreader.h></a></li></ul><p>Uses:</p><ul><li> line 30: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderConstName">xmlTextReaderConstName</a> from xmlreader.h</li><li> line 34: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderConstValue">xmlTextReaderConstValue</a> from xmlreader.h</li><li> line 37: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderDepth">xmlTextReaderDepth</a> from xmlreader.h</li><li> line 38: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderNodeType">xmlTextReaderNodeType</a> from xmlreader.h</li><li> line 40: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderIsEmptyElement">xmlTextReaderIsEmptyElement</a> from xmlreader.h</li><li> line 41: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderHasValue">xmlTextReaderHasValue</a> from xmlreader.h</li><li> line 45: Function <a href="../html/libxml-xmlstring.html#xmlStrlen">xmlStrlen</a> from xmlstring.h</li><li> line 60: Type <a href="../html/libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> from xmlreader.h</li><li> line 68: Function <a href="../html/libxml-xmlreader.html#xmlReaderForFile">xmlReaderForFile</a> from xmlreader.h</li><li> line 76: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderRead">xmlTextReaderRead</a> from xmlreader.h</li><li> line 81: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderIsValid">xmlTextReaderIsValid</a> from xmlreader.h</li><li> line 84: Function <a href="../html/libxml-xmlreader.html#xmlFreeTextReader">xmlFreeTextReader</a> from xmlreader.h</li><li> line 104: Macro <a href="../html/libxml-xmlversion.html#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a> from xmlversion.h</li><li> line 109: Function <a href="../html/libxml-parser.html#xmlCleanupParser">xmlCleanupParser</a> from parser.h</li><li> line 113: Function <a href="../html/libxml-xmlmemory.html#xmlMemoryDump">xmlMemoryDump</a> from xmlmemory.h</li></ul><p>Usage:</p><p>reader2 <valid_xml_filename></p><p>Author: Daniel Veillard</p><h3><a name="reader1.c" href="reader1.c" id="reader1.c">reader1.c</a>: Parse an XML file with an xmlReader</h3><p>Demonstrate the use of xmlReaderForFile() to parse an XML file and dump the informations about the nodes found in the process. (Note that the XMLReader functions require libxml2 version later than 2.6.)</p><p>Includes:</p><ul><li><a href="../html/libxml-xmlreader.html"><libxml/xmlreader.h></a></li></ul><p>Uses:</p><ul><li> line 29: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderConstName">xmlTextReaderConstName</a> from xmlreader.h</li><li> line 33: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderConstValue">xmlTextReaderConstValue</a> from xmlreader.h</li><li> line 36: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderDepth">xmlTextReaderDepth</a> from xmlreader.h</li><li> line 37: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderNodeType">xmlTextReaderNodeType</a> from xmlreader.h</li><li> line 39: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderIsEmptyElement">xmlTextReaderIsEmptyElement</a> from xmlreader.h</li><li> line 40: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderHasValue">xmlTextReaderHasValue</a> from xmlreader.h</li><li> line 44: Function <a href="../html/libxml-xmlstring.html#xmlStrlen">xmlStrlen</a> from xmlstring.h</li><li> line 59: Type <a href="../html/libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> from xmlreader.h</li><li> line 62: Function <a href="../html/libxml-xmlreader.html#xmlReaderForFile">xmlReaderForFile</a> from xmlreader.h</li><li> line 67: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderRead">xmlTextReaderRead</a> from xmlreader.h</li><li> line 69: Function <a href="../html/libxml-xmlreader.html#xmlFreeTextReader">xmlFreeTextReader</a> from xmlreader.h</li><li> line 89: Macro <a href="../html/libxml-xmlversion.html#LIBXML_TEST_VERSION">LIBXML_TEST_VERSION</a> from xmlversion.h</li><li> line 94: Function <a href="../html/libxml-parser.html#xmlCleanupParser">xmlCleanupParser</a> from parser.h</li><li> line 98: Function <a href="../html/libxml-xmlmemory.html#xmlMemoryDump">xmlMemoryDump</a> from xmlmemory.h</li></ul><p>Usage:</p><p>reader1 <filename></p><p>Author: Daniel Veillard</p><h3><a name="reader3.c" href="reader3.c" id="reader3.c">reader3.c</a>: Show how to extract subdocuments with xmlReader</h3><p>Demonstrate the use of xmlTextReaderPreservePattern() to parse an XML file with the xmlReader while collecting only some subparts of the document. (Note that the XMLReader functions require libxml2 version later than 2.6.)</p><p>Includes:</p><ul><li><a href="../html/libxml-xmlreader.html"><libxml/xmlreader.h></a></li></ul><p>Uses:</p><ul><li> line 32: Type <a href="../html/libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> from xmlreader.h</li><li> line 38: Function <a href="../html/libxml-xmlreader.html#xmlReaderForFile">xmlReaderForFile</a> from xmlreader.h</li><li> line 43: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderPreservePattern">xmlTextReaderPreservePattern</a> from xmlreader.h</li><li> line 52: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderRead">xmlTextReaderRead</a> from xmlreader.h</li><li> line 62: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderCurrentDoc">xmlTextReaderCurrentDoc</a> from xmlreader.h</li><li> line 66: Function <a href="../html/libxml-xmlreader.html#xmlFreeTextReader">xmlFreeTextReader</a> from xmlreader.h</li><li> line 96: Function <a href="../html/libxml-tree.html#xmlDocDump">xmlDocDump</a> from tree.h</li></ul><p>Usage:</p><p>reader3</p><p>Author: Daniel Veillard</p><h3><a name="reader4.c" href="reader4.c" id="reader4.c">reader4.c</a>: Parse multiple XML files reusing an xmlReader</h3><p>Demonstrate the use of xmlReaderForFile() and xmlReaderNewFile to parse XML files while reusing the reader object and parser context. (Note that the XMLReader functions require libxml2 version later than 2.6.)</p><p>Includes:</p><ul><li><a href="../html/libxml-xmlreader.html"><libxml/xmlreader.h></a></li></ul><p>Uses:</p><ul><li> line 26: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderRead">xmlTextReaderRead</a> from xmlreader.h</li><li> line 54: Type <a href="../html/libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> from xmlreader.h</li><li> line 72: Function <a href="../html/libxml-xmlreader.html#xmlReaderForFile">xmlReaderForFile</a> from xmlreader.h</li><li> line 83: Function <a href="../html/libxml-xmlreader.html#xmlReaderNewFile">xmlReaderNewFile</a> from xmlreader.h</li><li> line 97: Function <a href="../html/libxml-xmlreader.html#xmlTextReaderCurrentDoc">xmlTextReaderCurrentDoc</a> from xmlreader.h</li><li> line 104: Function <a href="../html/libxml-xmlreader.html#xmlFreeTextReader">xmlFreeTextReader</a> from xmlreader.h</li></ul><p>Usage:</p><p>reader4 <filename> [ filename ... ]</p><p>Author: Graham Bennett</p><h2><a name="xmlWriter" id="xmlWriter"></a>xmlWriter Examples</h2><h3><a name="testWriter.c" href="testWriter.c" id="testWriter.c">testWriter.c</a>: use various APIs for the xmlWriter</h3><p>tests a number of APIs for the xmlWriter, especially the various methods to write to a filename, to a memory buffer, to a new document, or to a subtree. It shows how to do encoding string conversions too. The resulting documents are then serialized.</p><p>Includes:</p><ul><li><a href="../html/libxml-encoding.html"><libxml/encoding.h></a></li><li><a href="../html/libxml-xmlwriter.html"><libxml/xmlwriter.h></a></li></ul><p>Uses:</p><ul><li> line 76: Function <a href="../html/libxml-xmlwriter.html#xmlNewTextWriterFilename">xmlNewTextWriterFilename</a> from xmlwriter.h</li><li> line 341: Type <a href="../html/libxml-tree.html#xmlBufferPtr">xmlBufferPtr</a> from tree.h</li><li> line 347: Function <a href="../html/libxml-tree.html#xmlBufferCreate">xmlBufferCreate</a> from tree.h</li><li> line 355: Function <a href="../html/libxml-xmlwriter.html#xmlNewTextWriterMemory">xmlNewTextWriterMemory</a> from xmlwriter.h</li><li> line 613: Function <a href="../html/libxml-tree.html#xmlBufferFree">xmlBufferFree</a> from tree.h</li><li> line 632: Function <a href="../html/libxml-xmlwriter.html#xmlNewTextWriterDoc">xmlNewTextWriterDoc</a> from xmlwriter.h</li><li> line 878: Type <a href="../html/libxml-xmlwriter.html#xmlTextWriterPtr">xmlTextWriterPtr</a> from xmlwriter.h</li><li> line 879: Type <a href="../html/libxml-tree.html#xmlDocPtr">xmlDocPtr</a> from tree.h</li><li> line 880: Type <a href="../html/libxml-tree.html#xmlNodePtr">xmlNodePtr</a> from tree.h</li><li> line 885: Macro <a href="../html/libxml-parser.html#XML_DEFAULT_VERSION">XML_DEFAULT_VERSION</a> from parser.h</li><li> line 885: Function <a href="../html/libxml-tree.html#xmlNewDoc">xmlNewDoc</a> from tree.h</li><li> line 894: Function <a href="../html/libxml-tree.html#xmlNewDocNode">xmlNewDocNode</a> from tree.h</li><li> line 901: Function <a href="../html/libxml-tree.html#xmlDocSetRootElement">xmlDocSetRootElement</a> from tree.h</li><li> line 904: Function <a href="../html/libxml-xmlwriter.html#xmlNewTextWriterTree">xmlNewTextWriterTree</a> from xmlwriter.h</li><li> line 913: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterStartDocument">xmlTextWriterStartDocument</a> from xmlwriter.h</li><li> line 925: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterWriteComment">xmlTextWriterWriteComment</a> from xmlwriter.h</li><li> line 949: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterWriteAttribute">xmlTextWriterWriteAttribute</a> from xmlwriter.h</li><li> line 959: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterWriteFormatComment">xmlTextWriterWriteFormatComment</a> from xmlwriter.h</li><li> line 1073: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterWriteFormatElement">xmlTextWriterWriteFormatElement</a> from xmlwriter.h</li><li> line 1096: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterStartElement">xmlTextWriterStartElement</a> from xmlwriter.h</li><li> line 1103: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterWriteElement">xmlTextWriterWriteElement</a> from xmlwriter.h</li><li> line 1111: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterEndElement">xmlTextWriterEndElement</a> from xmlwriter.h</li><li> line 1121: Function <a href="../html/libxml-xmlwriter.html#xmlTextWriterEndDocument">xmlTextWriterEndDocument</a> from xmlwriter.h</li><li> line 1127: Function <a href="../html/libxml-xmlwriter.html#xmlFreeTextWriter">xmlFreeTextWriter</a> from xmlwriter.h</li><li> line 1129: Function <a href="../html/libxml-tree.html#xmlSaveFileEnc">xmlSaveFileEnc</a> from tree.h</li><li> line 1131: Function <a href="../html/libxml-tree.html#xmlFreeDoc">xmlFreeDoc</a> from tree.h</li><li> line 1151: Type <a href="../html/libxml-encoding.html#xmlCharEncodingHandlerPtr">xmlCharEncodingHandlerPtr</a> from encoding.h</li><li> line 1156: Function <a href="../html/libxml-encoding.html#xmlFindCharEncodingHandler">xmlFindCharEncodingHandler</a> from encoding.h</li></ul><p>Usage:</p><p>testWriter</p><p>Author: Alfred Mickautsch</p><p><a href="../bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> >--- libxml2-2.7.8.dfsg.orig/doc/examples/examples.xml >+++ libxml2-2.7.8.dfsg/doc/examples/examples.xml >@@ -321,6 +321,9 @@ > <includes> > <include><libxml/tree.h></include> > <include><libxml/parser.h></include> >+ <include><libxml/xpath.h></include> >+ <include><libxml/xpathInternals.h></include> >+ <include><libxml/tree.h></include> > </includes> > <uses> > <function line='26' file='parser' name='xmlReadFile'/> >--- libxml2-2.7.8.dfsg.orig/doc/examples/Makefile.in >+++ libxml2-2.7.8.dfsg/doc/examples/Makefile.in >@@ -216,6 +216,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -362,6 +363,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -448,7 +450,7 @@ > > .SUFFIXES: > .SUFFIXES: .c .lo .o .obj >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -457,9 +459,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/examples/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/examples/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu doc/examples/Makefile >+ $(AUTOMAKE) --foreign doc/examples/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -473,9 +475,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > >--- libxml2-2.7.8.dfsg.orig/doc/devhelp/Makefile.in >+++ libxml2-2.7.8.dfsg/doc/devhelp/Makefile.in >@@ -109,6 +109,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -255,6 +256,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -333,7 +335,7 @@ > all: all-am > > .SUFFIXES: >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -342,9 +344,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/devhelp/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/devhelp/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu doc/devhelp/Makefile >+ $(AUTOMAKE) --foreign doc/devhelp/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -358,9 +360,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > >--- libxml2-2.7.8.dfsg.orig/include/Makefile.in >+++ libxml2-2.7.8.dfsg/include/Makefile.in >@@ -149,6 +149,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -295,6 +296,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -316,7 +318,7 @@ > all: all-recursive > > .SUFFIXES: >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -325,9 +327,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu include/Makefile >+ $(AUTOMAKE) --foreign include/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -341,9 +343,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > >--- libxml2-2.7.8.dfsg.orig/include/libxml/Makefile.in >+++ libxml2-2.7.8.dfsg/include/libxml/Makefile.in >@@ -136,6 +136,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -282,6 +283,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -352,7 +354,7 @@ > all: all-am > > .SUFFIXES: >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -361,9 +363,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/libxml/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/libxml/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu include/libxml/Makefile >+ $(AUTOMAKE) --foreign include/libxml/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -377,9 +379,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > xmlversion.h: $(top_builddir)/config.status $(srcdir)/xmlversion.h.in >--- libxml2-2.7.8.dfsg.orig/m4/lt~obsolete.m4 >+++ libxml2-2.7.8.dfsg/m4/lt~obsolete.m4 >@@ -1,13 +1,13 @@ > # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- > # >-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. >+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. > # Written by Scott James Remnant, 2004. > # > # This file is free software; the Free Software Foundation gives > # unlimited permission to copy and/or distribute it, with or without > # modifications, as long as this notice is preserved. > >-# serial 5 lt~obsolete.m4 >+# serial 4 lt~obsolete.m4 > > # These exist entirely to fool aclocal when bootstrapping libtool. > # >@@ -77,6 +77,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])]) >+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) > 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])]) >@@ -89,10 +90,3 @@ > 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])]) >-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) >-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) >-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) >-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) >-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) >-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) >-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) >--- libxml2-2.7.8.dfsg.orig/m4/libtool.m4 >+++ libxml2-2.7.8.dfsg/m4/libtool.m4 >@@ -1,8 +1,7 @@ > # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- > # > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, >-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, >-# Inc. >+# 2006, 2007, 2008 Free Software Foundation, Inc. > # Written by Gordon Matzigkeit, 1996 > # > # This file is free software; the Free Software Foundation gives >@@ -11,8 +10,7 @@ > > m4_define([_LT_COPYING], [dnl > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, >-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, >-# Inc. >+# 2006, 2007, 2008 Free Software Foundation, Inc. > # Written by Gordon Matzigkeit, 1996 > # > # This file is part of GNU Libtool. >@@ -39,7 +37,7 @@ > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > ]) > >-# serial 57 LT_INIT >+# serial 56 LT_INIT > > > # LT_PREREQ(VERSION) >@@ -68,7 +66,6 @@ > # ------------------ > AC_DEFUN([LT_INIT], > [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT >-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl > AC_BEFORE([$0], [LT_LANG])dnl > AC_BEFORE([$0], [LT_OUTPUT])dnl > AC_BEFORE([$0], [LTDL_INIT])dnl >@@ -85,8 +82,6 @@ > AC_REQUIRE([LTOBSOLETE_VERSION])dnl > m4_require([_LT_PROG_LTMAIN])dnl > >-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) >- > dnl Parse OPTIONS > _LT_SET_OPTIONS([$0], [$1]) > >@@ -123,7 +118,7 @@ > *) break;; > esac > done >-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` >+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` > ]) > > >@@ -143,9 +138,6 @@ > m4_defun([_LT_SETUP], > [AC_REQUIRE([AC_CANONICAL_HOST])dnl > AC_REQUIRE([AC_CANONICAL_BUILD])dnl >-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl >-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl >- > _LT_DECL([], [host_alias], [0], [The host system])dnl > _LT_DECL([], [host], [0])dnl > _LT_DECL([], [host_os], [0])dnl >@@ -187,6 +179,7 @@ > _LT_CHECK_OBJDIR > > m4_require([_LT_TAG_COMPILER])dnl >+_LT_PROG_ECHO_BACKSLASH > > case $host_os in > aix3*) >@@ -200,6 +193,23 @@ > ;; > esac > >+# Sed substitution that helps us do robust quoting. It backslashifies >+# metacharacters that are still active within double-quoted strings. >+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' >+ >+# Same as above, but do not quote variable references. >+double_quote_subst='s/\([["`\\]]\)/\\\1/g' >+ >+# Sed substitution to delay expansion of an escaped shell variable in a >+# double_quote_subst'ed string. >+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' >+ >+# Sed substitution to delay expansion of an escaped single quote. >+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' >+ >+# Sed substitution to avoid accidental globbing in evaled expressions >+no_glob_subst='s/\*/\\\*/g' >+ > # Global variables: > ofile=libtool > can_build_shared=yes >@@ -240,28 +250,6 @@ > ])# _LT_SETUP > > >-# _LT_PREPARE_SED_QUOTE_VARS >-# -------------------------- >-# Define a few sed substitution that help us do robust quoting. >-m4_defun([_LT_PREPARE_SED_QUOTE_VARS], >-[# Backslashify metacharacters that are still active within >-# double-quoted strings. >-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' >- >-# Same as above, but do not quote variable references. >-double_quote_subst='s/\([["`\\]]\)/\\\1/g' >- >-# Sed substitution to delay expansion of an escaped shell variable in a >-# double_quote_subst'ed string. >-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' >- >-# Sed substitution to delay expansion of an escaped single quote. >-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' >- >-# Sed substitution to avoid accidental globbing in evaled expressions >-no_glob_subst='s/\*/\\\*/g' >-]) >- > # _LT_PROG_LTMAIN > # --------------- > # Note that this code is called both from `configure', and `config.status' >@@ -420,7 +408,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], >-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) >+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) > > > # _LT_CONFIG_STATUS_DECLARATIONS >@@ -430,7 +418,7 @@ > # embedded single quotes properly. In configure, this macro expands > # each variable declared with _LT_DECL (and _LT_TAGDECL) into: > # >-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' >+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' > m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], > [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), > [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) >@@ -529,20 +517,12 @@ > LTCFLAGS='$LTCFLAGS' > compiler='$compiler_DEFAULT' > >-# A function that is used when there is no print builtin or printf. >-func_fallback_echo () >-{ >- eval 'cat <<_LTECHO_EOF >-\$[]1 >-_LTECHO_EOF' >-} >- > # Quote evaled strings. > for var in lt_decl_all_varnames([[ \ > ]], lt_decl_quote_varnames); do >- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in >+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in > *[[\\\\\\\`\\"\\\$]]*) >- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" >+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" > ;; > *) > eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" >@@ -553,9 +533,9 @@ > # Double-quote double-evaled strings. > for var in lt_decl_all_varnames([[ \ > ]], lt_decl_dquote_varnames); do >- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in >+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in > *[[\\\\\\\`\\"\\\$]]*) >- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" >+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" > ;; > *) > eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" >@@ -563,38 +543,16 @@ > esac > done > >+# Fix-up fallback echo if it was mangled by the above quoting rules. >+case \$lt_ECHO in >+*'\\\[$]0 --fallback-echo"')dnl " >+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` >+ ;; >+esac >+ > _LT_OUTPUT_LIBTOOL_INIT > ]) > >-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) >-# ------------------------------------ >-# Generate a child script FILE with all initialization necessary to >-# reuse the environment learned by the parent script, and make the >-# file executable. If COMMENT is supplied, it is inserted after the >-# `#!' sequence but before initialization text begins. After this >-# macro, additional text can be appended to FILE to form the body of >-# the child script. The macro ends with non-zero status if the >-# file could not be fully written (such as if the disk is full). >-m4_ifdef([AS_INIT_GENERATED], >-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], >-[m4_defun([_LT_GENERATED_FILE_INIT], >-[m4_require([AS_PREPARE])]dnl >-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl >-[lt_write_fail=0 >-cat >$1 <<_ASEOF || lt_write_fail=1 >-#! $SHELL >-# Generated by $as_me. >-$2 >-SHELL=\${CONFIG_SHELL-$SHELL} >-export SHELL >-_ASEOF >-cat >>$1 <<\_ASEOF || lt_write_fail=1 >-AS_SHELL_SANITIZE >-_AS_PREPARE >-exec AS_MESSAGE_FD>&1 >-_ASEOF >-test $lt_write_fail = 0 && chmod +x $1[]dnl >-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT > > # LT_OUTPUT > # --------- >@@ -604,11 +562,20 @@ > AC_DEFUN([LT_OUTPUT], > [: ${CONFIG_LT=./config.lt} > AC_MSG_NOTICE([creating $CONFIG_LT]) >-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], >-[# Run this file to recreate a libtool stub with the current configuration.]) >+cat >"$CONFIG_LT" <<_LTEOF >+#! $SHELL >+# Generated by $as_me. >+# Run this file to recreate a libtool stub with the current configuration. > >-cat >>"$CONFIG_LT" <<\_LTEOF > lt_cl_silent=false >+SHELL=\${CONFIG_SHELL-$SHELL} >+_LTEOF >+ >+cat >>"$CONFIG_LT" <<\_LTEOF >+AS_SHELL_SANITIZE >+_AS_PREPARE >+ >+exec AS_MESSAGE_FD>&1 > exec AS_MESSAGE_LOG_FD>>config.log > { > echo >@@ -634,7 +601,7 @@ > m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) > configured by $[0], generated by m4_PACKAGE_STRING. > >-Copyright (C) 2010 Free Software Foundation, Inc. >+Copyright (C) 2008 Free Software Foundation, Inc. > This config.lt script is free software; the Free Software Foundation > gives unlimited permision to copy, distribute and modify it." > >@@ -679,13 +646,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. >-lt_cl_success=: >-test "$silent" = yes && >- lt_config_lt_args="$lt_config_lt_args --quiet" >-exec AS_MESSAGE_LOG_FD>/dev/null >-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false >-exec AS_MESSAGE_LOG_FD>>config.log >-$lt_cl_success || AS_EXIT(1) >+if test "$no_create" != yes; then >+ lt_cl_success=: >+ test "$silent" = yes && >+ lt_config_lt_args="$lt_config_lt_args --quiet" >+ exec AS_MESSAGE_LOG_FD>/dev/null >+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false >+ exec AS_MESSAGE_LOG_FD>>config.log >+ $lt_cl_success || AS_EXIT(1) >+fi > ])# LT_OUTPUT > > >@@ -862,13 +831,11 @@ > AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) > AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) > AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) >-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) > dnl aclocal-1.4 backwards compatibility: > dnl AC_DEFUN([AC_LIBTOOL_CXX], []) > dnl AC_DEFUN([AC_LIBTOOL_F77], []) > dnl AC_DEFUN([AC_LIBTOOL_FC], []) > dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) >-dnl AC_DEFUN([AC_LIBTOOL_RC], []) > > > # _LT_TAG_COMPILER >@@ -973,31 +940,6 @@ > [lt_cv_ld_exported_symbols_list=no]) > LDFLAGS="$save_LDFLAGS" > ]) >- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], >- [lt_cv_ld_force_load=no >- cat > conftest.c << _LT_EOF >-int forced_loaded() { return 2;} >-_LT_EOF >- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD >- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD >- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD >- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD >- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD >- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD >- cat > conftest.c << _LT_EOF >-int main() { return 0;} >-_LT_EOF >- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD >- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err >- _lt_result=$? >- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then >- lt_cv_ld_force_load=yes >- else >- cat conftest.err >&AS_MESSAGE_LOG_FD >- fi >- rm -f conftest.err libconftest.a conftest conftest.c >- rm -rf conftest.dSYM >- ]) > case $host_os in > rhapsody* | darwin1.[[012]]) > _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; >@@ -1025,7 +967,7 @@ > else > _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' > fi >- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then >+ if test "$DSYMUTIL" != ":"; then > _lt_dsymutil='~$DSYMUTIL $lib || :' > else > _lt_dsymutil= >@@ -1045,11 +987,7 @@ > _LT_TAGVAR(hardcode_direct, $1)=no > _LT_TAGVAR(hardcode_automatic, $1)=yes > _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported >- if test "$lt_cv_ld_force_load" = "yes"; then >- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' >- else >- _LT_TAGVAR(whole_archive_flag_spec, $1)='' >- fi >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='' > _LT_TAGVAR(link_all_deplibs, $1)=yes > _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" > case $cc_basename in >@@ -1057,7 +995,7 @@ > *) _lt_dar_can_shared=$GCC ;; > esac > if test "$_lt_dar_can_shared" = "yes"; then >- output_verbose_link_cmd=func_echo_all >+ output_verbose_link_cmd=echo > _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}" >@@ -1103,65 +1041,170 @@ > # _LT_SHELL_INIT(ARG) > # ------------------- > m4_define([_LT_SHELL_INIT], >-[m4_divert_text([M4SH-INIT], [$1 >-])])# _LT_SHELL_INIT >- >+[ifdef([AC_DIVERSION_NOTICE], >+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], >+ [AC_DIVERT_PUSH(NOTICE)]) >+$1 >+AC_DIVERT_POP >+])# _LT_SHELL_INIT > > > # _LT_PROG_ECHO_BACKSLASH > # ----------------------- >-# Find how we can fake an echo command that does not interpret backslash. >-# In particular, with Autoconf 2.60 or later we add some code to the start >-# of the generated configure script which will find a shell with a builtin >-# printf (which we can use as an echo command). >+# Add some code to the start of the generated configure script which >+# will find an echo command which doesn't interpret backslashes. > m4_defun([_LT_PROG_ECHO_BACKSLASH], >-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' >-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO >-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO >- >-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 && \ >- 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 >- ECHO='printf %s\n' >+[_LT_SHELL_INIT([ >+# Check that we are running under the correct shell. >+SHELL=${CONFIG_SHELL-/bin/sh} >+ >+case X$lt_ECHO in >+X*--fallback-echo) >+ # Remove one level of quotation (which was required for Make). >+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` >+ ;; >+esac >+ >+ECHO=${lt_ECHO-echo} >+if test "X[$]1" = X--no-reexec; then >+ # Discard the --no-reexec flag, and continue. >+ shift >+elif test "X[$]1" = X--fallback-echo; then >+ # Avoid inline document here, it may be left over >+ : >+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then >+ # Yippee, $ECHO works! >+ : > else >- # Use this function as a fallback that always works. >- func_fallback_echo () >- { >- eval 'cat <<_LTECHO_EOF >-$[]1 >-_LTECHO_EOF' >- } >- ECHO='func_fallback_echo' >+ # Restart under the correct shell. >+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} > fi > >-# func_echo_all arg... >-# Invoke $ECHO with all args, space-separated. >-func_echo_all () >-{ >- $ECHO "$*" >-} >+if test "X[$]1" = X--fallback-echo; then >+ # used as fallback echo >+ shift >+ cat <<_LT_EOF >+[$]* >+_LT_EOF >+ exit 0 >+fi > >-case "$ECHO" in >- printf*) AC_MSG_RESULT([printf]) ;; >- print*) AC_MSG_RESULT([print -r]) ;; >- *) AC_MSG_RESULT([cat]) ;; >-esac >+# 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 >+ >+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 >+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do >+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... >+ if { echo_test_string=`eval $cmd`; } 2>/dev/null && >+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null >+ then >+ break >+ fi >+ done >+ fi >+ >+ 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 >+ : >+ else >+ # The Solaris, AIX, and Digital Unix default echo programs unquote >+ # backslashes. This makes it impossible to quote backslashes using >+ # echo "$something" | sed 's/\\/\\\\/g' >+ # >+ # So, first we look for a working echo in the user's PATH. >+ >+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR >+ for dir in $PATH /usr/ucb; do >+ IFS="$lt_save_ifs" >+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && >+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && >+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ ECHO="$dir/echo" >+ break >+ 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' && >+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ # This shell has a builtin print -r that does the trick. >+ ECHO='print -r' >+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && >+ test "X$CONFIG_SHELL" != X/bin/ksh; then >+ # If we have ksh, try running configure again with it. >+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} >+ export ORIGINAL_CONFIG_SHELL >+ CONFIG_SHELL=/bin/ksh >+ export CONFIG_SHELL >+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} >+ else >+ # Try using printf. >+ ECHO='printf %s\n' >+ 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 >+ # Cool, printf works >+ : >+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && >+ test "X$echo_testing_string" = 'X\t' && >+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL >+ export CONFIG_SHELL >+ SHELL="$CONFIG_SHELL" >+ export SHELL >+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" >+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && >+ test "X$echo_testing_string" = 'X\t' && >+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && >+ test "X$echo_testing_string" = "X$echo_test_string"; then >+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" >+ else >+ # maybe with a smaller string... >+ prev=: > >-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" )])]) >+ 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 >+ break >+ fi >+ prev="$cmd" >+ done > >+ if test "$prev" != 'sed 50q "[$]0"'; then >+ echo_test_string=`eval $prev` >+ export echo_test_string >+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} >+ else >+ # Oops. We lost completely, so just stick with echo. >+ ECHO=echo >+ fi >+ fi >+ fi >+ fi >+ fi >+fi >+ >+# 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([], [ECHO], [1], >+ [An echo program that does not interpret backslashes]) > ])# _LT_PROG_ECHO_BACKSLASH > > >@@ -1193,7 +1236,7 @@ > ;; > *-*-irix6*) > # Find out which ABI we are using. >- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext >+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext > if AC_TRY_EVAL(ac_compile); then > if test "$lt_cv_prog_gnu_ld" = yes; then > case `/usr/bin/file conftest.$ac_objext` in >@@ -1345,19 +1388,10 @@ > esac > old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" > fi >- >-case $host_os in >- darwin*) >- lock_old_archive_extraction=yes ;; >- *) >- lock_old_archive_extraction=no ;; >-esac > _LT_DECL([], [old_postinstall_cmds], [2]) > _LT_DECL([], [old_postuninstall_cmds], [2]) > _LT_TAGDECL([], [old_archive_cmds], [2], > [Commands used to build an old-style archive]) >-_LT_DECL([], [lock_old_archive_extraction], [0], >- [Whether to use a lock for old archive extraction]) > ])# _LT_CMD_OLD_ARCHIVE > > >@@ -1382,15 +1416,15 @@ > -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ > -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ > -e 's:$: $lt_compiler_flag:'` >- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) >+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) > (eval "$lt_compile" 2>conftest.err) > ac_status=$? > cat conftest.err >&AS_MESSAGE_LOG_FD >- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD >+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD > if (exit $ac_status) && test -s "$ac_outfile"; then > # The compiler can only warn and ignore the option if not recognized > # So say no if there are warnings other than the usual output. >- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp >+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp > $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 > if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then > $2=yes >@@ -1430,7 +1464,7 @@ > if test -s conftest.err; then > # Append any errors to the config.log. > cat conftest.err 1>&AS_MESSAGE_LOG_FD >- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp >+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp > $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 > if diff conftest.exp conftest.er2 >/dev/null; then > $2=yes >@@ -1493,11 +1527,6 @@ > lt_cv_sys_max_cmd_len=8192; > ;; > >- mint*) >- # On MiNT this can take a long time and run out of memory. >- lt_cv_sys_max_cmd_len=8192; >- ;; >- > amigaos*) > # On AmigaOS with pdksh, this test takes hours, literally. > # So we just punt and use a minimum line length of 8192. >@@ -1562,8 +1591,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. >- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ >- = "X$teststring$teststring"; } >/dev/null 2>&1 && >+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ >+ = "XX$teststring$teststring"; } >/dev/null 2>&1 && > test $i != 17 # 1/2 MB should be enough > do > i=`expr $i + 1` >@@ -1614,7 +1643,7 @@ > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF >-[#line $LINENO "configure" >+[#line __oline__ "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H >@@ -1655,13 +1684,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"))); >-#endif >- >-void fnord () { int i=42; } >+void fnord() { int i=42;} > int main () > { > void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); >@@ -1670,11 +1693,7 @@ > if (self) > { > if (dlsym (self,"fnord")) status = $lt_dlno_uscore; >- else >- { >- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; >- else puts (dlerror ()); >- } >+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; > /* dlclose (self); */ > } > else >@@ -1850,16 +1869,16 @@ > -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ > -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ > -e 's:$: $lt_compiler_flag:'` >- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) >+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) > (eval "$lt_compile" 2>out/conftest.err) > ac_status=$? > cat out/conftest.err >&AS_MESSAGE_LOG_FD >- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD >+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD > if (exit $ac_status) && test -s out/conftest2.$ac_objext > then > # The compiler can only warn and ignore the option if not recognized > # So say no if there are warnings >- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp >+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp > $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 >@@ -2018,7 +2037,6 @@ > m4_require([_LT_FILEUTILS_DEFAULTS])dnl > m4_require([_LT_DECL_OBJDUMP])dnl > m4_require([_LT_DECL_SED])dnl >-m4_require([_LT_CHECK_SHELL_FEATURES])dnl > AC_MSG_CHECKING([dynamic linker characteristics]) > m4_if([$1], > [], [ >@@ -2027,23 +2045,16 @@ > darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; > *) lt_awk_arg="/^libraries:/" ;; > esac >- case $host_os in >- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; >- *) lt_sed_strip_eq="s,=/,/,g" ;; >- esac >- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` >- case $lt_search_path_spec in >- *\;*) >+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` >+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then > # if the path contains ";" then we assume it to be the separator > # otherwise default to the standard path separator (i.e. ":") - it is > # assumed that no part of a normal pathname contains ";" but that should > # okay in the real world where ";" in dirpaths is itself problematic. >- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` >- ;; >- *) >- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` >- ;; >- esac >+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` >+ else >+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` >+ fi > # 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= >@@ -2056,7 +2067,7 @@ > lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" > fi > done >- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' >+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' > BEGIN {RS=" "; FS="/|\n";} { > lt_foo=""; > lt_count=0; >@@ -2076,13 +2087,7 @@ > if (lt_foo != "") { lt_freq[[lt_foo]]++; } > if (lt_freq[[lt_foo]] == 1) { print lt_foo; } > }'` >- # AWK program above erroneously prepends '/' to C:/dos/paths >- # for these hosts. >- case $host_os in >- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ >- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; >- esac >- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` >+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` > else > sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" > fi]) >@@ -2170,7 +2175,7 @@ > m68k) > library_names_spec='$libname.ixlibrary $libname.a' > # Create ${libname}_ixlibrary.a entries in /sys/libs. >- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' >+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' > ;; > esac > ;; >@@ -2223,12 +2228,23 @@ > 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}' >-m4_if([$1], [],[ >- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) >+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" > ;; > mingw* | cegcc*) > # MinGW DLLs use traditional 'lib' prefix > soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' >+ 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 >+ # 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/$PATH_SEPARATOR/ /g"` >+ fi > ;; > pw32*) > # pw32 DLLs use 'pw' prefix rather than 'lib' >@@ -2328,19 +2344,6 @@ > hardcode_into_libs=yes > ;; > >-haiku*) >- version_type=linux >- need_lib_prefix=no >- need_version=no >- dynamic_linker="$host_os runtime_loader" >- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' >- soname_spec='${libname}${release}${shared_ext}$major' >- shlibpath_var=LIBRARY_PATH >- shlibpath_overrides_runpath=yes >- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' >- hardcode_into_libs=yes >- ;; >- > hpux9* | hpux10* | hpux11*) > # Give a soname corresponding to the major version so that dld.sl refuses to > # link against other versions. >@@ -2383,10 +2386,8 @@ > soname_spec='${libname}${release}${shared_ext}$major' > ;; > esac >- # HP-UX runs *really* slowly unless shared libraries are mode 555, ... >+ # HP-UX runs *really* slowly unless shared libraries are mode 555. > postinstall_cmds='chmod 555 $lib' >- # or fails outright, so override atomically: >- install_override_mode=555 > ;; > > interix[[3-9]]*) >@@ -2453,35 +2454,26 @@ > 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 >- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], >- [lt_cv_shlibpath_overrides_runpath=no >- save_LDFLAGS=$LDFLAGS >- save_libdir=$libdir >- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ >- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" >- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], >- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], >- [lt_cv_shlibpath_overrides_runpath=yes])]) >- LDFLAGS=$save_LDFLAGS >- libdir=$save_libdir >- ]) >- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath >+ save_LDFLAGS=$LDFLAGS >+ save_libdir=$libdir >+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ >+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" >+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], >+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], >+ [shlibpath_overrides_runpath=yes])]) >+ LDFLAGS=$save_LDFLAGS >+ libdir=$save_libdir > > # This implies no fast_install, which is unacceptable. > # Some rework will be needed to allow for fast_install > # before this can be enabled. > hardcode_into_libs=yes > >- # Add ABI-specific directories to the system library path. >- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" >- > # Append ld.so.conf contents to the search path > if test -f /etc/ld.so.conf; then >- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` >- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" >- >+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` >+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" > fi > > # We used to test for /lib/ld.so.1 and disable shared libraries on >@@ -2493,6 +2485,18 @@ > dynamic_linker='GNU/Linux ld.so' > ;; > >+netbsdelf*-gnu) >+ version_type=linux >+ need_lib_prefix=no >+ need_version=no >+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' >+ soname_spec='${libname}${release}${shared_ext}$major' >+ shlibpath_var=LD_LIBRARY_PATH >+ shlibpath_overrides_runpath=no >+ hardcode_into_libs=yes >+ dynamic_linker='NetBSD ld.elf_so' >+ ;; >+ > netbsd*) > version_type=sunos > need_lib_prefix=no >@@ -2713,8 +2717,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]]) >-_LT_DECL([], [install_override_mode], [1], >- [Permission mode override for installation of shared libraries]) > _LT_DECL([], [postinstall_cmds], [2], > [Command to use after installation of a shared archive]) > _LT_DECL([], [postuninstall_cmds], [2], >@@ -2827,7 +2829,6 @@ > AC_REQUIRE([AC_CANONICAL_BUILD])dnl > m4_require([_LT_DECL_SED])dnl > m4_require([_LT_DECL_EGREP])dnl >-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl > > AC_ARG_WITH([gnu-ld], > [AS_HELP_STRING([--with-gnu-ld], >@@ -2957,8 +2958,8 @@ > fi > ;; > esac >-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl >-_LT_TAGDECL([], [reload_cmds], [2])dnl >+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl >+_LT_DECL([], [reload_cmds], [2])dnl > ])# _LT_CMD_RELOAD > > >@@ -3010,18 +3011,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. >- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. >- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then >+ if ( file / ) >/dev/null 2>&1; then > lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' > lt_cv_file_magic_cmd='func_win32_libid' > else >- # Keep this pattern in sync with the one in func_win32_libid. >- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' > lt_cv_file_magic_cmd='$OBJDUMP -f' > fi > ;; > >-cegcc*) >+cegcc) > # 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' >@@ -3051,10 +3050,6 @@ > lt_cv_deplibs_check_method=pass_all > ;; > >-haiku*) >- lt_cv_deplibs_check_method=pass_all >- ;; >- > hpux10.20* | hpux11*) > lt_cv_file_magic_cmd=/usr/bin/file > case $host_cpu in >@@ -3063,11 +3058,11 @@ > lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so > ;; > hppa*64*) >- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] >+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] > lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl > ;; > *) >- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' >+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' > lt_cv_file_magic_test_file=/usr/lib/libc.sl > ;; > esac >@@ -3093,7 +3088,7 @@ > lt_cv_deplibs_check_method=pass_all > ;; > >-netbsd*) >+netbsd* | netbsdelf*-gnu) > 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 >@@ -3231,19 +3226,7 @@ > NM="$lt_cv_path_NM" > else > # Didn't find any BSD compatible name lister, look for dumpbin. >- if test -n "$DUMPBIN"; then : >- # Let the user override the test. >- else >- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) >- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in >- *COFF*) >- DUMPBIN="$DUMPBIN -symbols" >- ;; >- *) >- DUMPBIN=: >- ;; >- esac >- fi >+ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) > AC_SUBST([DUMPBIN]) > if test "$DUMPBIN" != ":"; then > NM="$DUMPBIN" >@@ -3256,13 +3239,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 >- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) >+ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) > (eval "$ac_compile" 2>conftest.err) > cat conftest.err >&AS_MESSAGE_LOG_FD >- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) >+ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) > (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) > cat conftest.err >&AS_MESSAGE_LOG_FD >- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) >+ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) > cat conftest.out >&AS_MESSAGE_LOG_FD > if $GREP 'External.*some_variable' conftest.out > /dev/null; then > lt_cv_nm_interface="MS dumpbin" >@@ -3285,7 +3268,7 @@ > [AC_REQUIRE([AC_CANONICAL_HOST])dnl > LIBM= > case $host in >-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) >+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) > # These system don't have libm, or don't need it > ;; > *-ncr-sysv4.3*) >@@ -3313,12 +3296,7 @@ > _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= > > if test "$GCC" = yes; then >- case $cc_basename in >- nvcc*) >- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; >- *) >- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; >- esac >+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' > > _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], > lt_cv_prog_compiler_rtti_exceptions, >@@ -3335,7 +3313,6 @@ > m4_defun([_LT_CMD_GLOBAL_SYMBOLS], > [AC_REQUIRE([AC_CANONICAL_HOST])dnl > AC_REQUIRE([AC_PROG_CC])dnl >-AC_REQUIRE([AC_PROG_AWK])dnl > AC_REQUIRE([LT_PATH_NM])dnl > AC_REQUIRE([LT_PATH_LD])dnl > m4_require([_LT_DECL_SED])dnl >@@ -3461,7 +3438,7 @@ > if AC_TRY_EVAL(ac_compile); then > # Now try to grab the symbols. > nlist=conftest.nm >- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then >+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then > # Try sorting and uniquifying the output. > if sort "$nlist" | uniq > "$nlist"T; then > mv -f "$nlist"T "$nlist" >@@ -3623,11 +3600,6 @@ > # DJGPP does not support shared libraries at all > _LT_TAGVAR(lt_prog_compiler_pic, $1)= > ;; >- haiku*) >- # PIC is the default for Haiku. >- # The "-static" flag exists, but is broken. >- _LT_TAGVAR(lt_prog_compiler_static, $1)= >- ;; > interix[[3-9]]*) > # Interix 3.x gcc -fpic/-fPIC options generate broken code. > # Instead, we relocate shared libraries at runtime. >@@ -3766,8 +3738,8 @@ > _LT_TAGVAR(lt_prog_compiler_pic, $1)= > _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' > ;; >- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) >- # IBM XL 8.0, 9.0 on PPC and BlueGene >+ xlc* | xlC*) >+ # IBM XL 8.0 on PPC > _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' > _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' > _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' >@@ -3797,7 +3769,7 @@ > ;; > esac > ;; >- netbsd*) >+ netbsd* | netbsdelf*-gnu) > ;; > *qnx* | *nto*) > # QNX uses GNU C++, but need to define -shared option too, otherwise >@@ -3829,7 +3801,7 @@ > ;; > solaris*) > case $cc_basename in >- CC* | sunCC*) >+ CC*) > # 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' >@@ -3933,12 +3905,6 @@ > _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' > ;; > >- haiku*) >- # PIC is the default for Haiku. >- # The "-static" flag exists, but is broken. >- _LT_TAGVAR(lt_prog_compiler_static, $1)= >- ;; >- > 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 >@@ -3981,13 +3947,6 @@ > _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' > ;; > esac >- >- case $cc_basename in >- nvcc*) # Cuda Compiler Driver 2.2 >- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' >- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' >- ;; >- esac > else > # PORTME Check for flag to pass linker flags through the system compiler. > case $host_os in >@@ -4051,7 +4010,7 @@ > _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' > _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' > ;; >- 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,' >@@ -4063,26 +4022,26 @@ > # All Alpha code is PIC. > _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' > ;; >- xl* | bgxl* | bgf* | mpixl*) >- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene >+ xl*) >+ # IBM XL C 8.0/Fortran 10.1 on PPC > _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' > _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' > _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' > ;; > *) > case `$CC -V 2>&1 | sed 5q` in >- *Sun\ F* | *Sun*Fortran*) >- # Sun Fortran 8.3 passes all unrecognized flags to the linker >- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' >- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' >- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' >- ;; > *Sun\ C*) > # Sun C 5.9 > _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' > _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' > _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' > ;; >+ *Sun\ F*) >+ # Sun Fortran 8.3 passes all unrecognized flags to the linker >+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' >+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' >+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' >+ ;; > esac > ;; > esac >@@ -4113,7 +4072,7 @@ > _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' > _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' > case $cc_basename in >- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) >+ f77* | f90* | f95*) > _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; > *) > _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; >@@ -4223,10 +4182,8 @@ > 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 >- # Also, AIX nm treats weak defined symbols like other global defined >- # symbols, whereas GNU nm marks them as "W". > if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then >- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' >+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' > 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 >@@ -4237,6 +4194,9 @@ > 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' > ;; >+ 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' > ;; >@@ -4301,36 +4261,13 @@ > openbsd*) > with_gnu_ld=no > ;; >+ linux* | k*bsd*-gnu) >+ _LT_TAGVAR(link_all_deplibs, $1)=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 >- case $host_os in >- aix*) >- # The AIX port of GNU ld has always aspired to compatibility >- # with the native linker. However, as the warning in the GNU ld >- # block says, versions before 2.19.5* couldn't really create working >- # shared libraries, regardless of the interface used. >- case `$LD -v 2>&1` in >- *\ \(GNU\ Binutils\)\ 2.19.5*) ;; >- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; >- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; >- *) >- lt_use_gnu_ld_interface=yes >- ;; >- esac >- ;; >- *) >- lt_use_gnu_ld_interface=yes >- ;; >- esac >- fi >- >- if test "$lt_use_gnu_ld_interface" = yes; then > # If archive_cmds runs LD, not CC, wlarc should be empty > wlarc='${wl}' > >@@ -4364,12 +4301,11 @@ > _LT_TAGVAR(ld_shlibs, $1)=no > cat <<_LT_EOF 1>&2 > >-*** Warning: the GNU linker, at least up to release 2.19, is reported >+*** Warning: the GNU linker, at least up to release 2.9.1, is reported > *** to be unable to reliably create shared libraries on AIX. > *** Therefore, libtool is disabling shared libraries support. If you >-*** really care for shared libraries, you may want to install binutils >-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. >-*** You will then need to restart the configuration process. >+*** really care for shared libraries, you may want to modify your PATH >+*** so that a non-GNU linker is found, and then restart. > > _LT_EOF > fi >@@ -4405,7 +4341,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 >@@ -4427,11 +4362,6 @@ > fi > ;; > >- haiku*) >- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' >- _LT_TAGVAR(link_all_deplibs, $1)=yes >- ;; >- > interix[[3-9]]*) > _LT_TAGVAR(hardcode_direct, $1)=no > _LT_TAGVAR(hardcode_shlibpath_var, $1)=no >@@ -4461,12 +4391,11 @@ > tmp_sharedflag='-shared' > case $cc_basename,$host_cpu in > pgcc*) # Portland Group C compiler >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > tmp_addflag=' $pic_flag' > ;; >- pgf77* | pgf90* | pgf95* | pgfortran*) >- # Portland Group f77 and f90 compilers >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > tmp_addflag=' $pic_flag -Mnomain' ;; > ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 > tmp_addflag=' -i_dynamic' ;; >@@ -4477,17 +4406,13 @@ > lf95*) # Lahey Fortran 8.1 > _LT_TAGVAR(whole_archive_flag_spec, $1)= > tmp_sharedflag='--shared' ;; >- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) >+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) > tmp_sharedflag='-qmkshrobj' > tmp_addflag= ;; >- nvcc*) # Cuda Compiler Driver 2.2 >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >- _LT_TAGVAR(compiler_needs_object, $1)=yes >- ;; > esac > case `$CC -V 2>&1 | sed 5q` in > *Sun\ C*) # Sun C 5.9 >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > _LT_TAGVAR(compiler_needs_object, $1)=yes > tmp_sharedflag='-G' ;; > *Sun\ F*) # Sun Fortran 8.3 >@@ -4503,17 +4428,17 @@ > fi > > case $cc_basename in >- xlf* | bgf* | bgxlf* | mpixlf*) >+ xlf*) > # IBM XL Fortran 10.1 on PPC cannot create shared libs itself > _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= > _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' >- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' >+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' > if test "x$supports_anon_versioning" = xyes; then > _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ > cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ > echo "local: *; };" >> $output_objdir/$libname.ver~ >- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' >+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' > fi > ;; > esac >@@ -4522,7 +4447,7 @@ > fi > ;; > >- netbsd*) >+ netbsd* | netbsdelf*-gnu) > if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then > _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' > wlarc= >@@ -4634,10 +4559,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 >- # Also, AIX nm treats weak defined symbols like other global >- # defined symbols, whereas GNU nm marks them as "W". > if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then >- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' >+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' > 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 >@@ -4699,6 +4622,7 @@ > if test "$aix_use_runtimelinking" = yes; then > shared_flag="$shared_flag "'${wl}-G' > fi >+ _LT_TAGVAR(link_all_deplibs, $1)=no > else > # not using gcc > if test "$host_cpu" = ia64; then >@@ -4726,7 +4650,7 @@ > # empty executable. > _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' >@@ -4741,13 +4665,8 @@ > # -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' >- if test "$with_gnu_ld" = yes; then >- # We only use this code for GNU lds that support --whole-archive. >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' >- else >- # Exported symbols can be pulled into shared objects from archives >- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' >- fi >+ # Exported symbols can be pulled into shared objects from archives >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' > _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' >@@ -4786,7 +4705,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=' >+ _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. >@@ -4853,7 +4772,7 @@ > ;; > > hpux10*) >- if test "$GCC" = yes && test "$with_gnu_ld" = no; then >+ 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' > else > _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' >@@ -4872,7 +4791,7 @@ > ;; > > hpux11*) >- if test "$GCC" = yes && test "$with_gnu_ld" = no; then >+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then > case $host_cpu in > hppa*64*) > _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' >@@ -4893,14 +4812,7 @@ > _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' > ;; > *) >- m4_if($1, [], [ >- # Older versions of the 11.00 compiler do not understand -b yet >- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) >- _LT_LINKER_OPTION([if $CC understands -b], >- _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], >- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], >- [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], >- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) >+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' > ;; > esac > fi >@@ -4928,19 +4840,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 $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' >+ _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" > 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' >+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' > fi > _LT_TAGVAR(archive_cmds_need_lc, $1)='no' > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' >@@ -4949,7 +4861,7 @@ > _LT_TAGVAR(link_all_deplibs, $1)=yes > ;; > >- netbsd*) >+ netbsd* | netbsdelf*-gnu) > 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 >@@ -5002,17 +4914,17 @@ > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' > _LT_TAGVAR(hardcode_minus_L, $1)=yes > _LT_TAGVAR(allow_undefined_flag, $1)=unsupported >- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' >+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' > _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' > ;; > > osf3*) > 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}-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}-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(allow_undefined_flag, $1)=' -expect_unresolved \*' >- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $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_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' > fi > _LT_TAGVAR(archive_cmds_need_lc, $1)='no' > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' >@@ -5022,13 +4934,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} $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 > _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' >- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' >+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' > _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ >- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' >+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' > > # Both c and cxx compiler support -rpath directly > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' >@@ -5219,38 +5131,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. >- AC_CACHE_CHECK([whether -lc should be explicitly linked in], >- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), >- [$RM conftest* >- echo "$lt_simple_compile_test_code" > conftest.$ac_ext >- >- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then >- soname=conftest >- lib=conftest >- libobjs=conftest.$ac_objext >- deplibs= >- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) >- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) >- compiler_flags=-v >- linker_flags=-v >- verstring= >- output_objdir=. >- libname=conftest >- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) >- _LT_TAGVAR(allow_undefined_flag, $1)= >- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) >- then >- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no >- else >- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes >- fi >- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag >- else >- cat conftest.err 1>&5 >- fi >- $RM conftest* >- ]) >- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) >+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) >+ $RM conftest* >+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext >+ >+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then >+ soname=conftest >+ lib=conftest >+ libobjs=conftest.$ac_objext >+ deplibs= >+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) >+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) >+ compiler_flags=-v >+ linker_flags=-v >+ verstring= >+ output_objdir=. >+ libname=conftest >+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) >+ _LT_TAGVAR(allow_undefined_flag, $1)= >+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) >+ then >+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no >+ else >+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes >+ fi >+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag >+ else >+ cat conftest.err 1>&5 >+ fi >+ $RM conftest* >+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) > ;; > esac > fi >@@ -5420,14 +5330,14 @@ > ])# _LT_LANG_C_CONFIG > > >-# _LT_LANG_CXX_CONFIG([TAG]) >-# -------------------------- >-# Ensure that the configuration variables for a C++ compiler are suitably >-# defined. These variables are subsequently used by _LT_CONFIG to write >-# the compiler configuration to `libtool'. >-m4_defun([_LT_LANG_CXX_CONFIG], >-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl >-m4_require([_LT_DECL_EGREP])dnl >+# _LT_PROG_CXX >+# ------------ >+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ >+# compiler, we have our own version here. >+m4_defun([_LT_PROG_CXX], >+[ >+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) >+AC_PROG_CXX > if test -n "$CXX" && ( test "X$CXX" != "Xno" && > ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || > (test "X$CXX" != "Xg++"))) ; then >@@ -5435,6 +5345,22 @@ > else > _lt_caught_CXX_error=yes > fi >+popdef([AC_MSG_ERROR]) >+])# _LT_PROG_CXX >+ >+dnl aclocal-1.4 backwards compatibility: >+dnl AC_DEFUN([_LT_PROG_CXX], []) >+ >+ >+# _LT_LANG_CXX_CONFIG([TAG]) >+# -------------------------- >+# Ensure that the configuration variables for a C++ compiler are suitably >+# defined. These variables are subsequently used by _LT_CONFIG to write >+# the compiler configuration to `libtool'. >+m4_defun([_LT_LANG_CXX_CONFIG], >+[AC_REQUIRE([_LT_PROG_CXX])dnl >+m4_require([_LT_FILEUTILS_DEFAULTS])dnl >+m4_require([_LT_DECL_EGREP])dnl > > AC_LANG_PUSH(C++) > _LT_TAGVAR(archive_cmds_need_lc, $1)=no >@@ -5456,8 +5382,6 @@ > _LT_TAGVAR(module_expsym_cmds, $1)= > _LT_TAGVAR(link_all_deplibs, $1)=unknown > _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds >-_LT_TAGVAR(reload_flag, $1)=$reload_flag >-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds > _LT_TAGVAR(no_undefined_flag, $1)= > _LT_TAGVAR(whole_archive_flag_spec, $1)= > _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no >@@ -5560,7 +5484,7 @@ > # Commands to make compiler produce verbose output that lists > # what "hidden" libraries, object files and flags are used when > # linking a shared library. >- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' >+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' > > else > GXX=no >@@ -5672,7 +5596,7 @@ > _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' >@@ -5687,13 +5611,8 @@ > # -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' >- if test "$with_gnu_ld" = yes; then >- # We only use this code for GNU lds that support --whole-archive. >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' >- else >- # Exported symbols can be pulled into shared objects from archives >- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' >- fi >+ # Exported symbols can be pulled into shared objects from archives >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' > _LT_TAGVAR(archive_cmds_need_lc, $1)=yes > # This is similar to how AIX traditionally builds its shared > # libraries. >@@ -5726,7 +5645,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 >@@ -5787,11 +5705,6 @@ > gnu*) > ;; > >- haiku*) >- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' >- _LT_TAGVAR(link_all_deplibs, $1)=yes >- ;; >- > hpux9*) > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' > _LT_TAGVAR(hardcode_libdir_separator, $1)=: >@@ -5816,7 +5729,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. >- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' >+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' > ;; > *) > if test "$GXX" = yes; then >@@ -5881,7 +5794,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. >- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' >+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' > ;; > *) > if test "$GXX" = yes; then >@@ -5924,7 +5837,7 @@ > case $cc_basename in > CC*) > # SGI C++ >- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' >+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' > > # Archives containing C++ object files must be created using > # "CC -ar", where "CC" is the IRIX C++ compiler. This is >@@ -5935,9 +5848,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 -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 -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 >@@ -5966,7 +5879,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. >- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' >+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' > > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' > _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' >@@ -6003,26 +5916,26 @@ > pgCC* | pgcpp*) > # Portland Group C++ compiler > case `$CC -V` in >- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) >+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) > _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ > rm -rf $tpldir~ > $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ >- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' >+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' > _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ > rm -rf $tpldir~ > $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ >- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ >+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ > $RANLIB $oldlib' > _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ > rm -rf $tpldir~ > $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ >- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' >+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' > _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ > rm -rf $tpldir~ > $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ >- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' >+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' > ;; >- *) # Version 6 and above use weak symbols >+ *) # Version 6 will use weak symbols > _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' > ;; >@@ -6030,7 +5943,7 @@ > > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' > _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > ;; > cxx*) > # Compaq C++ >@@ -6049,9 +5962,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. >- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' >+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' > ;; >- xl* | mpixl* | bgxl*) >+ xl*) > # 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' >@@ -6071,13 +5984,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' >- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' >+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' > _LT_TAGVAR(compiler_needs_object, $1)=yes > > # Not sure whether something based on > # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 > # would be better. >- output_verbose_link_cmd='func_echo_all' >+ output_verbose_link_cmd='echo' > > # Archives containing C++ object files must be created using > # "CC -xar", where "CC" is the Sun C++ compiler. This is >@@ -6146,7 +6059,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 >- output_verbose_link_cmd=func_echo_all >+ output_verbose_link_cmd=echo > else > _LT_TAGVAR(ld_shlibs, $1)=no > fi >@@ -6181,15 +6094,15 @@ > case $host in > osf3*) > _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' >- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' >+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' > ;; > *) > _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' >- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' >+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' > _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ > echo "-hidden">> $lib.exp~ >- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ >+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ > $RM $lib.exp' > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' > ;; >@@ -6205,17 +6118,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. >- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' >+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' > ;; > *) > if test "$GXX" = yes && test "$with_gnu_ld" = no; then > _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' > case $host in > osf3*) >- _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" && 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}-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 -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 > >@@ -6225,7 +6138,7 @@ > # Commands to make compiler produce verbose output that lists > # what "hidden" libraries, object files and flags are used when > # linking a shared library. >- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' >+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' > > else > # FIXME: insert proper C++ library support >@@ -6261,7 +6174,7 @@ > > solaris*) > case $cc_basename in >- CC* | sunCC*) >+ CC*) > # Sun C++ 4.2, 5.x and Centerline C++ > _LT_TAGVAR(archive_cmds_need_lc,$1)=yes > _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' >@@ -6282,7 +6195,7 @@ > esac > _LT_TAGVAR(link_all_deplibs, $1)=yes > >- output_verbose_link_cmd='func_echo_all' >+ output_verbose_link_cmd='echo' > > # Archives containing C++ object files must be created using > # "CC -xar", where "CC" is the Sun C++ compiler. This is >@@ -6309,7 +6222,7 @@ > # Commands to make compiler produce verbose output that lists > # what "hidden" libraries, object files and flags are used when > # linking a shared library. >- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' >+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' > else > # g++ 2.7 appears to require `-G' NOT `-shared' on this > # platform. >@@ -6320,7 +6233,7 @@ > # Commands to make compiler produce verbose output that lists > # what "hidden" libraries, object files and flags are used when > # linking a shared library. >- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' >+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' > fi > > _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' >@@ -6374,10 +6287,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' >- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ >- '"$_LT_TAGVAR(old_archive_cmds, $1)" >- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ >- '"$_LT_TAGVAR(reload_cmds, $1)" > ;; > *) > _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' >@@ -6624,7 +6533,7 @@ > > solaris*) > case $cc_basename in >- CC* | sunCC*) >+ CC*) > # The more standards-conforming stlport4 library is > # incompatible with the Cstd library. Avoid specifying > # it if it's in CXXFLAGS. Ignore libCrun as >@@ -6668,16 +6577,32 @@ > ])# _LT_SYS_HIDDEN_LIBDEPS > > >+# _LT_PROG_F77 >+# ------------ >+# Since AC_PROG_F77 is broken, in that it returns the empty string >+# if there is no fortran compiler, we have our own version here. >+m4_defun([_LT_PROG_F77], >+[ >+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) >+AC_PROG_F77 >+if test -z "$F77" || test "X$F77" = "Xno"; then >+ _lt_disable_F77=yes >+fi >+popdef([AC_MSG_ERROR]) >+])# _LT_PROG_F77 >+ >+dnl aclocal-1.4 backwards compatibility: >+dnl AC_DEFUN([_LT_PROG_F77], []) >+ >+ > # _LT_LANG_F77_CONFIG([TAG]) > # -------------------------- > # Ensure that the configuration variables for a Fortran 77 compiler are > # suitably defined. These variables are subsequently used by _LT_CONFIG > # to write the compiler configuration to `libtool'. > m4_defun([_LT_LANG_F77_CONFIG], >-[AC_LANG_PUSH(Fortran 77) >-if test -z "$F77" || test "X$F77" = "Xno"; then >- _lt_disable_F77=yes >-fi >+[AC_REQUIRE([_LT_PROG_F77])dnl >+AC_LANG_PUSH(Fortran 77) > > _LT_TAGVAR(archive_cmds_need_lc, $1)=no > _LT_TAGVAR(allow_undefined_flag, $1)= >@@ -6696,8 +6621,6 @@ > _LT_TAGVAR(module_expsym_cmds, $1)= > _LT_TAGVAR(link_all_deplibs, $1)=unknown > _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds >-_LT_TAGVAR(reload_flag, $1)=$reload_flag >-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds > _LT_TAGVAR(no_undefined_flag, $1)= > _LT_TAGVAR(whole_archive_flag_spec, $1)= > _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no >@@ -6797,17 +6720,32 @@ > ])# _LT_LANG_F77_CONFIG > > >+# _LT_PROG_FC >+# ----------- >+# Since AC_PROG_FC is broken, in that it returns the empty string >+# if there is no fortran compiler, we have our own version here. >+m4_defun([_LT_PROG_FC], >+[ >+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) >+AC_PROG_FC >+if test -z "$FC" || test "X$FC" = "Xno"; then >+ _lt_disable_FC=yes >+fi >+popdef([AC_MSG_ERROR]) >+])# _LT_PROG_FC >+ >+dnl aclocal-1.4 backwards compatibility: >+dnl AC_DEFUN([_LT_PROG_FC], []) >+ >+ > # _LT_LANG_FC_CONFIG([TAG]) > # ------------------------- > # Ensure that the configuration variables for a Fortran compiler are > # suitably defined. These variables are subsequently used by _LT_CONFIG > # to write the compiler configuration to `libtool'. > m4_defun([_LT_LANG_FC_CONFIG], >-[AC_LANG_PUSH(Fortran) >- >-if test -z "$FC" || test "X$FC" = "Xno"; then >- _lt_disable_FC=yes >-fi >+[AC_REQUIRE([_LT_PROG_FC])dnl >+AC_LANG_PUSH(Fortran) > > _LT_TAGVAR(archive_cmds_need_lc, $1)=no > _LT_TAGVAR(allow_undefined_flag, $1)= >@@ -6826,8 +6764,6 @@ > _LT_TAGVAR(module_expsym_cmds, $1)= > _LT_TAGVAR(link_all_deplibs, $1)=unknown > _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds >-_LT_TAGVAR(reload_flag, $1)=$reload_flag >-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds > _LT_TAGVAR(no_undefined_flag, $1)= > _LT_TAGVAR(whole_archive_flag_spec, $1)= > _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no >@@ -6973,8 +6909,6 @@ > _LT_TAGVAR(archive_cmds_need_lc, $1)=no > > _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds >-_LT_TAGVAR(reload_flag, $1)=$reload_flag >-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds > > ## CAVEAT EMPTOR: > ## There is no encapsulation within the following macros, do not change >@@ -7342,7 +7276,7 @@ > func_dirname () > { > # Extract subdirectory from the argument. >- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` >+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` > if test "X$func_dirname_result" = "X${1}"; then > func_dirname_result="${3}" > else >@@ -7353,7 +7287,7 @@ > # func_basename file > func_basename () > { >- func_basename_result=`$ECHO "${1}" | $SED "$basename"` >+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` > } > > dnl func_dirname_and_basename >@@ -7369,8 +7303,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_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 > } > >@@ -7381,20 +7317,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"` >+ 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_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` > } > > # func_xform libobj-or-source > func_xform () > { >- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` >+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` > } > > # func_arith arithmetic-term... >--- libxml2-2.7.8.dfsg.orig/m4/ltoptions.m4 >+++ libxml2-2.7.8.dfsg/m4/ltoptions.m4 >@@ -1,14 +1,13 @@ > # Helper functions for option handling. -*- Autoconf -*- > # >-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, >-# Inc. >+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. > # Written by Gary V. Vaughan, 2004 > # > # This file is free software; the Free Software Foundation gives > # unlimited permission to copy and/or distribute it, with or without > # modifications, as long as this notice is preserved. > >-# serial 7 ltoptions.m4 >+# serial 6 ltoptions.m4 > > # This is to help aclocal find these macros, as it can't see m4_define. > AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) >@@ -126,7 +125,7 @@ > [enable_win32_dll=yes > > case $host in >-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) >+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) > AC_CHECK_TOOL(AS, as, false) > AC_CHECK_TOOL(DLLTOOL, dlltool, false) > AC_CHECK_TOOL(OBJDUMP, objdump, false) >@@ -134,13 +133,13 @@ > esac > > test -z "$AS" && AS=as >-_LT_DECL([], [AS], [1], [Assembler program])dnl >+_LT_DECL([], [AS], [0], [Assembler program])dnl > > test -z "$DLLTOOL" && DLLTOOL=dlltool >-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl >+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl > > test -z "$OBJDUMP" && OBJDUMP=objdump >-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl >+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl > ])# win32-dll > > AU_DEFUN([AC_LIBTOOL_WIN32_DLL], >--- libxml2-2.7.8.dfsg.orig/m4/ltversion.m4 >+++ libxml2-2.7.8.dfsg/m4/ltversion.m4 >@@ -9,15 +9,15 @@ > > # Generated from ltversion.in. > >-# serial 3175 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.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.2.6b' >+macro_revision='1.3017' > _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) > _LT_DECL(, macro_revision, 0) > ]) >--- libxml2-2.7.8.dfsg.orig/example/Makefile.in >+++ libxml2-2.7.8.dfsg/example/Makefile.in >@@ -134,6 +134,7 @@ > LIPO = @LIPO@ > LN_S = @LN_S@ > LTLIBOBJS = @LTLIBOBJS@ >+MAINT = @MAINT@ > MAKEINFO = @MAKEINFO@ > MKDIR_P = @MKDIR_P@ > MODULE_EXTENSION = @MODULE_EXTENSION@ >@@ -280,6 +281,7 @@ > libexecdir = @libexecdir@ > localedir = @localedir@ > localstatedir = @localstatedir@ >+lt_ECHO = @lt_ECHO@ > mandir = @mandir@ > mkdir_p = @mkdir_p@ > oldincludedir = @oldincludedir@ >@@ -307,7 +309,7 @@ > > .SUFFIXES: > .SUFFIXES: .c .lo .o .obj >-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) >+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) > @for dep in $?; do \ > case '$(am__configure_deps)' in \ > *$$dep*) \ >@@ -316,9 +318,9 @@ > exit 1;; \ > esac; \ > done; \ >- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu example/Makefile'; \ >+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign example/Makefile'; \ > $(am__cd) $(top_srcdir) && \ >- $(AUTOMAKE) --gnu example/Makefile >+ $(AUTOMAKE) --foreign example/Makefile > .PRECIOUS: Makefile > Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status > @case '$?' in \ >@@ -332,9 +334,9 @@ > $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > >-$(top_srcdir)/configure: $(am__configure_deps) >+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh >-$(ACLOCAL_M4): $(am__aclocal_m4_deps) >+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) > cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh > $(am__aclocal_m4_deps): > >--- libxml2-2.7.8.dfsg.orig/debian/python-libxml2.examples >+++ libxml2-2.7.8.dfsg/debian/python-libxml2.examples >@@ -0,0 +1,2 @@ >+python/tests/*.py >+python/tests/*.xml >--- libxml2-2.7.8.dfsg.orig/debian/watch >+++ libxml2-2.7.8.dfsg/debian/watch >@@ -0,0 +1,3 @@ >+version=3 >+opts=dversionmangle=s/\.dfsg.*$// \ >+ftp://xmlsoft.org/libxml2/libxml2-([\d\.]+)\.tar\.gz >--- libxml2-2.7.8.dfsg.orig/debian/README.Debian >+++ libxml2-2.7.8.dfsg/debian/README.Debian >@@ -0,0 +1,12 @@ >+Notes about libxml2 >+------------------- >+While libxml2 is trying to fit at best the XML, XPath, XIncludes, etc. >+standards, it is likely to contain implementation bugs which tend to >+disappear with newer versions. >+For this reason, if you are using libxml2 libraries or tools for standard >+conforming development, it's suggested to upgrade libxml2 with newer >+packages from either testing or unstable Debian repositories. >+If you're using libxml2 in Gnome context, or similar case (ie. xml usage >+not requiring heavy standards compliance), you don't need such upgrade. >+ >+-- Mike Hommey <glandium@debian.org>, Sat Oct 16 14:29:43 JST 2004 >--- libxml2-2.7.8.dfsg.orig/debian/copyright >+++ libxml2-2.7.8.dfsg/debian/copyright >@@ -0,0 +1,104 @@ >+This package was debianized by Vincent Renardias <vincent@waw.com> on >+Sat, 26 Sep 1998 16:50:54 +0200 >+ >+It was downloaded from ftp://xmlsoft.org/libxml2/ >+ >+========================== >+ >+Except where otherwise noted in the source code (trio files, hash.c and list.c) >+covered by a similar licence but with different Copyright notices: >+ >+ Copyright (C) 1998-2002 Daniel Veillard. All Rights Reserved. >+ >+Permission is hereby granted, free of charge, to any person obtaining a copy >+of this software and associated documentation files (the "Software"), to deal >+in the Software without restriction, including without limitation the rights >+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell >+copies of the Software, and to permit persons to whom the Software is fur- >+nished to do so, subject to the following conditions: >+ >+The above copyright notice and this permission notice shall be included in >+all copies or substantial portions of the Software. >+ >+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR >+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- >+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE >+DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER >+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- >+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. >+ >+Except as contained in this notice, the name of Daniel Veillard shall not >+be used in advertising or otherwise to promote the sale, use or other deal- >+ings in this Software without prior written authorization from him. >+========================== >+trio.c, trio.h: >+Copyright (C) 1998 Bjorn Reese and Daniel Stenberg. >+ >+Permission to use, copy, modify, and distribute this software for any >+purpose with or without fee is hereby granted, provided that the above >+copyright notice and this permission notice appear in all copies. >+ >+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED >+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF >+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND >+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. >+========================== >+triop.h: >+Copyright (C) 2000 Bjorn Reese and Daniel Stenberg. >+ >+Permission to use, copy, modify, and distribute this software for any >+purpose with or without fee is hereby granted, provided that the above >+copyright notice and this permission notice appear in all copies. >+ >+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED >+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF >+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND >+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. >+========================== >+hash.c: >+Copyright (C) 2000 Bjorn Reese and Daniel Veillard. >+ >+Permission to use, copy, modify, and distribute this software for any >+purpose with or without fee is hereby granted, provided that the above >+copyright notice and this permission notice appear in all copies. >+ >+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED >+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF >+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND >+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. >+========================== >+list.c: >+Copyright (C) 2000 Gary Pennington and Daniel Veillard. >+ >+Permission to use, copy, modify, and distribute this software for any >+purpose with or without fee is hereby granted, provided that the above >+copyright notice and this permission notice appear in all copies. >+ >+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED >+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF >+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND >+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. >+========================== >+triodef.h, trionan.c, trionan.h: >+Copyright (C) 2001 Bjorn Reese <breese@users.sourceforge.net> >+ >+Permission to use, copy, modify, and distribute this software for any >+purpose with or without fee is hereby granted, provided that the above >+copyright notice and this permission notice appear in all copies. >+ >+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED >+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF >+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND >+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. >+========================== >+triostr.c, triostr.h: >+Copyright (C) 2001 Bjorn Reese and Daniel Stenberg. >+ >+Permission to use, copy, modify, and distribute this software for any >+purpose with or without fee is hereby granted, provided that the above >+copyright notice and this permission notice appear in all copies. >+ >+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED >+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF >+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND >+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-dbg.dirs >+++ libxml2-2.7.8.dfsg/debian/libxml2-dbg.dirs >@@ -0,0 +1 @@ >+/usr/share/doc >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-utils.manpages >+++ libxml2-2.7.8.dfsg/debian/libxml2-utils.manpages >@@ -0,0 +1,2 @@ >+doc/xmllint.1 >+doc/xmlcatalog.1 >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-doc.install >+++ libxml2-2.7.8.dfsg/debian/libxml2-doc.install >@@ -0,0 +1,2 @@ >+usr/share/doc/libxml2-doc >+usr/share/gtk-doc >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-utils.preinst >+++ libxml2-2.7.8.dfsg/debian/libxml2-utils.preinst >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+set -e >+ >+[ "$1" = "upgrade" ] && >+[ -L /usr/share/doc/libxml2-utils ] && >+rm -f /usr/share/doc/libxml2-utils >+ >+#DEBHELPER# >+ >+exit 0 >--- libxml2-2.7.8.dfsg.orig/debian/changelog >+++ libxml2-2.7.8.dfsg/debian/changelog >@@ -0,0 +1,1485 @@ >+libxml2 (2.7.8.dfsg-2) unstable; urgency=low >+ >+ * xpath.c: Fix a double-freeing error in XPath processing code. >+ (CVE-2010-4494). Closes: #607922. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 25 Dec 2010 10:48:27 +0100 >+ >+libxml2 (2.7.8.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * configure.in: Applied upstream fix to reactivate symbol versioning script. >+ >+ -- Mike Hommey <glandium@debian.org> Fri, 05 Nov 2010 08:23:58 +0100 >+ >+libxml2 (2.7.7.dfsg-4) unstable; urgency=low >+ >+ * debian/rules: >+ - Use a variable to express which sub-targets to invoke for >+ configure/build/install. >+ - Refactor configure-% and build-% rules. >+ - Avoid possible renaming of _d.so files to _d_d.so files in the >+ install-python%-dbg rules. >+ * debian/control, debian/control.udeb, debian/libxml2-udeb.install, >+ debian/rules: Add an udeb package when building for Ubuntu. >+ Closes: #583767. >+ * debian/control: >+ - Remove old Conflicts/Replaces for packages that have disappeared before >+ etch. >+ - Bump Standards-Version to 3.9.0.0. >+ >+ -- Mike Hommey <glandium@debian.org> Tue, 29 Jun 2010 12:42:35 +0200 >+ >+libxml2 (2.7.7.dfsg-3) unstable; urgency=low >+ >+ * debian/rules: Use build_python* instead of build-python* as build >+ directory when configuring python modules. build-python$* would get >+ matched by make as an existing file and would prevent evaluation of the >+ corresponding build rule. Thanks Loïc Minier. >+ * debian/python-libxml2.install: Don't hardcode site-/dist-packages in >+ .install. Cope with builds which don't have any dist-packages (or >+ site-packages) based python versions. Thanks Loïc Minier. >+ * debian/rules, debian/python-libxml2-dbg.install, debian/control: >+ Add a python-libxml2-dbg package. Closes: #583582. >+ * debian/rules: Don't link against libpython. >+ * python-libxml2-dbg.preinst: Remove /usr/share/doc/python-libxml2-dbg >+ symlink when it exists (which is the case with older Ubuntu packages). >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 23 Jun 2010 18:52:51 +0200 >+ >+libxml2 (2.7.7.dfsg-2) unstable; urgency=low >+ >+ * debian/libxml2-dbg.preinst, debian/libxml2-dev.preinst, >+ debian/libxml2-utils.preinst: Remove /usr/share/doc symbolic links on >+ upgrade. They will then be replaced by directories by dpkg. >+ Closes: #577025. >+ >+ -- Mike Hommey <glandium@debian.org> Fri, 09 Apr 2010 10:21:02 +0200 >+ >+libxml2 (2.7.7.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * debian/control: >+ + Bump Standards-Version to 3.8.4.0. >+ + Depend on a version of debhelper that provides dh and supports >+ overrides. >+ * debian/compat: Bump to 7. >+ * debian/rules: >+ + Don't avoid to build in example/. There is no reason to do so anymore. >+ + Remove remains of WORKAROUND_MODIFIED_FILES, that was removed 2 years >+ ago. >+ + Change the way python libs are built. We now use configure to set >+ different environment with and without python, and arrange things so >+ that we don't have to build the base libxml2 library several times. >+ + Deduplicate in /usr/lib/pyshared, not >+ /usr/lib/python-support/python-libxml2. >+ + Remove old source and diff rules that only displayed a message >+ inviting to use dpkg-source -b. >+ + Force -Wl,--as-needed at the beginning of the gcc command line. >+ + Simplify rules by switching to dh. >+ + Don't refresh COPYING during clean target, it appears not to be >+ necessary anymore. >+ + Use a common cache for main and python configure passes. >+ * debian/python-libxml2.install: Install python files from >+ /usr/lib/python*/dist-packages. >+ * python/generator.py: Sort python generated stubs so that libxml2.py >+ doesn't differ between python 2.5 and 2.6. >+ * doc/devhelp/Makefile.{am,in}: Properly install devhelp files when >+ builddir != srcdir. >+ >+ -- Mike Hommey <glandium@debian.org> Sun, 21 Mar 2010 09:51:17 +0100 >+ >+libxml2 (2.7.6.dfsg-2) unstable; urgency=low >+ >+ * Cherry-picks from upstream git: >+ + globals.c: fix the initialization of the mutex. >+ + xmlIO.c: remove an abuse of zlib API and use a clean interface >+ available in zlib >= 1.2.3. Closes: #565683, #565823. >+ * debian/control: >+ + Put libreadline-dev before libreadline5-dev in Build-Deps. >+ Closes: #553803. >+ + Add misc:Depends dependencies where they are missing. >+ >+ -- Mike Hommey <glandium@debian.org> Tue, 19 Jan 2010 18:41:49 +0100 >+ >+libxml2 (2.7.6.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * debian/control: >+ + Bump Standards-Version to 3.8.3.0. >+ + Set libxml2 package priority to standard to match override. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 10 Oct 2009 23:55:41 +0200 >+ >+libxml2 (2.7.5.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ + Fixed a RelaxNG bug introduced in 2.7.4. Closes: #546442. >+ >+ -- Mike Hommey <glandium@debian.org> Fri, 25 Sep 2009 22:28:53 +0200 >+ >+libxml2 (2.7.4.dfsg-2) unstable; urgency=low >+ >+ * debian/libxml2.symbols: Force binaries that use versioned symbols to >+ depend on version 2.7.4 at least. >+ * parser.c: Fix a parsing problem with little data at startup. >+ Cherry-picked from upstream git. Closes: #546254, #546488. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 16 Sep 2009 00:12:50 +0200 >+ >+libxml2 (2.7.4.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * Revert old change to entities.c. >+ * debian/copyright: Change upstream url. Closes: #541082. >+ * debian/libxml2.symbols: Change symbols file to use newly introduced >+ symbol versioning >+ * debian/rules: bump shlibs to current version. >+ >+ -- Mike Hommey <glandium@debian.org> Thu, 10 Sep 2009 23:04:35 +0200 >+ >+libxml2 (2.7.3.dfsg-2.1) unstable; urgency=high >+ >+ * Non-maintainer upload by the Security Team (Closes: #540865). >+ * Fix multiple use-after-free flaws when parsing notation and >+ enumeration attribute types (CVE-2009-2416). >+ * Fix stack overflow when parsing root XML document element DTD >+ definition (CVE-2009-2414). >+ >+ -- Nico Golde <nion@debian.org> Sun, 16 Aug 2009 17:45:17 +0200 >+ >+libxml2 (2.7.3.dfsg-2) unstable; urgency=low >+ >+ * debian/no-upstream-changelog: Removed. >+ * debian/rules: Don't use symlinks in /usr/share/doc anymore, and only >+ install the upstream changelog in the libxml2 package. Considering >+ its size, we don't need it everywhere. Closes: #496959. >+ * include/libxml/*.h: change ATTRIBUTE_PRINTF into LIBXML_ATTR_FORMAT >+ to avoid macro name. Cherry-pick upstream f076f34. Closes: #521994. >+ * error.c: fix structured error handling problems. Cherry-pick upstream >+ 719f397. Closes: #522669. >+ * debian/control: >+ + Change libxml2-dbg's section to "debug". >+ + Bump Standards-Version to 3.8.2.0. >+ + Add Homepage, Vcs-Git and Vcs-Browser fields. >+ >+ -- Mike Hommey <glandium@debian.org> Mon, 13 Jul 2009 08:56:37 +0200 >+ >+libxml2 (2.7.3.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * parser.c: Remove useless nbParse* variables and avoid exporting them as >+ symbols. >+ * debian/libxml2.symbols: Reference the new symbols. >+ * debian/rules: bump shlibs to current version. >+ >+ -- Mike Hommey <glandium@debian.org> Sun, 01 Mar 2009 11:57:55 +0100 >+ >+libxml2 (2.6.32.dfsg-5) unstable; urgency=high >+ >+ * parserInternals.c: apply patch from upstream revision 3741 to avoid >+ double-free in some situations. This fixes a crash while running the >+ W3C/OASIS XML conformance test. >+ * tree.c: Fix infinite loop. Fixes: CVE-2008-4225. >+ * SAX2.c: Fix integer overflow. Fixes: CVE-2008-4226. >+ >+ -- Mike Hommey <glandium@debian.org> Tue, 18 Nov 2008 08:08:34 +0100 >+ >+libxml2 (2.6.32.dfsg-4) unstable; urgency=high >+ >+ * Fix regressions due to previous security fixes. Fixes: CVE-2008-3529. >+ Closes: #498768. >+ >+ -- Mike Hommey <glandium@debian.org> Fri, 19 Sep 2008 21:26:19 +0200 >+ >+libxml2 (2.6.32.dfsg-3) unstable; urgency=high >+ >+ * Fix DoS which leads to recursive evaluation of entities. >+ Fixes: CVE-2008-3281, without breaking librsvg and others. Closes: #496125. >+ >+ -- Mike Hommey <glandium@debian.org> Mon, 25 Aug 2008 22:01:17 +0200 >+ >+libxml2 (2.6.32.dfsg-2) unstable; urgency=low >+ >+ * debian/control: >+ + Use ${binary:Version} instead of ${Source-Version}. >+ + Fixed spelling error for "Python". >+ * debian/rules: Don't ignore make distclean errors. >+ * debian/libxml2-doc.doc-base: Changed section to fit doc-base sections >+ changes. >+ * xml2-config.1: Remove unknown groff command. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 19 Apr 2008 20:38:50 +0200 >+ >+libxml2 (2.6.32.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * debian/control: Bumped Standards-Version to 3.7.3.0. No changes. >+ * debian/rules: >+ + Make dpkg-shlibdeps fail when symbols are missing. >+ + Removed the workaround for removed and modified files during build. The >+ former was for svn-buildpackage that I don't use anymore, and the latter >+ for a file that isn't in the .orig.tar.gz anymore. >+ + Bump shlibs to current version, since a new symbol was added. >+ * debian/libxml2.symbols: Reference the new symbol. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 09 Apr 2008 11:25:18 +0200 >+ >+libxml2 (2.6.31.dfsg-2) unstable; urgency=low >+ >+ * debian/rules: Brown paper bag: uncomment $(MAKE) distclean. >+ Closes: #442656. >+ * xstc/Makefile.am, xstc/Makefile.in: Properly clean generated files. >+ * nanohttp.c: Apply fix from svn revision 3685 to allocate enough memory >+ for the Host HTTP header when containing a port number. Closes: #464173. >+ * error.c: Don't grow error buffer indefinitely when vsnprintf returns -1, >+ which, if it happens, on glibc-based systems, will happen indefinitely. >+ Closes: #456653. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 05 Mar 2008 23:42:37 +0100 >+ >+libxml2 (2.6.31.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * Acknowledged NMU. >+ * testModule.c: Revert our change to add PATH_MAX for the Hurd, since we now >+ don't even build this file. >+ * debian/rules: bump shlibs to current version, since a new symbol was added. >+ * debian/libxml2.symbols: Reference the new symbol. >+ * autogen.sh: Switch to automake1.10 to follow upstream. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 19 Jan 2008 18:46:41 +0100 >+ >+libxml2 (2.6.30.dfsg-3.1) unstable; urgency=high >+ >+ * Non-maintainer upload by security team. >+ * This update addresses the following security issue: >+ - CVE-2007-6284: The xmlCurrentChar function allows context-dependent >+ attackers to cause a denial of service (infinite loop) via XML >+ containing invalid UTF-8 sequences (Closes: #460292). >+ >+ -- Nico Golde <nion@debian.org> Sun, 13 Jan 2008 15:15:04 +0100 >+ >+libxml2 (2.6.30.dfsg-3) unstable; urgency=low >+ >+ * debian/libxml2.symbols: Add a symbols file to benefit from the new >+ features in dpkg-shlibdeps. >+ * debian/control: Build depend on debhelper (>= 5.0.61) and dpkg-dev (>= >+ 1.14.9), accordingly. >+ * debian/rules: >+ + Apply rules suggested in autotools-dev documentation. >+ + Add -Wl,--as-needed to LDFLAGS so that useless dependencies are not >+ added. >+ * Makefile.am, Makefile.in: Don't build noinst targets. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 21 Nov 2007 19:22:51 +0100 >+ >+libxml2 (2.6.30.dfsg-2) unstable; urgency=low >+ >+ * libxml.h: define _LARGEFILE64_SOURCE to properly get gzopen64 defines in >+ zlib.h. Closes: #439843. Thanks Dann Frazier. >+ >+ -- Mike Hommey <glandium@debian.org> Tue, 28 Aug 2007 21:52:30 +0200 >+ >+libxml2 (2.6.30.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ >+ -- Mike Hommey <glandium@debian.org> Sun, 26 Aug 2007 10:52:39 +0200 >+ >+libxml2 (2.6.29.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * debian/rules: bump shlibs to current version, since new symbols were added. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 13 Jun 2007 20:52:41 +0200 >+ >+libxml2 (2.6.28.dfsg-1) unstable; urgency=low >+ >+ * New upstream release: >+ + Provides doc/html/index.html. Closes: #405802. >+ + Fixed infinite loop with invalid characters in Xincluded files. >+ Closes: #410762. >+ * debian/rules: bump shlibs to current version, since new symbols were added. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 18 Apr 2007 08:09:16 +0200 >+ >+libxml2 (2.6.27.dfsg-1) unstable; urgency=low >+ >+ * New "huge bug fixes list" upstream release. >+ * autogen.sh: Updated so that doc/examples/index.html gets updated >+ correctly. >+ * debian/control: Bumped Standards-Version to 3.7.2.2. No changes required. >+ * debian/rules: bump shlibs to current version, since new symbols were added. >+ >+ -- Mike Hommey <glandium@debian.org> Thu, 26 Oct 2006 23:15:00 +0200 >+ >+libxml2 (2.6.26.dfsg-4) unstable; urgency=low >+ >+ * debian/control: >+ + Bumped Standards-Version to 3.7.2.1. No changes required. >+ + Added a conflict to the sarge version of libxslt1.1 to avoid upgrade >+ problems. Closes: #390733. >+ * debian/watch: Updated to mangle the Debian version. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 4 Oct 2006 16:51:29 +0200 >+ >+libxml2 (2.6.26.dfsg-3) unstable; urgency=medium >+ >+ * debian/rules, debian/libxml2-dev.install: Don't install libxml2.la >+ directly and sed it to remove the dependency_libs. Note that will break >+ linking statically libxml2 with libtool, we recommend to use pkg-config >+ --static --libs libxml-2.0 instead of relying on libtool. >+ Closes: #379807, #378511. >+ * xml2-config.in: Fixed usage alignment of the new option introduced in >+ previous upload. >+ >+ -- Mike Hommey <glandium@debian.org> Thu, 27 Jul 2006 19:40:27 +0200 >+ >+libxml2 (2.6.26.dfsg-2) unstable; urgency=low >+ >+ * The slithering release. >+ >+ * debian/python-libxml2.examples.in: Renamed to >+ debian/python-libxml2.examples >+ * debian/python-libxml2.install.in: Renamed to >+ debian/python-libxml2.install, and replaced PYVERS by a wildcard. >+ * debian/control: >+ + Adapted dependencies to fit all changes. >+ + Added fields required by new Python policy. >+ + Added fields necessary for flawless transition. >+ + Replaced dummy python-libxml2 package by a full real package which >+ itself replaces python2.x-libxml2 packages. >+ * debian/rules: >+ + Changed rules to get the python versions we want to build for and >+ adapted some rules to fit with the new setting. >+ + Changed shell loops to make loops. >+ + In case python binary modules are identical (and they are, but they >+ may not be with future versions of the python headers), replace some >+ of them with symbolic links. >+ + Adapted rules to the fact we're installing in only one python package >+ instead of several. >+ * debian/pycompat: Set to 2, for new Python policy. Closes: #373456. >+ * Switching to the new policy avoids necessity to conflict with very old >+ versions of the python bindings packages. Closes: #365057. >+ >+ * debian/libxml2-doc.install: Added the /usr/share/gtk-doc directory. >+ Closes: #375113. >+ * debian/control: Made libxml2-doc suggest devhelper. >+ * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in: Split Libs in Libs and >+ Libs.private. >+ * configure.in, configure: Adapted to fill the variables correctly for >+ libraries. >+ * xml2-config.in, xml2-config.1: Added a --static option to add to --libs >+ so that we can split what is needed when building statically and what is >+ needed when building dynamically. Closes: #374017. >+ * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in, xml2-config.in: Added >+ BASE_THREADS_LIBS to the static link information so that -lpthread would >+ appear. Closes: #372945. >+ * debian/control: Removed dependency on zlib-dev for libxml2-dev. >+ * debian/rules: Add the NEWS file to dh_install calls. Closes: #365596. >+ * debian/watch: Updated. >+ * NEWS: Updated. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 1 Jul 2006 10:45:02 +0200 >+ >+libxml2 (2.6.26.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. >+ * debian/rules: >+ + Added -fno-strict-aliasing to the CFLAGS. >+ + Use dpkg-architecture to feed configure. >+ + Bumped shlibs to current version, since new symbol for XPath cache has >+ been added. >+ * debian/control: Bumped Standards-Version to 3.7.2.0. No changes required. >+ >+ -- Mike Hommey <glandium@debian.org> Thu, 8 Jun 2006 21:39:55 +0200 >+ >+libxml2 (2.6.24.dfsg-1) unstable; urgency=low >+ >+ * New upstream release. Closes: #365246. >+ * debian/control: >+ + Changed libxml2-dbg's priority to extra. >+ + Bumped Standards-Version to 3.7.0.0. No changes required. >+ * debian/rules: bump shlibs to current version, since new symbols were added. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 29 Apr 2006 22:18:14 +0200 >+ >+libxml2 (2.6.23.dfsg.2-3) unstable; urgency=low >+ >+ * debian/rules: Correctly strip python modules. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 18 Mar 2006 19:15:53 +0100 >+ >+libxml2 (2.6.23.dfsg.2-2) unstable; urgency=low >+ >+ * debian/control: Removed python2.2-libxml2 and build-dep on python2.2-dev. >+ Closes: #351125. >+ * doc/xmllint.xml, doc/xmllint.1: Applied patch from upstream cvs. That >+ improves the manual page by many ways. >+ * doc/xmllint.html: Manually updated with changes from the .xml file. >+ * xmllint.c: Don't throw error when failed to load an entity through --path >+ option of xmllint (patch from upstream cvs). Closes: #352634. >+ Thanks Daniel Leidert. >+ >+ -- Mike Hommey <glandium@debian.org> Mon, 20 Feb 2006 10:52:46 +0100 >+ >+libxml2 (2.6.23.dfsg.2-1) unstable; urgency=low >+ >+ * result/, test/: Totally removed. There is more suspicious content than >+ what has been removed in previous upload, so I'm just dropping the >+ regression tests from the archive until all files are investigated. >+ Closes: #331534. >+ * debian/control, debian/rules: Added a libxml2-dbg package containing >+ debug symlbols for the library and the utilities. We don't provide the >+ symbols for the python modules, though. Closes: #296299. >+ * debian/control, debian/compat: Adjust build dependencies and debhelper >+ compatibility accordingly. >+ * debian/libxml2-dbg.dirs: Add /usr/share/doc in the new libxml2-dbg >+ package. >+ >+ -- Mike Hommey <glandium@debian.org> Tue, 31 Jan 2006 20:17:37 +0100 >+ >+libxml2 (2.6.23.dfsg.1-0.1) unstable; urgency=medium >+ >+ * NMU. >+ * Medium urgency due to RC bugfix. >+ * Removed non-free test files from upstream tarball. Closes: #331534. >+ >+ -- Per Olofsson <pelle@debian.org> Sun, 15 Jan 2006 23:02:12 +0100 >+ >+libxml2 (2.6.23-1.1) unstable; urgency=high >+ >+ * Non-maintainer upload. >+ * Fix XML parser to unbreak xsltproc (Closes: #346594). >+ >+ -- Luk Claes <luk@debian.org> Thu, 12 Jan 2006 15:25:42 +0100 >+ >+libxml2 (2.6.23-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/control: >+ + Added | libreadline-dev for readline dependency. >+ + Bumped Standards-Version to 3.6.2.1. No changes needed. >+ * debian/rules: bump shlibs to current version, since new symbols were added. >+ >+ -- Mike Hommey <glandium@debian.org> Fri, 6 Jan 2006 19:03:57 +0100 >+ >+libxml2 (2.6.22-2) unstable; urgency=low >+ >+ * autogen.sh: Changed the way we rebuild the examples. >+ * debian/rules: Added history support in xmllint. Closes: #318083. >+ * debian/control: Added build dependency upon libreadline5-dev for history >+ support in xmllint. >+ * xmllint.c: Added some spaces in usage(). Closes: #335015. >+ * testModule.c: Added PATH_MAX definition for the Hurd. Closes: #333623. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 2 Nov 2005 19:22:41 +0100 >+ >+libxml2 (2.6.22-1) unstable; urgency=low >+ >+ * New upstream release >+ * error.c: Reenable support of validation errors in structured error >+ handler. >+ * autogen.sh: Use automake1.9, as upstream does, and run it. >+ >+ -- Mike Hommey <glandium@debian.org> Tue, 13 Sep 2005 18:04:10 +0200 >+ >+libxml2 (2.6.21-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/control, debian/rules: Removed dummy package. Closes: #322052. >+ * debian/rules: bump shlibs to current version. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 7 Sep 2005 19:11:32 +0200 >+ >+libxml2 (2.6.20-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/rules: bump shlibs to current version. >+ >+ -- Mike Hommey <glandium@debian.org> Thu, 14 Jul 2005 09:42:27 +0200 >+ >+libxml2 (2.6.19-1) unstable; urgency=low >+ >+ * The "Sarge got released but I was offline, so couldn't upload" release. >+ * New upstream release. >+ * debian/rules: bump shlibs to current version. >+ >+ -- Mike Hommey <glandium@debian.org> Fri, 8 Jul 2005 19:29:29 +0200 >+ >+libxml2 (2.6.16-7) unstable; urgency=low >+ >+ * The "dummy packages are arch: all, dammit" release. >+ * debian/control: Changed to Architecture: all for dummy package. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 9 Apr 2005 11:57:29 +0200 >+ >+libxml2 (2.6.16-6) unstable; urgency=low >+ >+ * The "Let's do it cleaner" release. >+ * debian/rules: fix installation of python files and make proper use of >+ DESTDIR at install time. >+ >+ -- Mike Hommey <glandium@debian.org> Mon, 28 Mar 2005 18:12:15 +0200 >+ >+libxml2 (2.6.16-5) unstable; urgency=low >+ >+ * debian/watch: use svn-upgrade instead of uupdate. >+ * debian/control, debian/rules, debian/python-libxml2.*.in: >+ Added support for several python bindings packages. Currently for python >+ 2.2, 2.3 and 2.4. >+ * debian/python2.3-libxml2.*: Removed. >+ >+ -- Mike Hommey <glandium@debian.org> Sun, 27 Mar 2005 21:36:53 +0200 >+ >+libxml2 (2.6.16-4) unstable; urgency=high >+ >+ * Urgency set to high because we avoid breaking packages depending on us >+ when we don't properly bytecompile our python bindings. >+ * debian/rules: Call dh_python. We now get proper maintainer scripts for >+ bytecompiling files at install time and removing them at removal time. >+ Closes: #300834. >+ * debian/control: Adjust build dependencies accordingly. >+ >+ -- Mike Hommey <glandium@debian.org> Tue, 22 Mar 2005 21:56:50 +0100 >+ >+libxml2 (2.6.16-3) unstable; urgency=low >+ >+ * tree.c: Avoid adding namespaced attributes to other elements than element >+ nodes. Closes: #293592. >+ * encoding.c: Fix the comments to describe the real return values of >+ UTF8Toisolat1 and isolat1ToUTF8. >+ * doc/: Regenerate API documentation. >+ >+ -- Mike Hommey <glandium@debian.org> Wed, 16 Feb 2005 20:31:17 +0100 >+ >+libxml2 (2.6.17-1) experimental; urgency=low >+ >+ * New upstream release. >+ >+ -- Mike Hommey <glandium@debian.org> Sat, 5 Feb 2005 13:10:13 +0100 >+ >+libxml2 (2.6.16-2) unstable; urgency=low >+ >+ * Upload to unstable, targetted for sarge. >+ * Changed my maintainer address to the fresh new Debian one. >+ * debian/rules: Added changelog and copyright files in dummy package. >+ * debian/libxml2-doc.doc-base: Fixed files sections. Closes: #281242. >+ >+ -- Mike Hommey <glandium@debian.org> Fri, 4 Feb 2005 20:45:48 +0100 >+ >+libxml2 (2.6.16-1) experimental; urgency=low >+ >+ * New upstream release >+ * debian/control, debian/rules: Changed libxml2-python2.3's name to >+ python2.3-libxml2. Added a dummy package for smooth transition. >+ * debian/libxml2-python2.3.*: Renamed to python2.3-libxml2.*. >+ Closes: #279343. >+ * debian/rules: >+ - Don't install files in the dummy libxml2-python2.3 package. >+ - Bump shlibs to current version. >+ >+ -- Mike Hommey <mh@glandium.org> Sat, 13 Nov 2004 16:38:37 +0900 >+ >+libxml2 (2.6.15-2) experimental; urgency=low >+ >+ * error.c: Removed support of validation errors in structured error handler. >+ That avoids it to crash when a validation error happens. (That was a >+ broken feature added in 2.6.15. This will get properly fixed in 2.6.16). >+ Closes: #279040. >+ >+ -- Mike Hommey <mh@glandium.org> Mon, 8 Nov 2004 22:16:00 +0900 >+ >+libxml2 (2.6.15-1) experimental; urgency=low >+ >+ * New upstream release >+ * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.15)'", since version >+ 2.6.16 introduces some new symbols. >+ >+ -- Mike Hommey <mh@glandium.org> Thu, 28 Oct 2004 19:08:20 +0900 >+ >+libxml2 (2.6.11-5) unstable; urgency=high >+ >+ * Backport patch from libxml2-2.6.15 to fix buffer overflows [nanohttp.c, >+ nanoftp.c, CAN-2004-0989] >+ >+ -- Mike Hommey <mh@glandium.org> Thu, 28 Oct 2004 17:34:54 +0900 >+ >+ >+libxml2 (2.6.14-1) experimental; urgency=low >+ >+ * New upstream release. Closes: #273961. >+ * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.14)'", since version >+ 2.6.14 introduces some new symbols. >+ * debian/shlibs.local: Removed, since it is not useful any more. >+ >+ -- Mike Hommey <mh@glandium.org> Sat, 16 Oct 2004 16:29:06 +0900 >+ >+libxml2 (2.6.11-4) unstable; urgency=low >+ >+ * The "let's do some clean up for sarge" release. >+ * debian/libxml2-python2.3.install: don't install .a and .la files. >+ * debian/rules: Avoid compression of both python examples and documentation. >+ * Reorganization in documentation: >+ + debian/libxml2-doc.examples: removed, they will get installed by >+ libxml2-doc.install, and we don't ship gjob* examples anymore, they >+ have been superseded by a lot of better examples. >+ + debian/libxml2-doc.install, debian/rules: changed the way files are >+ installed in the libxml2-doc package, and their location. >+ + debian/libxml2-doc.doc-base: changed the location of the documentation >+ base to fit the new one. >+ + doc/examples/index.html: generated this file from examples.x?l by >+ hand. It would otherwise require a build dependency on xsltproc, itself >+ depending upon libxml2... wouldn't be very reasonnable. >+ * debian/no-upstream-changelog, debian/rules, debian/libxml2-dev.dirs, >+ debian/libxml2-utils.dirs: /usr/share/doc directories have been replaced >+ by a symbolic link in packages libxml2-utils and libxml2-dev. >+ In libxml2-python2.3, all files but TODO are symlinks to the corresponding >+ file from libxml2. The one from libxml2-doc is replaced by an explicative >+ text saying where to find it and why it has been (re)moved. >+ That will save some space in the archive, especially considering this >+ file is constantly growing. >+ * debian/README.Debian: Added a recommentation to upgrade package if user >+ needs heavy standards compliance. >+ * debian/shlibs.local: Added to tighten dependencies between libxml2-* >+ packages. >+ * xmlIO.c: Fixed typo (Closes: #265740). >+ * nanohttp.c, nanoftp.c: no_proxy environment variable doesn't disable proxy >+ anymore. (Closes: #266430) >+ * debian/rules, debian/control: Removed the workaround to compile with >+ gcc-3.2 on hppa, since $254549 is closed. >+ >+ -- Mike Hommey <mh@glandium.org> Sat, 16 Oct 2004 16:20:54 +0900 >+ >+libxml2 (2.6.11-3) unstable; urgency=low >+ >+ * debian/control: add a space between gcc-3.2 and [hppa]. Closes: #262101. >+ * python/drv_libxml2.py: add encoding declaration. Closes: #259526. >+ * debian/rules: Backup files that are removed or modified by upstream build >+ system and restore them so that calling the clean target actually gives >+ the same tree as before a build. >+ >+ -- Mike Hommey <mh@glandium.org> Sun, 1 Aug 2004 05:02:14 +0900 >+ >+libxml2 (2.6.11-2) unstable; urgency=medium >+ >+ * Thanks to Andreas Metzler: >+ + Hotfix for toolchain breakage (#254549), because libxml2 blocks lots of >+ packages from propagating to testing. Compile with gcc-3.2 on hppa. >+ >+ -- Mike Hommey <mh@glandium.org> Wed, 21 Jul 2004 23:37:22 +0900 >+ >+libxml2 (2.6.11-1) unstable; urgency=low >+ >+ * New upstream release >+ * libxml.m4: removed debian changes which have been incorporated upstream. >+ * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.11)'", since >+ version 2.6.11 introduces some new functions. >+ >+ -- Mike Hommey <mh@glandium.org> Wed, 7 Jul 2004 00:54:50 +0900 >+ >+libxml2 (2.6.10-3) unstable; urgency=low >+ >+ * debian/control: changed deps on libz-dev to zlib1g-dev | libz-dev. >+ * debian/rules: made binary-indep target actually build the libxml2-doc >+ package which is Arch: all. Closes: #251971. >+ >+ -- Mike Hommey <mh@glandium.org> Wed, 2 Jun 2004 15:57:21 +0900 >+ >+libxml2 (2.6.10-2) unstable; urgency=low >+ >+ * debian/watch: updated the watch file to exclude the cvs-snapshot from >+ the scope. Closes: #250177. >+ * debian/rules: rename libxml.m4 to libxml2.m4 in the /usr/share/aclocal >+ directory. >+ * libxml.m4: removed the AM_PATH_XML macro which is a macro for checking >+ libxml, not libxml2. Changed CFLAGS to CPPFLAGS from test compiles so >+ that using C++ also works. Closes: #249033. >+ >+ -- Mike Hommey <mh@glandium.org> Wed, 26 May 2004 21:28:54 +0900 >+ >+libxml2 (2.6.10-1) unstable; urgency=low >+ >+ * New upstream release: >+ + Fixes xincludes fallback issues. Closes: #243580. >+ + Fixes output formatting issues. Closes: #246181. >+ * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.10)'", since >+ version 2.6.10 introduces some few new functions. >+ >+ -- Mike Hommey <mh@glandium.org> Mon, 17 May 2004 17:16:44 +0900 >+ >+libxml2 (2.6.9-2) unstable; urgency=low >+ >+ * Enable AM_MAINTAINER_MODE and re-run the autotools suite. >+ Closes: #245990. >+ >+ -- Mike Hommey <mh@glandium.org> Tue, 27 Apr 2004 16:31:21 +0900 >+ >+libxml2 (2.6.9-1) unstable; urgency=high >+ >+ * New upstream release: >+ + xincludes fallbacks fixed. Closes: #243580. >+ * Urgency set to high because of RC bug fixed and it's been too long >+ libxml2 has been stucking packages in sid. >+ * Ran all the autotools suite, especially the latest libtool. >+ Closes: #244557. >+ * debian/rules: >+ + Removed all python file removals since these files get now >+ correctly removed upstream. >+ + Changed once more the python/libxml2-py.c workaround to finally >+ work really properly. >+ >+ -- Mike Hommey <mh@glandium.org> Mon, 19 Apr 2004 17:58:56 +0900 >+ >+libxml2 (2.6.8-2) unstable; urgency=high >+ >+ * Urgency set to high because of the FTBFS RC bug fixed. >+ * debian/changelog: >+ + Added missing changes for release 2.6.8-1. >+ + Converted changelog file to UTF-8. >+ * debian/rules: Changed the python/libxml2-py.c workaround stuff to >+ actually work properly >+ >+ -- Mike Hommey <mh@glandium.org> Sat, 17 Apr 2004 16:59:01 +0000 >+ >+libxml2 (2.6.8-1.1) unstable; urgency=high >+ >+ * NMU. Urgency set to high as libxml2 has been preventing too many packages >+ from entering testing for too long. >+ * Grabbed from SVN: >+ Mike Hommey <mh@glandium.org> Sat, 10 Apr 2004 12:42:03 +0900 >+ * debian/control: >+ + Updated section for libxml2-doc package. >+ + Added dependency on libz-dev for libxml2-dev. (Closes: #242683) >+ >+ -- J.H.M. Dassen (Ray) <jdassen@debian.org> Fri, 16 Apr 2004 22:37:08 +0200 >+ >+libxml2 (2.6.8-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/rules: >+ + Use "dh_makeshlibs -V 'libxml2 (>= 2.6.8)'", since version 2.6.8 >+ introduces some few new functions. >+ + Try to circumvent new troubles with the python/libxml2-py.c with >+ svn-buildpackage not wanting to make the build (the file used to >+ be removed because it was modified by the build). >+ * Removed changes about XML_CATALOG_FILES in manual pages, since it has >+ been incorporated upstream. >+ >+ -- Mike Hommey <mh@glandium.org> Thu, 25 Mar 2004 14:57:44 +0900 >+ >+libxml2 (2.6.7-2) unstable; urgency=low >+ >+ * debian/control: Changed Maintainer to Debian SGML/XML Group and >+ put myself into Uploaders. >+ * Merged back libxml2-headers into libxml2-dev. That was too much of >+ a split. Closes: #238109. >+ >+ -- Mike Hommey <mh@glandium.org> Mon, 22 Mar 2004 15:41:30 +0900 >+ >+libxml2 (2.6.7-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.7)'", since >+ version 2.6.7 introduces some few new functions. >+ >+ -- Mike Hommey <mh@glandium.org> Wed, 25 Feb 2004 15:43:11 +0900 >+ >+libxml2 (2.6.6-2) unstable; urgency=low >+ >+ * debian/control: >+ + Added a Recommends: xml-core to libxml2 package. >+ + Added a libxml2-headers and a libxml2-docs packages to split >+ arch-dependent and arch-independent files. These files used to be >+ in the libxml2-dev package. Note that the new libxml2-dev package >+ depends on libxml2-headers, so that upgrade will keep the header >+ files on the system, but libxml2-headers only suggests libxml2-doc, >+ while libxml2-dev doesn't say anything about it, which means that >+ the documentation files won't be automagically installed on your >+ system. Closes: #233405. >+ + Added the adequate dependencies between new and old packages. >+ + Uniformized short descriptions. >+ + Slightly modified long descriptions. >+ * debian/rules: >+ + Externalized all dh_* calls with arguments. (i.e. created >+ corresponding debian/package.dh_stuff files) >+ + Moved installation of some doc files to the install target. >+ * Removed un-needed debian/libxml2-python2.3.docs. >+ * Moved libxml manpage from libxml2 to libxml2-dev. >+ * doc/xmlcatalog_man.xml: Added a note about the incompatibility between >+ xmlcatalog and update-catalog from xml-core in the man page. >+ * doc/xmllint.xml, doc/xmlcatalog_man.xml: Added a note about the >+ XML_CATALOG_FILES environment variable. Closes: #232728. >+ >+ -- Mike Hommey <mh@glandium.org> Wed, 18 Feb 2004 21:29:58 +0900 >+ >+libxml2 (2.6.6-1) unstable; urgency=high >+ >+ * New upstream release >+ * Set urgency to high, since this new upstream fixes buffer overflows. >+ Closes: #232447. >+ * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.6.6)'", since >+ version 2.6.6 introduces some new functions. >+ >+ -- Mike Hommey <mh@glandium.org> Mon, 16 Feb 2004 16:56:57 +0900 >+ >+libxml2 (2.6.5-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/rules: >+ - Made better use of CFLAGS. >+ - Replaced an mv by cp -r. Closes: #227392. >+ - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.5)'", since version 2.6.5 >+ introduced some new functions. >+ - Make some clean-up in the example directory. >+ >+ -- Mike Hommey <mh@glandium.org> Fri, 30 Jan 2004 15:14:02 +0900 >+ >+libxml2 (2.6.4-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Mike Hommey <mh@glandium.org> Sat, 27 Dec 2003 18:25:17 +0900 >+ >+libxml2 (2.6.3-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/rules: >+ - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.3)'", since versions 2.6.3 >+ introduced some new functions. >+ - Put more examples in /usr/share/doc/libxml2-dev/examples. >+ >+ -- Mike Hommey <mh@glandium.org> Fri, 12 Dec 2003 14:45:24 +0900 >+ >+libxml2 (2.6.2-1) unstable; urgency=low >+ >+ * New upstream release >+ * debian/rules: >+ - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.2)'", since versions 2.6.2 >+ introduced some new functions. >+ - Put the API docs back in /usr/share/doc/libxml2-dev/libxml-dev.html. >+ >+ -- Mike Hommey <mh@glandium.org> Mon, 10 Nov 2003 22:20:33 +0900 >+ >+libxml2 (2.6.1-1) experimental; urgency=low >+ >+ * New upstream release >+ >+ -- Mike Hommey <mh@glandium.org> Wed, 29 Oct 2003 14:07:11 +0900 >+ >+libxml2 (2.6.0-1) experimental; urgency=low >+ >+ * New upstream release: should be API and ABI compatible but got a lot >+ of changes. >+ * debian/rules: >+ - Use "dh_makeshlibs -V 'libxml2 (>= 2.6.0)'", since applications >+ using the new API won't work on previous versions. >+ Note that this doesn't prevent applications built with older versions >+ to work properly with newer releases, since it is not supposed to be >+ any API/ABI breakage. >+ - Don't remove non-existant python/test/tmp.xml file on clean rule. >+ - Remove python/libxml2-py.c file on clean rule, to avoid its changes >+ made during build to be stored in the diff file. >+ - Added handling of the nostrip DEB_BUILD_OPTIONS. >+ - Changed old fashion dh_movefiles to dh_install --sourcedir=debian/tmp. >+ - Added installation of the python/TODO file in the libxml2-python2.3 >+ package. >+ - Now take what is installed in debian/tmp/usr/share/doc/... for >+ documentation. >+ - Copy Copyright file into COPYING file in clean rule to avoid >+ unrepresentable changes to source. >+ * debian/*.files: renamed to debian/*.install. >+ * debian/libxml2.install: removed reference to non-existant >+ usr/lib/libxml.so.* >+ * Removed unneeded debian/libxml2-dev.dirs file. >+ >+ -- Mike Hommey <mh@glandium.org> Tue, 21 Oct 2003 14:07:04 +0900 >+ >+libxml2 (2.5.11-2) unstable; urgency=low >+ >+ * debian/rules: Use "dh_makeshlibs -V 'libxml2 (>= 2.5.9)'", since >+ versions 2.5.8 and 2.5.9 introduced some changes in API. >+ Closes: #212819, #211318. >+ >+ -- Mike Hommey <mh@glandium.org> Sun, 28 Sep 2003 21:57:32 +0200 >+ >+libxml2 (2.5.11-1) unstable; urgency=low >+ >+ * New upstream release. >+ * New maintainer. >+ * Bumped Standards-Version to 3.6.1 (no changes needed). >+ * Removed garbage debian/libxml-utils. >+ * moved debhelper compatibility to debian/compat. >+ >+ -- Mike Hommey <mh@glandium.org> Sun, 14 Sep 2003 16:03:46 +0200 >+ >+libxml2 (2.5.10-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 26 Aug 2003 20:08:31 +0200 >+ >+libxml2 (2.5.8-2) unstable; urgency=low >+ >+ * Use python 2.3 (closes: #205145) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Wed, 13 Aug 2003 21:28:14 +0200 >+ >+libxml2 (2.5.8-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 7 Aug 2003 20:08:23 +0200 >+ >+libxml2 (2.5.7-1) unstable; urgency=low >+ >+ * New upstream release (closes: #194757) >+ * Updated shlibs file (closes: #191022) >+ * Put xmllint and xmlcatalog in new package (closes: #174823) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 26 May 2003 20:16:01 +0200 >+ >+libxml2 (2.5.6-2) unstable; urgency=low >+ >+ * Update libtool (closes: #188967) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 14 Apr 2003 20:52:45 +0200 >+ >+libxml2 (2.5.6-1) unstable; urgency=low >+ >+ * New upstream release (closes: #188004) >+ * Applied patch from Graham Wilson <bob@decoy.wox.org> to handle >+ noopt build option. (closes: #171782) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 12 Apr 2003 20:54:13 +0200 >+ >+libxml2 (2.5.4-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Fri, 14 Mar 2003 18:40:08 +0100 >+ >+libxml2 (2.5.3-1.1) unstable; urgency=high >+ >+ * Applied patch by Paul Hampson <Paul.Hampson@anu.edu.au> to correct >+ licensing information in debian/copyright which Colin Watson reported >+ as incorrect. (Addresses #178060 for sid) >+ >+ -- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 16 Mar 2003 09:55:59 +0100 >+ >+libxml2 (2.5.3-1) unstable; urgency=low >+ >+ * New upstream release >+ * xml2-config --libs should be correct (closes: #155312) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 22 Feb 2003 17:34:23 +0100 >+ >+libxml2 (2.5.1-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 18 Jan 2003 10:52:56 +0100 >+ >+libxml2 (2.5.0-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 7 Jan 2003 19:02:10 +0100 >+ >+libxml2 (2.4.30-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 14 Dec 2002 16:55:13 +0100 >+ >+libxml2 (2.4.28-2) unstable; urgency=low >+ >+ * Upgraded libtool (closes: #172418) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 1 Dec 2002 15:59:49 +0100 >+ >+libxml2 (2.4.28-1) unstable; urgency=low >+ >+ * New upstream release >+ * Added patch from CVS to fix KDE problems. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 26 Nov 2002 19:58:54 +0100 >+ >+libxml2 (2.4.27-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 18 Nov 2002 21:05:07 +0100 >+ >+libxml2 (2.4.26-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Fri, 15 Nov 2002 17:29:30 +0100 >+ >+libxml2 (2.4.24-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 24 Aug 2002 22:28:24 +0200 >+ >+libxml2 (2.4.23-2) unstable; urgency=low >+ >+ * Created new libxml2-python package >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 30 Jul 2002 20:16:17 +0200 >+ >+libxml2 (2.4.23-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 8 Jul 2002 00:20:43 +0200 >+ >+libxml2 (2.4.22-1) unstable; urgency=low >+ >+ * New upstream release (closes: #149287) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Fri, 7 Jun 2002 19:43:21 +0200 >+ >+libxml2 (2.4.21-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Fri, 10 May 2002 18:40:02 +0200 >+ >+libxml2 (2.4.20-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 23 Apr 2002 22:13:37 +0200 >+ >+libxml2 (2.4.19-4) unstable; urgency=low >+ >+ * Make libxml2-dev replace libxml2 <= 2.4.19-1 (closes: #142609, #142741) >+ * Update shlibs version to 2.4.19-4 (closes: #142806) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 14 Apr 2002 12:19:51 +0200 >+ >+libxml2 (2.4.19-3) unstable; urgency=low >+ >+ * Dont use threads for now (closes: #142596) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 13 Apr 2002 15:53:04 +0200 >+ >+libxml2 (2.4.19-2) unstable; urgency=low >+ >+ * Move pkgconfig stuff to -dev package (closes: #142171) >+ * Compile with thread support (closes: #141764) >+ * xml2-config --cflags will return same paths as previous versions >+ (closes: #142229) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Fri, 12 Apr 2002 18:21:48 +0200 >+ >+libxml2 (2.4.19-1) unstable; urgency=low >+ >+ * New upstream release >+ * Fixed doc-base (closes: #141067) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Wed, 3 Apr 2002 19:45:33 +0200 >+ >+libxml2 (2.4.16-2) unstable; urgency=low >+ >+ * New version as last version was built with broken debhelper. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 26 Feb 2002 22:28:24 +0100 >+ >+libxml2 (2.4.16-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 23 Feb 2002 20:21:34 +0100 >+ >+libxml2 (2.4.13-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 15 Jan 2002 20:02:53 +0100 >+ >+libxml2 (2.4.12-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 8 Dec 2001 22:52:44 +0100 >+ >+libxml2 (2.4.10-1) unstable; urgency=low >+ >+ * New upstream release >+ * Applied patch from LaMont Jones <lamont@smallone.fc.hp.com> to fix >+ gcc 3.0 build problem (closes: #120254) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 20 Nov 2001 18:02:29 +0100 >+ >+libxml2 (2.4.8-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 5 Nov 2001 19:49:26 +0100 >+ >+libxml2 (2.4.6-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 18 Oct 2001 19:48:07 +0200 >+ >+libxml2 (2.4.5-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 15 Sep 2001 23:11:11 +0200 >+ >+libxml2 (2.4.3-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 27 Aug 2001 20:32:21 +0200 >+ >+libxml2 (2.4.2-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 21 Aug 2001 20:39:44 +0200 >+ >+libxml2 (2.4.1-1) unstable; urgency=low >+ >+ * New upstream release >+ * Added ncurses and readline build depends. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 24 Jul 2001 21:08:16 +0200 >+ >+libxml2 (2.4.0-2) unstable; urgency=low >+ >+ * xml2-config --libs only outputs -lxml2 (closes: #97739) >+ * Patched libxml.m4 to include string.h >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Wed, 18 Jul 2001 13:44:10 +0200 >+ >+libxml2 (2.4.0-1) unstable; urgency=low >+ >+ * New upstream release (closes: #105568) >+ * Fixed xml2-config to not output -I/usr/include, -L/usr/lib >+ (closes: #101390) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 17 Jul 2001 12:43:34 +0200 >+ >+libxml2 (2.3.13-3.1) unstable; urgency=low >+ >+ * NMU (for porting) >+ * Change configure / configure.in to not specify -I/usr/include >+ (closes: #104603) >+ >+ -- Matthew Wilcox <willy@debian.org> Fri, 13 Jul 2001 17:08:36 -0600 >+ >+libxml2 (2.3.13-3) unstable; urgency=low >+ >+ * Don't build example (closes: #103220, #103281) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 3 Jul 2001 16:13:31 +0200 >+ >+libxml2 (2.3.13-2) unstable; urgency=low >+ >+ * xmllint is back >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 2 Jul 2001 21:05:25 +0200 >+ >+libxml2 (2.3.13-1) unstable; urgency=low >+ >+ * New upstream release >+ * Use DH_COMPAT 3 >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 1 Jul 2001 17:37:08 +0200 >+ >+libxml2 (2.3.11-1) unstable; urgency=low >+ >+ * New upstream release >+ * Apparently builds on Alpha now (closes: #95938) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 17 Jun 2001 21:33:36 +0200 >+ >+libxml2 (2.3.10-2) unstable; urgency=low >+ >+ * Quick hack to fix makefiles on m68k (closes: #99897) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 11 Jun 2001 14:51:14 +0200 >+ >+libxml2 (2.3.10-1) unstable; urgency=low >+ >+ * New upstream release >+ * Leave pkgconfig as someone wants it (closes: #97621) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 3 Jun 2001 22:02:25 +0200 >+ >+libxml2 (2.3.9-1) unstable; urgency=low >+ >+ * I am back. Some bugs closed by NMUs (closes: #96944, #86508) >+ * Updated libtool (closes: #98137) >+ * Fixed dependency (closes: #98323) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 2 Jun 2001 16:37:18 +0200 >+ >+libxml2 (2.3.9-0.1) unstable; urgency=low >+ >+ * NMU of a new upstream release. >+ * Changed shlibs, they should change every time the API is augmented. >+ * Updated xmllint(1) manpage. Removed useless libxml(4) manpage. >+ >+ -- Nicolás Lichtmaier <nick@debian.org> Sun, 20 May 2001 20:25:02 -0300 >+ >+libxml2 (2.3.8-0.2) unstable; urgency=low >+ >+ * Non-maintainer upload with permission from maintainer to fix the >+ libxml-dev conflict. >+ * The symbolic links to old, libxml-dev names introduced in 2.3.0-1 are >+ now gone: programs wanting to link with libxml2 should explicity call >+ the new libxml2-config (almost all the packages in debian are already >+ doing that.) >+ * Changed libxml-dev to libxml2-dev in debian/libxml2-dev.doc-base to >+ resolve libxml-dev conflict. >+ * Fixed shlibs problem introduced in previous NMU by wrong -V argument >+ of dh_makeshlibs. >+ >+ -- Federico Di Gregorio <fog@debian.org> Thu, 10 May 2001 16:37:59 +0200 >+ >+libxml2 (2.3.8-0.1) unstable; urgency=low >+ >+ * Non-maintainer upload with permission from maintainer >+ * New upstream release >+ * Fixes shlibs version info (closes: #96291) >+ * config.sub & config.guess updated (closes: #96100) >+ >+ -- Jeremy T. Bouse <jbouse@debian.org> Wed, 9 May 2001 22:57:28 -0700 >+ >+libxml2 (2.3.7-1) unstable; urgency=low >+ >+ * New upstream release (closes: #95692) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 29 Apr 2001 11:42:54 +0200 >+ >+libxml2 (2.3.5-2) unstable; urgency=low >+ >+ * Rebuild to avoid link problems (closes: #92721) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 3 Apr 2001 16:12:20 +0200 >+ >+libxml2 (2.3.5-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 25 Mar 2001 10:58:21 +0200 >+ >+libxml2 (2.3.4-1) unstable; urgency=low >+ >+ * New upstream release >+ * Applied IBM S/390 patch on config.sub (closes: #88551) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 15 Mar 2001 19:49:17 +0100 >+ >+libxml2 (2.3.3-2) unstable; urgency=low >+ >+ * Updated shlibs file with dependency (closes: #87337) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 8 Mar 2001 10:26:46 +0100 >+ >+libxml2 (2.3.3-1) unstable; urgency=low >+ >+ * New upstream release >+ * Fixed xml2Conf.sh so gnome-config works (closes: #88341) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 3 Mar 2001 16:53:05 +0100 >+ >+libxml2 (2.3.2-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 1 Mar 2001 09:46:37 +0100 >+ >+libxml2 (2.3.1-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 20 Feb 2001 09:44:04 +0100 >+ >+libxml2 (2.3.0-1) unstable; urgency=low >+ >+ * New upstream release (closes: #86379) >+ For some reason the library has changed name from libxml to libxml2 and >+ the config script from libxml-config to libxml2-config. I am providing >+ symbolic links to the old names, hopefully this will prevent stuff from >+ breaking. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 17 Feb 2001 23:25:43 +0100 >+ >+libxml2 (2.2.8-1) unstable; urgency=low >+ >+ * New upstream release >+ * Probably a bad idea to remove -lz so put it back and add dependency on >+ libz-dev in dev-package. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 20 Nov 2000 14:03:34 +0100 >+ >+libxml2 (2.2.6-1) unstable; urgency=low >+ >+ * New upstream release >+ * Removed -lz from xml-config --libs (closes: #74709) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Fri, 27 Oct 2000 12:47:57 +0200 >+ >+libxml2 (2.2.4-1) unstable; urgency=low >+ >+ * New upstream release (closes: #74488, #70051) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Wed, 11 Oct 2000 07:26:31 +0200 >+ >+libxml2 (2.2.2-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 29 Aug 2000 22:55:43 +0200 >+ >+libxml2 (2.2.1-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 3 Aug 2000 21:28:29 +0200 >+ >+libxml2 (2.0.0-3) unstable; urgency=low >+ >+ * Doc-base now uses correct directory >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Mon, 3 Jul 2000 09:20:23 +0200 >+ >+libxml2 (2.0.0-2) unstable; urgency=low >+ >+ * Renamed dev-package to libxml2-dev >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Wed, 28 Jun 2000 10:48:48 +0200 >+ >+libxml2 (2.0.0-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 20 Jun 2000 11:36:12 +0200 >+ >+libxml (1.8.7-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 11 Mar 2000 20:33:28 +0100 >+ >+libxml (1.8.6-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 5 Feb 2000 15:01:51 +0100 >+ >+libxml (1.8.5-1) unstable; urgency=low >+ >+ * New upstream release (closes: #56172) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 25 Jan 2000 14:57:12 +0100 >+ >+libxml (1.8.4-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 16 Jan 2000 13:01:14 +0100 >+ >+libxml (1.8.2-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 30 Dec 1999 11:38:47 +0100 >+ >+libxml (1.7.3-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Wed, 29 Sep 1999 23:33:28 +0200 >+ >+libxml (1.4.0-4) unstable; urgency=low >+ >+ * Oops, must of course replace old libxml0 package. (closes: #43519) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 26 Aug 1999 09:37:18 +0200 >+ >+libxml (1.4.0-3) unstable; urgency=low >+ >+ * Provide libxml.so.0 (which is binary compatible with libxml1) >+ (closes: #43385) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 24 Aug 1999 09:31:15 +0200 >+ >+libxml (1.4.0-2) unstable; urgency=low >+ >+ * Include example in dev-package. >+ * Fixed postinst to only call ldconfig on configure. >+ * Let dh_installdocs handle doc-base. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 21 Aug 1999 14:44:52 +0200 >+ >+libxml (1.4.0-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 5 Aug 1999 16:05:26 +0200 >+ >+libxml (1.1.0-2) unstable; urgency=low >+ >+ * Added man page for xml-config. (closes: #39471) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sat, 3 Jul 1999 14:55:55 +0200 >+ >+libxml (1.1.0-1) unstable; urgency=low >+ >+ * New upstream release. (closes: #39791) >+ * Use install-docs on dev documents. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 20 Jun 1999 10:20:53 +0200 >+ >+libxml (1.0.0-2) unstable; urgency=low >+ >+ * Moved html-documentation to dev package. (closes: #39049) >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 15 Jun 1999 21:07:44 +0200 >+ >+libxml (1.0.0-1) unstable; urgency=low >+ >+ * Patched xml-config.in. xml-config --version didn't work as expected. >+ Fixes bug #34881. >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Tue, 16 Mar 1999 18:36:11 +0100 >+ >+libxml (0.99.8-1) unstable; urgency=low >+ >+ * New upstream release >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Thu, 18 Feb 1999 15:40:19 +0100 >+ >+libxml (0.99.3-2) unstable; urgency=low >+ >+ * New maintainer. >+ * Some files were missing from the last release (xml-config, encoding.h, >+ debugXML.h) >+ * New rules file. >+ >+ -- Fredrik Hallenberg <hallon@debian.org> Sun, 14 Feb 1999 18:56:10 +0100 >+ >+libxml (0.99.3-1) unstable; urgency=low >+ >+ * New upstream version. >+ * Recompile with lastest GNOME libs. >+ * Fix #28869. >+ >+ -- Vincent Renardias <vincent@waw.com> Wed, 20 Jan 1999 11:32:55 +0100 >+ >+libxml (0.30-1) unstable; urgency=low >+ >+ * Initial debianization. >+ >+ -- Vincent Renardias <vincent@waw.com> Fri, 25 Sep 1998 19:16:53 +0200 >--- libxml2-2.7.8.dfsg.orig/debian/rules >+++ libxml2-2.7.8.dfsg/debian/rules >@@ -0,0 +1,121 @@ >+#!/usr/bin/make -f >+ >+# The versions of python currently supported >+PYVERS=$(shell pyversions -s) >+# The current default version of python >+PYVER=$(shell pyversions -d) >+ >+CFLAGS = -Wall -g >+ >+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) >+ CFLAGS += -O0 >+else >+ CFLAGS += -O2 -fno-strict-aliasing >+endif >+ >+TARGETS := main $(PYVERS) $(PYVERS:%=%-dbg) >+ >+WITH_UDEB := $(shell dpkg-vendor --derives-from Ubuntu && echo yes) >+ >+ifdef WITH_UDEB >+$(if $(shell grep -q libxml2-udeb debian/control || echo yes),$(shell cat debian/control.udeb >> debian/control)) >+TARGETS += udeb >+else >+$(if $(shell grep -q libxml2-udeb debian/control && echo yes),$(shell sed -i /libxml2-udeb/,\$$d debian/control)) >+export DH_OPTIONS = -Nlibxml2-udeb >+endif >+ >+CONFIGURE_FLAGS := --with-history CC="gcc -Wl,--as-needed" CFLAGS="$(CFLAGS)" --cache-file="$(CURDIR)/build/config.cache" >+ >+override_dh_auto_configure: $(TARGETS:%=configure-%) >+ >+configure-%: >+ dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS) >+ >+configure-main: CONFIGURE_FLAGS += --without-python >+configure-python%: CONFIGURE_FLAGS += --with-python=/usr/bin/$* >+configure-udeb: CONFIGURE_FLAGS += --without-history --with-minimum --with-tree --with-output >+ >+override_dh_auto_build: $(TARGETS:%=build-%) >+ >+build-%: BUILD_DIR=build/$* >+build-%: >+ $(if $(filter $(BUILD_DIR),build/$*),,[ -d $(BUILD_DIR) ] || mv build/$*/python $(BUILD_DIR)) >+ dh_auto_build --builddirectory=$(BUILD_DIR) -- $(BUILD_FLAGS) >+ >+build-python%: BUILD_DIR=build/main/$* >+build-python%: BUILD_FLAGS = libxml2mod_la_LIBADD='$$(mylibs)' >+build-python%-dbg: BUILD_FLAGS += PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) LDFLAGS="-L$(CURDIR)/debian/tmp/usr/lib" CFLAGS="-Wall -g -O0" >+ >+override_dh_auto_clean: >+ rm -rf build debian/tmp-dbg >+ >+ -test -r /usr/share/misc/config.sub && \ >+ cp -f /usr/share/misc/config.sub config.sub >+ -test -r /usr/share/misc/config.guess && \ >+ cp -f /usr/share/misc/config.guess config.guess >+ >+override_dh_auto_install: $(TARGETS:%=install-%) >+ >+install-main: >+ dh_auto_install --builddirectory=build/main >+ mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4 >+ >+ # Properly install documentation in /usr/share/doc/libxml2-doc >+ install -d debian/tmp/usr/share/doc/libxml2-doc/examples >+ install -m 644 \ >+ doc/*.html \ >+ doc/*.gif \ >+ doc/*.png \ >+ doc/libxml2-api.xml debian/tmp/usr/share/doc/libxml2-doc >+ install -m 644 \ >+ doc/examples/*.c \ >+ doc/examples/*.res \ >+ doc/examples/index.html \ >+ doc/examples/[tw]*.xml debian/tmp/usr/share/doc/libxml2-doc/examples >+ cp -a \ >+ doc/html \ >+ doc/tutorial debian/tmp/usr/share/doc/libxml2-doc >+ >+install-python%-dbg: >+ $(MAKE) -C build/main/python$*-dbg DESTDIR=$(CURDIR)/debian/tmp-dbg install-pythonLTLIBRARIES >+ prename 's/(?<!_d)\.so$$/_d.so/' debian/tmp-dbg/usr/lib/python$*/*-packages/*.so >+ >+install-python%: >+ dh_auto_install --builddirectory=build/main/python$* >+ >+install-udeb: >+ dh_auto_install --builddirectory=build/udeb --destdir=debian/tmp-udeb >+ >+override_dh_installdocs: >+ dh_installdocs -A AUTHORS TODO README NEWS >+ dh_installdocs -ppython-libxml2 python/TODO >+ >+override_dh_compress: >+ dh_compress -Xexamples/ -Xtutorial/ -Xhtml/ -X.html >+ >+override_dh_installchangelogs: >+ dh_installchangelogs -plibxml2 ChangeLog >+ dh_installchangelogs -Nlibxml2 -XChangeLog >+ >+override_dh_install: >+ dh_install -Npython-libxml2-dbg -Nlibxml2-udeb >+ dh_install -ppython-libxml2-dbg --sourcedir=debian/tmp-dbg >+ dh_install -plibxml2-udeb --sourcedir=debian/tmp-udeb >+ sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la >+ >+override_dh_strip: >+ dh_strip -a --dbg-package=libxml2-dbg -Npython-libxml2 -Npython-libxml2-dbg >+ dh_strip -ppython-libxml2 --dbg-package=python-libxml2-dbg >+ $(foreach python, $(filter-out $(PYVER), $(PYVERS)),\ >+ cd $(CURDIR)/debian/python-libxml2/usr/lib/pyshared; \ >+ if diff $(python)/libxml2mod.so $(PYVER)/libxml2mod.so > /dev/null 2>&1; then \ >+ rm -f $(python)/libxml2mod.so; \ >+ ln -s ../$(PYVER)/libxml2mod.so $(python)/libxml2mod.so; \ >+ fi;) >+ >+override_dh_makeshlibs: >+ dh_makeshlibs -a $(if $(WITH_UDEB),--add-udeb=libxml2-udeb )-V 'libxml2 (>= 2.7.4)' -- -c4 >+ >+%: >+ dh $@ >--- libxml2-2.7.8.dfsg.orig/debian/python-libxml2-dbg.preinst >+++ libxml2-2.7.8.dfsg/debian/python-libxml2-dbg.preinst >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+set -e >+ >+[ "$1" = "upgrade" ] && >+[ -L /usr/share/doc/python-libxml2-dbg ] && >+rm -f /usr/share/doc/python-libxml2-dbg >+ >+#DEBHELPER# >+ >+exit 0 >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-udeb.install >+++ libxml2-2.7.8.dfsg/debian/libxml2-udeb.install >@@ -0,0 +1 @@ >+usr/lib/libxml2.so.* >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-utils.install >+++ libxml2-2.7.8.dfsg/debian/libxml2-utils.install >@@ -0,0 +1,2 @@ >+usr/bin/xmllint >+usr/bin/xmlcatalog >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-dev.preinst >+++ libxml2-2.7.8.dfsg/debian/libxml2-dev.preinst >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+set -e >+ >+[ "$1" = "upgrade" ] && >+[ -L /usr/share/doc/libxml2-dev ] && >+rm -f /usr/share/doc/libxml2-dev >+ >+#DEBHELPER# >+ >+exit 0 >--- libxml2-2.7.8.dfsg.orig/debian/control.udeb >+++ libxml2-2.7.8.dfsg/debian/control.udeb >@@ -0,0 +1,15 @@ >+Package: libxml2-udeb >+XC-Package-Type: udeb >+Architecture: any >+Section: debian-installer >+Depends: ${shlibs:Depends}, ${misc:Depends} >+Description: GNOME XML library - minimal runtime >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ This is a minimal package for use in debian-installer that yields a >+ library providing an extensive API to handle such XML data files. >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-doc.doc-base >+++ libxml2-2.7.8.dfsg/debian/libxml2-doc.doc-base >@@ -0,0 +1,10 @@ >+Document: libxml2-doc >+Title: Reference manual for the libxml2. >+Author: Daniel Veillard >+Abstract: This manual describes the functions available in libxml2. >+Section: Programming >+ >+Format: HTML >+Index: /usr/share/doc/libxml2-doc/index.html >+Files: /usr/share/doc/libxml2-doc/*.html >+ /usr/share/doc/libxml2-doc/*/*.html >--- libxml2-2.7.8.dfsg.orig/debian/python-libxml2.install >+++ libxml2-2.7.8.dfsg/debian/python-libxml2.install >@@ -0,0 +1,2 @@ >+usr/lib/python*/*-packages/*.py* >+usr/lib/python*/*-packages/*.so >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-dev.manpages >+++ libxml2-2.7.8.dfsg/debian/libxml2-dev.manpages >@@ -0,0 +1,2 @@ >+libxml.3 >+xml2-config.1 >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-dev.install >+++ libxml2-2.7.8.dfsg/debian/libxml2-dev.install >@@ -0,0 +1,7 @@ >+usr/bin/xml2-config >+usr/lib/libxml2.so >+usr/lib/libxml2.a >+usr/lib/xml2Conf.sh >+usr/share/aclocal >+usr/lib/pkgconfig >+usr/include/libxml2 >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-dev.dirs >+++ libxml2-2.7.8.dfsg/debian/libxml2-dev.dirs >@@ -0,0 +1 @@ >+/usr/share/doc >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-dbg.preinst >+++ libxml2-2.7.8.dfsg/debian/libxml2-dbg.preinst >@@ -0,0 +1,11 @@ >+#!/bin/sh >+ >+set -e >+ >+[ "$1" = "upgrade" ] && >+[ -L /usr/share/doc/libxml2-dbg ] && >+rm -f /usr/share/doc/libxml2-dbg >+ >+#DEBHELPER# >+ >+exit 0 >--- libxml2-2.7.8.dfsg.orig/debian/libxml2.install >+++ libxml2-2.7.8.dfsg/debian/libxml2.install >@@ -0,0 +1 @@ >+usr/lib/libxml2.so.* >--- libxml2-2.7.8.dfsg.orig/debian/control >+++ libxml2-2.7.8.dfsg/debian/control >@@ -0,0 +1,127 @@ >+Source: libxml2 >+Priority: optional >+Section: libs >+Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org> >+Uploaders: Mike Hommey <glandium@debian.org> >+Standards-Version: 3.9.0.0 >+Build-Depends: debhelper (>= 7.0.50~), zlib1g-dev | libz-dev, python-all-dev (>= 2.3.5-11), python-all-dbg, python-support (>= 0.3), autotools-dev, libreadline-dev | libreadline5-dev, binutils (>= 2.14.90.0.7), dpkg-dev (>= 1.14.9), perl >+Homepage: http://xmlsoft.org/ >+Vcs-Git: git://git.debian.org/debian-xml-sgml/libxml2.git >+Vcs-Browser: http://git.debian.org/?p=debian-xml-sgml/libxml2.git >+ >+Package: libxml2 >+Priority: standard >+Architecture: any >+Section: libs >+Depends: ${shlibs:Depends}, ${misc:Depends} >+Recommends: xml-core >+Description: GNOME XML library >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ This package provides a library providing an extensive API to handle >+ such XML data files. >+ >+Package: libxml2-utils >+Architecture: any >+Section: text >+Depends: ${shlibs:Depends}, ${misc:Depends} >+Description: XML utilities >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ This package provides xmllint, a tool for validating and reformatting >+ XML documents, and xmlcatalog, a tool to parse and manipulate XML or >+ SGML catalog files. >+ >+Package: libxml2-dev >+Architecture: any >+Section: libdevel >+Depends: libxml2 (= ${binary:Version}), ${misc:Depends} >+Description: Development files for the GNOME XML library >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ Install this package if you wish to develop your own programs using >+ the GNOME XML library. >+ >+Package: libxml2-dbg >+Architecture: any >+Section: debug >+Priority: extra >+Depends: libxml2 (= ${binary:Version}), ${misc:Depends} >+Description: Debugging symbols for the GNOME XML library >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ This package provides the debugging symbols for the library and for >+ the utilities provided by the libxml2-utils package. >+ Debugging symbols for the Python modules are not available. >+ >+Package: libxml2-doc >+Architecture: all >+Section: doc >+Depends: ${misc:Depends} >+Suggests: devhelp >+Description: Documentation for the GNOME XML library >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ This package contains general information about the GNOME XML library >+ and more specific API references. >+ >+Package: python-libxml2 >+Architecture: any >+Section: python >+Provides: ${python:Provides} >+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} >+XB-Python-Version: ${python:Versions} >+Description: Python bindings for the GNOME XML library >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ This package contains the files needed to use the GNOME XML library >+ in Python programs. >+ >+Package: python-libxml2-dbg >+Architecture: any >+Section: debug >+Priority: extra >+Provides: ${python:Provides} >+Depends: python-dbg, python-libxml2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} >+XB-Python-Version: ${python:Versions} >+Description: Python bindings for the GNOME XML library (debug extension) >+ XML is a metalanguage to let you design your own markup language. >+ A regular markup language defines a way to describe information in >+ a certain class of documents (eg HTML). XML lets you define your >+ own customized markup languages for many classes of document. It >+ can do this because it's written in SGML, the international standard >+ metalanguage for markup languages. >+ . >+ This package contains the files needed to use the GNOME XML library >+ in Python programs for use with the Python debug interpreter. >+ >--- libxml2-2.7.8.dfsg.orig/debian/compat >+++ libxml2-2.7.8.dfsg/debian/compat >@@ -0,0 +1 @@ >+7 >--- libxml2-2.7.8.dfsg.orig/debian/libxml2.symbols >+++ libxml2-2.7.8.dfsg/debian/libxml2.symbols >@@ -0,0 +1,88 @@ >+libxml2.so.2 libxml2 #MINVER# >+ *@LIBXML2_2.4.30 2.7.4 >+ *@LIBXML2_2.5.0 2.7.4 >+ *@LIBXML2_2.5.2 2.7.4 >+ *@LIBXML2_2.5.4 2.7.4 >+ *@LIBXML2_2.5.5 2.7.4 >+ *@LIBXML2_2.5.6 2.7.4 >+ *@LIBXML2_2.5.7 2.7.4 >+ *@LIBXML2_2.5.8 2.7.4 >+ *@LIBXML2_2.5.9 2.7.4 >+ *@LIBXML2_2.6.0 2.7.4 >+ *@LIBXML2_2.6.10 2.7.4 >+ *@LIBXML2_2.6.11 2.7.4 >+ *@LIBXML2_2.6.12 2.7.4 >+ *@LIBXML2_2.6.14 2.7.4 >+ *@LIBXML2_2.6.15 2.7.4 >+ *@LIBXML2_2.6.16 2.7.4 >+ *@LIBXML2_2.6.17 2.7.4 >+ *@LIBXML2_2.6.18 2.7.4 >+ *@LIBXML2_2.6.19 2.7.4 >+ *@LIBXML2_2.6.1 2.7.4 >+ *@LIBXML2_2.6.20 2.7.4 >+ *@LIBXML2_2.6.21 2.7.4 >+ *@LIBXML2_2.6.23 2.7.4 >+ *@LIBXML2_2.6.24 2.7.4 >+ *@LIBXML2_2.6.25 2.7.4 >+ *@LIBXML2_2.6.27 2.7.4 >+ *@LIBXML2_2.6.28 2.7.4 >+ *@LIBXML2_2.6.29 2.7.4 >+ *@LIBXML2_2.6.2 2.7.4 >+ *@LIBXML2_2.6.32 2.7.4 >+ *@LIBXML2_2.6.3 2.7.4 >+ *@LIBXML2_2.6.5 2.7.4 >+ *@LIBXML2_2.6.6 2.7.4 >+ *@LIBXML2_2.6.7 2.7.4 >+ *@LIBXML2_2.6.8 2.7.4 >+ *@LIBXML2_2.7.0 2.7.4 >+ *@LIBXML2_2.7.3 2.7.4 >+ *@LIBXML2_2.7.4 2.7.4 >+ __docbDefaultSAXHandler@Base 2.6.27 >+ __htmlDefaultSAXHandler@Base 2.6.27 >+ __htmlParseContent@Base 2.6.27 >+ __oldXMLWDcompatibility@Base 2.6.27 >+ __xmlBufferAllocScheme@Base 2.6.27 >+ __xmlDefaultBufferSize@Base 2.6.27 >+ __xmlDefaultSAXHandler@Base 2.6.27 >+ __xmlDefaultSAXLocator@Base 2.6.27 >+ __xmlDeregisterNodeDefaultValue@Base 2.6.27 >+ __xmlDoValidityCheckingDefaultValue@Base 2.6.27 >+ __xmlErrEncoding@Base 2.6.27 >+ __xmlGenericError@Base 2.6.27 >+ __xmlGenericErrorContext@Base 2.6.27 >+ __xmlGetWarningsDefaultValue@Base 2.6.27 >+ __xmlGlobalInitMutexDestroy@Base 2.6.31 >+ __xmlGlobalInitMutexLock@Base 2.6.28 >+ __xmlGlobalInitMutexUnlock@Base 2.6.28 >+ __xmlIOErr@Base 2.6.27 >+ __xmlIndentTreeOutput@Base 2.6.27 >+ __xmlKeepBlanksDefaultValue@Base 2.6.27 >+ __xmlLastError@Base 2.6.27 >+ __xmlLineNumbersDefaultValue@Base 2.6.27 >+ __xmlLoadExtDtdDefaultValue@Base 2.6.27 >+ __xmlLoaderErr@Base 2.6.27 >+ __xmlOutputBufferCreateFilename@Base 2.6.27 >+ __xmlOutputBufferCreateFilenameValue@Base 2.6.27 >+ __xmlParserDebugEntities@Base 2.6.27 >+ __xmlParserInputBufferCreateFilename@Base 2.6.27 >+ __xmlParserInputBufferCreateFilenameValue@Base 2.6.27 >+ __xmlParserVersion@Base 2.6.27 >+ __xmlPedanticParserDefaultValue@Base 2.6.27 >+ __xmlRaiseError@Base 2.6.27 >+ __xmlRegisterCallbacks@Base 2.6.27 >+ __xmlRegisterNodeDefaultValue@Base 2.6.27 >+ __xmlSaveNoEmptyTags@Base 2.6.27 >+ __xmlSimpleError@Base 2.6.27 >+ __xmlStructuredError@Base 2.6.27 >+ __xmlStructuredErrorContext@Base 2.7.4 >+ __xmlSubstituteEntitiesDefaultValue@Base 2.6.27 >+ __xmlTreeIndentString@Base 2.6.27 >+ htmlDecodeEntities@Base 2.6.27 >+ xmlAllocOutputBufferInternal@Base 2.7.1 >+ xmlAutomataSetFlags@Base 2.7.4 >+ xmlCharEncFirstLineInt@Base 2.7.4 >+ xmlGenericErrorDefaultFunc@Base 2.6.27 >+ xmlMallocBreakpoint@Base 2.6.27 >+ xmlNsListDumpOutput@Base 2.6.27 >+ xmlUpgradeOldNs@Base 2.6.27 >+ xmlXPtrAdvanceNode@Base 2.6.27 >--- libxml2-2.7.8.dfsg.orig/debian/python-libxml2-dbg.install >+++ libxml2-2.7.8.dfsg/debian/python-libxml2-dbg.install >@@ -0,0 +1 @@ >+usr/lib/python*/*-packages/*.so >--- libxml2-2.7.8.dfsg.orig/debian/pycompat >+++ libxml2-2.7.8.dfsg/debian/pycompat >@@ -0,0 +1 @@ >+2 >--- libxml2-2.7.8.dfsg.orig/debian/libxml2-utils.dirs >+++ libxml2-2.7.8.dfsg/debian/libxml2-utils.dirs >@@ -0,0 +1 @@ >+/usr/share/doc
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=261079">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 352961
:
260860
|
260862
|
260863
|
260865
|
260867
| 261079 |
261528
